From ae5f18e555e9716c0d1ccd33e33cf2294b9f8b4d Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Sun, 17 Mar 2024 13:16:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=9A=84=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/index.vue | 2 +- .../supplierdeliverRequestMain.data.ts | 28 +++++++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 98f7f111d..6e565633d 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -153,8 +153,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => row['itemCode'] = val[0]['itemCode'] row['poLine'] = val[0]['poLine'] row['uom'] = val[0]['uom'] + row['planQty'] = val[0]['planQty'] } - } else { const setV = {} setV[formField] = val[0][searchField] diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index dbda987b1..e989f3d9a 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -853,10 +853,33 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive Date: Sun, 17 Mar 2024 13:32:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E9=A2=84=E6=B5=8B?= =?UTF-8?q?=E5=AF=BC=E5=87=BAapi=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/demandforecastingMain/index.ts | 8 ++++- .../orderManage/shift/shift.data.ts | 32 +++++++++---------- .../demandforecastingMain.data.ts | 28 ++++++++-------- 3 files changed, 37 insertions(+), 31 deletions(-) diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts index 16cda3e7a..cfb56420e 100644 --- a/src/api/wms/demandforecastingMain/index.ts +++ b/src/api/wms/demandforecastingMain/index.ts @@ -50,7 +50,13 @@ export const deleteDemandforecastingMain = async (id: number) => { // 导出要货预测主 Excel export const exportDemandforecastingMain = async (params) => { - return await request.download({ url: `/wms/demandforecasting-main/export-excel`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/demandforecasting-main/export-excel-senior', data }) + } else { + return await request.download({ url: `/wms/demandforecasting-main/export-excel`, params }) + } } // 下载用户导入模板 diff --git a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts index 0fa31a053..f48755d9e 100644 --- a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts +++ b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts @@ -32,28 +32,28 @@ export const Shift = useCrudSchemas(reactive([ isTable: true, formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'HH:mm:ss' }, - sort: 'custom', + sort: 'custom', table: { - width: 180 + width: 180, }, form: { - component: 'DatePicker', + component: 'TimePicker', componentProps: { style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'time', + dateFormat: 'HH:mm:ss', valueFormat: 'x', } }, isSearch: true, search: { show: true, - component: 'DatePicker', + component: 'TimePicker', componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', + valueFormat: 'HH:mm:ss', + type: 'timeSelect', } } }, @@ -63,28 +63,28 @@ export const Shift = useCrudSchemas(reactive([ isTable: true, formatter: dateFormatter, detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' + dateFormat: 'HH:mm:ss', }, sort: 'custom', table: { width: 180 }, form: { - component: 'DatePicker', + component: 'TimePicker', componentProps: { style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'time', + dateFormat: 'HH:mm:ss', valueFormat: 'x', } }, isSearch: true, search: { show: true, - component: 'DatePicker', + component: 'TimePicker', componentProps: { - valueFormat: 'YYYY-MM-DD HH:mm:ss', - type: 'daterange', + valueFormat: 'HH:mm:ss', + type: 'timeSelect', } } }, diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index 39df4a5e7..4f7bc9d81 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -251,6 +251,20 @@ export const DemandforecastingMainRules = reactive({ * @returns {Array} 要货预测子表 */ export const DemandforecastingDetail = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: false, + form: { + componentProps: { + disbaled: true + } + } + }, { label: '预测时间类型', field: 'predictTimeType', @@ -387,20 +401,6 @@ export const DemandforecastingDetail = useCrudSchemas(reactive([ }] } }, - { - label: '单据号', - field: 'number', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - form: { - componentProps: { - disbaled: true - } - } - }, { label: '物料代码', field: 'itemCode',