diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue index 64ad37286..958d578f3 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 @@ -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/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 { 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 @@ -734,7 +734,7 @@ const submitFormLabel = async (formType, submitData) => { let flag = true detatableData.tableList.forEach(item => { - if(!item.supplierItemCode){ + if(!item.supplierCode){ flag = false } }); @@ -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/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts index d31058a94..54cbcfb44 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts @@ -985,7 +985,7 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive