From 09a78a306fe5e1310a84c53b5314a4ae88beb68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Sat, 3 Aug 2024 15:18:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A3=85=E9=85=8D=E8=AE=A1=E5=88=92=20?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BC=80=E5=85=B3=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=8F=90=E4=BA=A4=E5=AE=A1=E6=89=B9=E5=8F=91?= =?UTF-8?q?=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionplan/productionMain/index.vue | 1 - .../productionMainAssemble/index.vue | 14 ++++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/views/wms/productionManage/productionplan/productionMain/index.vue b/src/views/wms/productionManage/productionplan/productionMain/index.vue index b0e1bf2af..70e5f5693 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMain/index.vue @@ -465,7 +465,6 @@ const getSwitch = async ()=>{ const autoCreatePlanRequest = async (row)=>{ // 生成备料计划 try { - if(planSwitch.value) { // /generatePreparetoissue?number let PreparetoissueRes = await ProductionMainApi.generatePreparetoissue(row.number) diff --git a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue index 2d1720d5c..db022f33e 100644 --- a/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue +++ b/src/views/wms/productionManage/productionplan/productionMainAssemble/index.vue @@ -331,6 +331,8 @@ const buttonTableClick = async (val, row) => { console.log(err) }) } else if (val == 'mainPlanSub') { // 提交审批 + // 重新获取开关数据 + await getSwitch() if (row.available == 'FALSE') return message.warning('当前数据：【不可用】') await message.confirm('确认要提交审批吗？') tableObject.loading = true @@ -384,6 +386,8 @@ const buttonTableClick = async (val, row) => { }) // 生成备料计划 tableObject.loading = true + // 重新获取开关数据 + await getSwitch() autoCreatePlanRequest(row) } }) @@ -541,10 +545,12 @@ const tableSelectionDelete = (selection) => { // 主子数据 提交 const submitForm = async (formType, submitData) => { - let data = {...submitData} - if(data.masterId){ - data.id = data.masterId - } + // 重新获取开关数据 + getSwitch() + let data = {...submitData} + if(data.masterId){ + data.id = data.masterId + } if(tableData.value.find(item => (item.planQty <= 0))) { message.warning('数量必须大于0') return From 3248e4ff51f21c9c935a54a8aaf8f96661e5e0d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Sat, 3 Aug 2024 15:20:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=BC=80=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/basicDataManage/documentSetting/switch/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/wms/basicDataManage/documentSetting/switch/index.vue b/src/views/wms/basicDataManage/documentSetting/switch/index.vue index fb0ecead8..3b94a5363 100644 --- a/src/views/wms/basicDataManage/documentSetting/switch/index.vue +++ b/src/views/wms/basicDataManage/documentSetting/switch/index.vue @@ -134,7 +134,6 @@ const butttondata = (row, $index)=>{ const hiddenArray = ['CreatePutawayRequestAfterInspectRecordCreated', 'CreateBackflushRecordAfterProductreceiptRecordCreated', 'CreateProductputawayRequestAfterProductreceiptRecordCreated', - 'ExecuteProductreceiptJobPredictIsCreatePutawayRequest', 'CreatePurchasePlanAfterDiscretePurchaseOrderPublished', 'ExemptItemCreatePutawayRequestAfterPurchaseReceiptRecordCreated', 'CreatePurchaseReceiptRequestAfterSupplierDeliverRecordCreated' From 3f3aeb3de8186a19cf34663f95986a854eea092e Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Sat, 3 Aug 2024 16:05:28 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=87=E4=BB=B6=E9=A2=86=E7=94=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparepartsrequisitionRequestMain.data.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts index c76a8be64..e79185505 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts @@ -688,8 +688,16 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive table: { width: 150 }, - isTableForm: false, + isTableForm: true, isForm: false, + tableForm: { + disabled: true + }, + form:{ + componentProps:{ + disabled:true, + } + } }, { label: '包装号', From f05b085d7735537b04edadf2168dba4cde3228b4 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Sat, 3 Aug 2024 17:12:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AF=A5=E5=90=8D=E7=A7=B0=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E5=AD=90=E8=A1=A8=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en-US.ts | 1 + src/locales/zh-CN.ts | 1 + .../purchasereceipt/purchasereceiptJobMain/index.vue | 2 +- .../purchasereceipt/purchasereceiptRecordMain/index.vue | 2 +- .../purchasereceipt/purchasereceiptRequestMain/index.vue | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 42ca67aba..938bcb939 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -726,6 +726,7 @@ export default { 从货主代码:'Code from the shipper', 到货主代码:'Shipper code', 查看其他包装规格:'See other packaging formats', + 查看子包装:'See sub packaging formats', 包装规格:'Packing specifications', 单据打印:'Document printing', 明细列表:'Itemized list', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 5a5be6409..103a1a95f 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -726,6 +726,7 @@ export default { 从货主代码:'从货主代码', 到货主代码:'到货主代码', 查看其他包装规格:'查看其他包装规格', + 查看子包装:'查看子包装', 包装规格:'包装规格', 单据打印:'单据打印', 明细列表:'明细列表', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue index 82c5ebc84..163060777 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptJobMain/index.vue @@ -331,7 +331,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { // 详情 table 操作扩展 按钮 const buttondataTable = ref([{ - label: '查看其他包装规格', + label: '查看子包装', name: 'viewParentPickingNumber', hide: false, type: 'primary', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index 2906ac00e..5cc9df20b 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -261,7 +261,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { // 详情 table 操作扩展 按钮 const buttondataTable = ref([{ - label: t('ts.查看其他包装规格'), + label: t('ts.查看子包装'), name: 'viewParentPickingNumber', hide: false, type: 'primary', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index d1b7813d6..d34af2d33 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -610,7 +610,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { // 详情 table 操作扩展 按钮 const buttondataTable = ref([{ - label: '查看其他包装规格', + label: '查看子包装', name: 'viewParentPickingNumber', hide: false, type: 'primary',