From 60f3739fd6db8b6629ea9b9d132746d45f7b555d Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Sat, 29 Jun 2024 11:18:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=80=85=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countManage/count/countJobMain/countJobMain.data.ts | 4 ++-- .../countManage/count/countPlanMain/countPlanMain.data.ts | 7 ++++--- .../scrap/scrapJobMain/scrapJobMain.data.ts | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts index 1c28a6796..5768ef3fb 100644 --- a/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts +++ b/src/views/wms/countManage/count/countJobMain/countJobMain.data.ts @@ -476,7 +476,7 @@ export const CountJobMain = useCrudSchemas(reactive([ table: { width: 180 }, - isTable:false, + isTable:true, form: { component: 'DatePicker', componentProps: { @@ -493,7 +493,7 @@ export const CountJobMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable:false, + isTable:true, }, { label: '操作', diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts index b8c7cfaed..c38290b92 100644 --- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts +++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts @@ -280,7 +280,7 @@ export const CountPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable:false, + isTable:true, isForm: false, }, { @@ -303,7 +303,7 @@ export const CountPlanMain = useCrudSchemas(reactive([ valueFormat: 'x', } }, - isTable:false, + isTable:true, isForm: false, }, { @@ -462,6 +462,7 @@ export const CountPlanMain = useCrudSchemas(reactive([ } }, isForm: false, + isTable: false, }, { label: '最后更新者', @@ -828,7 +829,7 @@ export const CountPlanMain1 = useCrudSchemas(reactive([ searchTitle: '库位信息', // 查询弹窗标题 searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 searchPage: LocationApi.getLocationPage // 查询弹窗所需分页方法 - + } } }, diff --git a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts index 4e83e7b06..d98bb5715 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapJobMain/scrapJobMain.data.ts @@ -730,7 +730,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive([ valueFormat: 'x', } }, - isTable: false, + isTable: true, }, { label: '创建者', @@ -739,7 +739,7 @@ export const ScrapJobDetail = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false, + isTable: true, }, ])) From 0e8ae183ef1c4b01cb3bd51b3371c57e64ec9126 Mon Sep 17 00:00:00 2001 From: TengXF <302828528@qq.com> Date: Sat, 29 Jun 2024 11:19:35 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparepartsrequisitionRecordMain/index.vue | 1 + .../sparepartsrequisitionRequestMain/index.vue | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue index f3fa14b88..327a991b8 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/index.vue @@ -155,6 +155,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + tableObject.params.detailDataType = 2 const data = await UnplannedissueRecordMainApi.exportUnplannedissueRecordMain(tableObject.params) download.excel(data, '计划外出库记录主.xlsx') } catch { diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue index deda16647..bc3ae5443 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue @@ -80,7 +80,7 @@ /> - @@ -343,7 +343,7 @@ const openForm =async (type: string, row?: number) => { item.componentProps.isSearchList = false item.componentProps.disabled = true } - + }else{ if (item.field == 'costCenterCode') { //成本中心代码 @@ -393,6 +393,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true + tableObject.params.detailDataType = 2 const data = await UnplannedissueRequestMainApi.exportUnplannedissueRequestMain(tableObject.params) download.excel(data, '备件领用申请.xlsx') } catch { @@ -426,7 +427,7 @@ const tableSelectionDelete = (selection) => { } // 主子数据 提交 const submitForm = async (formType, submitData) => { - + let data = {...submitData} if(data.masterId){ data.id = data.masterId