From 4768144d92e4d76a0d6d754f33d366d6daa06463 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 21 Oct 2024 15:53:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-6241=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/supplierinvoiceInvoiced/index.ts | 16 +- .../index.vue | 2 +- .../supplierinvoiceInvoiced.data.ts | 0 .../supplierinvoiceInvoicedSchedule/index.vue | 314 ++++++++++++++++++ .../supplierinvoiceInvoiced.data.ts | 284 ++++++++++++++++ 5 files changed, 613 insertions(+), 3 deletions(-) rename src/views/wms/supplierManage/{supplierinvoiceInvoiced => supplierinvoiceInvoicedDiscrete}/index.vue (99%) rename src/views/wms/supplierManage/{supplierinvoiceInvoiced => supplierinvoiceInvoicedDiscrete}/supplierinvoiceInvoiced.data.ts (100%) create mode 100644 src/views/wms/supplierManage/supplierinvoiceInvoicedSchedule/index.vue create mode 100644 src/views/wms/supplierManage/supplierinvoiceInvoicedSchedule/supplierinvoiceInvoiced.data.ts diff --git a/src/api/wms/supplierinvoiceInvoiced/index.ts b/src/api/wms/supplierinvoiceInvoiced/index.ts index 9be7c7d15..e81021568 100644 --- a/src/api/wms/supplierinvoiceInvoiced/index.ts +++ b/src/api/wms/supplierinvoiceInvoiced/index.ts @@ -23,8 +23,8 @@ export interface SupplierinvoiceInvoicedVO { siteId: string } -// 查询待开票列表 -export const getSupplierinvoiceInvoicedPage = async (params) => { +// 查询待开票列表--日程 +export const getSupplierinvoiceInvoicedPageSchedule = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} @@ -34,6 +34,18 @@ export const getSupplierinvoiceInvoicedPage = async (params) => { } } +// 查询待开票列表--离散 +export const getSupplierinvoiceInvoicedPageDiscrete = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/supplierinvoice-invoiced/seniorDiscrete', data }) + } else { + return await request.get({ url: `/wms/supplierinvoice-invoiced/pageDiscrete`, params }) + } +} + + // 查询待开票详情 export const getSupplierinvoiceInvoiced = async (id: number) => { return await request.get({ url: `/wms/supplierinvoice-invoiced/get?id=` + id }) diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoicedDiscrete/index.vue similarity index 99% rename from src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue rename to src/views/wms/supplierManage/supplierinvoiceInvoicedDiscrete/index.vue index 0981356d6..1bc66d34a 100644 --- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/index.vue +++ b/src/views/wms/supplierManage/supplierinvoiceInvoicedDiscrete/index.vue @@ -92,7 +92,7 @@ const updataTableColumns = (val) => { } const { tableObject, tableMethods } = useTable({ - getListApi: SupplierinvoiceInvoicedApi.getSupplierinvoiceInvoicedPage // 分页接口 + getListApi: SupplierinvoiceInvoicedApi.getSupplierinvoiceInvoicedPageDiscrete // 分页接口 }) // 获得表格的各种操作 diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts b/src/views/wms/supplierManage/supplierinvoiceInvoicedDiscrete/supplierinvoiceInvoiced.data.ts similarity index 100% rename from src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts rename to src/views/wms/supplierManage/supplierinvoiceInvoicedDiscrete/supplierinvoiceInvoiced.data.ts diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoicedSchedule/index.vue b/src/views/wms/supplierManage/supplierinvoiceInvoicedSchedule/index.vue new file mode 100644 index 000000000..a4f8c4576 --- /dev/null +++ b/src/views/wms/supplierManage/supplierinvoiceInvoicedSchedule/index.vue @@ -0,0 +1,314 @@ + + + diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoicedSchedule/supplierinvoiceInvoiced.data.ts b/src/views/wms/supplierManage/supplierinvoiceInvoicedSchedule/supplierinvoiceInvoiced.data.ts new file mode 100644 index 000000000..51a203719 --- /dev/null +++ b/src/views/wms/supplierManage/supplierinvoiceInvoicedSchedule/supplierinvoiceInvoiced.data.ts @@ -0,0 +1,284 @@ +import type { CrudSchema } from '@/hooks/web/useCrudSchemas' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' + +// 表单校验 +export const SupplierinvoiceInvoicedRules = reactive({ + supplierCode: [required], + poNumber: [required], + currency: [required], + concurrencyStamp: [required], +}) + +export const SupplierinvoiceInvoiced = useCrudSchemas(reactive([ + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + }, + { + label: '订单号', + field: 'poNumber', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '待开票单据号', + field: 'recvBillNum', + sort: 'custom', + isSearch: true, + table: { + width: 150 + }, + }, + { + label: '发货单号', + field: 'asnBillNum', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '供应商送货日期', + field: 'supplierDeliveryTime', + sort: 'custom', + formatter: dateFormatter2, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, + table: { + width: 150 + }, + isForm: false, + }, + { + label: '收货日期', + field: 'prhRcpDate', + sort: 'custom', + isSearch: true, + formatter: dateFormatter2, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + table: { + width: 150 + }, + isForm: false, + }, + { + label: '项目编码', + field: 'projectCode', + sort: 'custom', + isTable:false, + isTableForm:false, + table: { + width: 150 + }, + }, + { + label: '单据类型', + field: 'billType', + dictType: DICT_TYPE.BILL_TYPE, + dictClass: 'string', + sort: 'custom', + form: { + component: 'SelectV2' + }, + table: { + width: 150 + }, + }, + + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.SUPPLIERINVOICE_STATUS, + dictClass: 'string', + isTable: true, + isForm:false, + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + form: { + value: '1', + componentProps: { + disabled: true + } + } + }, + + // { + // label: '发票申请状态', + // field: 'requestStatus', + // dictType: DICT_TYPE.INVOICE_REQUEST_STATUS, + // dictClass: 'string', + // isTable: true, + // isForm:false, + // sort: 'custom', + // table: { + // width: 150 + // }, + // isSearch: false, + // form: { + // value: '1', + // componentProps: { + // disabled: true + // } + // } + // }, + + + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '采购价格', + field: 'purchasePrice', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '票据总数', + field: 'invoicableQuantity', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '实际开票数量', + field: 'issuedInvoicableQuantity', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '可开票数量', + field: 'invoiceAvailableQuantity', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '零件号', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '货币', + field: 'currency', + sort: 'custom', + dictType: DICT_TYPE.CURRENCY, + dictClass: 'string', + table: { + width: 150 + }, + tableForm:{ + type:'Select', + disabled: true + } + }, + { + label: '创建时间', + field: 'createTime', + sort: 'custom', + formatter: dateFormatter, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + table: { + width: 150 + }, + isForm: false, + isSearch: true, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + table: { + width: 200, + fixed: 'right' + } + } +]))