From fe5a951ffae372419bca027325dca24c58554ae0 Mon Sep 17 00:00:00 2001 From: chenfang <1057876684@qq.com> Date: Wed, 5 Mar 2025 11:41:18 +0800 Subject: [PATCH 1/5] =?UTF-8?q?FWHL-265=20=E5=B7=B2=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymove/inventorymoveRecordMainNew/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue index 325922058..765ad0ee7 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/index.vue @@ -136,7 +136,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 + defaultButtons.defaultAddBtn({hasPermi:`wms:${routeName.value}:create`}), // 新增 defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出 defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import`}), // 导入 defaultButtons.defaultFreshBtn(null), // 刷新 From 8f5e45a41842339c8f7e20f52c187f8e615b74e0 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 5 Mar 2025 13:07:25 +0800 Subject: [PATCH 2/5] FWHL-105 --- .../productionreturnRequestMain.data.ts | 2 +- .../productionreturnRequestMainNo.data.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index 1ab0faef5..826a94322 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -1641,7 +1641,7 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive Date: Wed, 5 Mar 2025 15:16:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=80=80=E6=96=99?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E4=B8=8E=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain/index.vue | 8 ++++---- .../productionreturnRequestMainNo/index.vue | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 64ad37286..1c8fab7ea 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -538,19 +538,19 @@ const buttonTableClick = async (val, row) => { itemColumns.tableForm.disabled = true ProductionreturnRequestDetailLabelRules.productionLineCodePackage[0].required = false } - if(itemColumns.field == 'supplierItemCode') { + if(itemColumns.field == 'supplierCode') { itemColumns.tableForm.isInpuFocusShow = true itemColumns.tableForm.disabled = false - ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = true + ProductionreturnRequestDetailLabelRules.supplierCode[0].required = true } }) } else { // 修改 tableform 属性 detailListTableColumns.tableFormColumns.map(itemColumns => { - if(itemColumns.field == 'supplierItemCode') { + if(itemColumns.field == 'supplierCode') { itemColumns.tableForm.isInpuFocusShow = false itemColumns.tableForm.disabled = true - ProductionreturnRequestDetailLabelRules.supplierItemCode[0].required = false + ProductionreturnRequestDetailLabelRules.supplierCode[0].required = false } if(itemColumns.field == 'productionLineCodePackage') { item.productionLineCodePackage = item.productionLineCode diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index c5f36326f..99b7a826c 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -527,19 +527,19 @@ const buttonTableClick = async (val, row) => { itemColumns.tableForm.disabled = true ProductionreturnRequestDetailNoLabelRules.productionLineCodePackage[0].required = false } - if(itemColumns.field == 'supplierItemCode') { + if(itemColumns.field == 'supplierCode') { itemColumns.tableForm.isInpuFocusShow = true itemColumns.tableForm.disabled = false - ProductionreturnRequestDetailNoLabelRules.supplierItemCode[0].required = true + ProductionreturnRequestDetailNoLabelRules.supplierCode[0].required = true } }) } else { // 修改 tableform 属性 detailListTableColumns.tableFormColumns.map(itemColumns => { - if(itemColumns.field == 'supplierItemCode') { + if(itemColumns.field == 'supplierCode') { itemColumns.tableForm.isInpuFocusShow = false itemColumns.tableForm.disabled = true - ProductionreturnRequestDetailNoLabelRules.supplierItemCode[0].required = false + ProductionreturnRequestDetailNoLabelRules.supplierCode[0].required = false } if(itemColumns.field == 'productionLineCodePackage') { item.productionLineCodePackage = item.productionLineCode From 9e981193e28cd1d238edd07fab5bf4086378b656 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 5 Mar 2025 15:40:40 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=A3=80=E9=AA=8Cbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturn/productionreturnRequestMainNo/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index 99b7a826c..476b0000a 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -734,7 +734,7 @@ const submitFormLabel = async (formType, submitData) => { let flag = true detatableData.tableList.forEach(item => { - if(!item.supplierItemCode){ + if(!item.supplierCode){ flag = false } }); From 563a0a01fdfdcb079343578c6f0a2a8af68fabe8 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Wed, 5 Mar 2025 16:17:51 +0800 Subject: [PATCH 5/5] FWHL-105 --- .../productionreturn/productionreturnRequestMain/index.vue | 2 +- .../productionreturn/productionreturnRequestMainNo/index.vue | 2 +- .../productionscrap/productionscrapRequestMain/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 1c8fab7ea..958d578f3 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue @@ -643,7 +643,7 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) window.open(src.value+'&asn_number='+res) } else { - const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) + const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) window.open(src.value+'&asn_number='+res) } }).catch(err => { diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index 476b0000a..a0a89ed55 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -859,7 +859,7 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) window.open(src.value+'&asn_number='+res) } else { - const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) + const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) window.open(src.value+'&asn_number='+res) } }).catch(err => { diff --git a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue index 1b7347a90..84f72c317 100644 --- a/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue +++ b/src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue @@ -672,7 +672,7 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) window.open(src.value+'&asn_number='+res) } else { - const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) + const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()) window.open(src.value+'&asn_number='+res) } }).catch(err => {