diff --git a/src/api/purchasingManagement/materialSplit.js b/src/api/purchasingManagement/materialSplit.js index d294ef8..68ede80 100644 --- a/src/api/purchasingManagement/materialSplit.js +++ b/src/api/purchasingManagement/materialSplit.js @@ -46,3 +46,4 @@ export const deleteRoll = data => createAPI(`materialSplit/deleteRoll`,'POST',da export const sapSynchronization = data => createAPI(`materialSplit/sapSynchronization`,'POST',data) export const freezing = data => createAPI(`materialSplit/freezing`,'POST',data) export const notFreezing = data => createAPI(`materialSplit/notFreezing`,'POST',data) +export const getReferenceData = data => createAPI(`materialSplit/getReferenceData`,'POST',data) diff --git a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue index b9efd42..bd17998 100644 --- a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue +++ b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue @@ -13,7 +13,7 @@ - 创建 + 创建分卷 @@ -58,22 +58,21 @@ 客户编号： - - + + 产品编码： - - + - + - + - + @@ -179,6 +178,7 @@ saveCRollData, saveSuppRollNo, doSaveSuppRollNo, + getReferenceData } from "@/api/purchasingManagement/materialSplit.js" import Chooselist from '@/views/modules/common/Chooselist' export default { @@ -219,6 +219,8 @@ fGPartNo: '无', referencePartDesc: '', checked: false, + referenceSupplierID:'', + referenceSupplierName:'', }, sum1: '', sum2: '', @@ -709,10 +711,12 @@ getBaseData(val){ if (this.tagNo === 92){ this.dataForm.customerID = val.ConfigurationTemplateID + this.getReferenceData() } if (this.tagNo === 5){ if(this.tagNo2===1){ this.dataForm.fGPartNo = val.PartNo + this.getReferenceData(); // this.getFGPartNo(); }else { this.dataForm.partNo = val.PartNo @@ -755,7 +759,7 @@ return false; } if (this.dataForm.supplierID == '' || this.dataForm.supplierID == null) { - this.$alert("请输入供应商编号！", '错误', { + this.$alert("请输入供应商编码！", '错误', { confirmButtonText: '确定' }) return false; @@ -808,6 +812,9 @@ parttypeFlag: 'R', customerID: this.dataForm.customerID, fGPartNo: this.dataForm.fGPartNo, + refPartDesc:this.dataForm.referencePartDesc, + refSupplierID:this.dataForm.referenceSupplierID, + } this.dataList1.push(newDate) this.sum1 += newDate.rollNumber; @@ -966,6 +973,7 @@ // }) // } }) + this.getReferenceData(); }, getCustomerID() { let inData = { @@ -1073,6 +1081,25 @@ } ) }, + getReferenceData(){ + let inData = { + site: this.dataForm.site, + partNo: this.dataForm.partNo, + partDescription: this.dataForm.partDescription, + customerID: this.dataForm.customerID, + fGPartNo: this.dataForm.fGPartNo, + supplierID: '*', + } + getReferenceData(inData).then(({data}) => { + if (data.success) { + if (data.rows.length > 0) { + this.dataForm.referenceSupplierID = data.rows[0].SupplierID; + this.dataForm.referencePartDesc = data.rows[0].PartDescription; + this.dataForm.referenceSupplierName = data.rows[0].SupplierName; + } + } + }) + }, }, created() { diff --git a/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue b/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue index d365579..cf1f5d8 100644 --- a/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue +++ b/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue @@ -77,7 +77,7 @@ - + @@ -98,7 +98,7 @@ - 创建 + 创建 @@ -112,7 +112,7 @@ - 关闭 + 关闭 @@ -161,20 +161,22 @@ 客户编号： - + 产品编码： - + - + + + - + - + @@ -303,6 +305,7 @@ saveCRollData, saveSuppRollNo, doSaveSuppRollNo, + getReferenceData, } from "@/api/purchasingManagement/materialSplit.js" import { getPartNoDetail, @@ -373,6 +376,8 @@ fGPartNo: '', referencePartDesc: '', checked: false, + referenceSupplierID:'', + referenceSupplierName:'', XX: '', }, sum1: '', @@ -926,9 +931,11 @@ getBaseData(val){ if (this.tagNo === 92){ this.dataForm.customerID = val.ConfigurationTemplateID + this.getReferenceData(); } if (this.tagNo === 5){ - this.dataForm.fGPartNo = val.PartNo + this.dataForm.fGPartNo = val.PartNo; + this.getReferenceData(); } }, // 获取基础数据列表 @@ -968,7 +975,7 @@ rollNumber: row.rollNumber, customerID: '无', fGPartNo: '无', - referencePartDesc: row.referencePartDesc, + referencePartDesc:'', checked: false, XX: '', }; @@ -986,7 +993,7 @@ } var dateString = year + "-" + month + "-" + day; this.$set(this.dataForm, 'receive', dateString) - this.dataForm.referencePartDesc = this.dataForm.partNo; + this.getReferenceData(); let inData = { site: row.site, orderRef1: row.orderNo, @@ -1056,6 +1063,8 @@ parttypeFlag: 'R', customerID: this.dataForm.customerID, fGPartNo: this.dataForm.fGPartNo, + refSupplierID:this.dataForm.referenceSupplierID, + referencePartDesc:this.dataForm.referencePartDesc } this.dataList1.push(newDate) this.sum1 += newDate.rollNumber; @@ -1209,12 +1218,12 @@ rollNumber: row.rollNumber, customerID: '无', fGPartNo: '无', - referencePartDesc: row.referencePartDesc, + referencePartDesc: '', checked: false, XX: '', }; - this.dataForm.referencePartDesc = this.dataForm.partNo; this.$set(this.dataForm, 'receive', new Date()); + this.getReferenceData(); let inData = { site: this.dataForm.site, orderRef1: this.dataForm.orderNo, @@ -1250,12 +1259,12 @@ rollNumber: row.rollNumber, customerID: '无', fGPartNo: '无', - referencePartDesc: row.referencePartDesc, + referencePartDesc: '', checked: false, XX: '', }; - this.dataForm.referencePartDesc = this.dataForm.partNo; this.$set(this.dataForm, 'receive', new Date()); + this.getReferenceData(); let inData = { site: this.dataForm.site, orderRef1: this.dataForm.orderNo, @@ -1379,9 +1388,27 @@ return s }, // 导出 end + getReferenceData(){ + let inData = { + site: this.dataForm.site, + partNo: this.dataForm.partNo, + partDescription: this.dataForm.partDescription, + customerID: this.dataForm.customerID, + fGPartNo: this.dataForm.fGPartNo, + supplierID: '*', + } + getReferenceData(inData).then(({data}) => { + if (data.success) { + if (data.rows.length > 0) { + this.dataForm.referenceSupplierID = data.rows[0].SupplierID; + this.dataForm.referencePartDesc = data.rows[0].PartDescription; + this.dataForm.referenceSupplierName = data.rows[0].SupplierName; + } + } + }) + }, }, - created() - { + created() { } } diff --git a/src/views/modules/purchasingManagement/searchSAPSlittedOrder.vue b/src/views/modules/purchasingManagement/searchSAPSlittedOrder.vue index 88ed13c..5065cbd 100644 --- a/src/views/modules/purchasingManagement/searchSAPSlittedOrder.vue +++ b/src/views/modules/purchasingManagement/searchSAPSlittedOrder.vue @@ -152,20 +152,22 @@ 客户编号： - + 产品编码： - + - + + + - + @@ -340,7 +342,8 @@ getTransRoll, saveFinishRoll, checkFinishRoll, - saveRollNoOut + saveRollNoOut, + getReferenceData, } from "@/api/purchasingManagement/materialSplit.js" export default { @@ -412,6 +415,8 @@ fGPartNo: '', referencePartDesc: '', checked: false, + referenceSupplierID:'', + referenceSupplierName:'', sOPartNo: '', }, sum1: '', @@ -1093,9 +1098,11 @@ getBaseData(val){ if (this.tagNo === 92){ this.dataForm.customerID = val.ConfigurationTemplateID + this.getReferenceData(); } if (this.tagNo === 5){ this.dataForm.fGPartNo = val.PartNo + this.getReferenceData(); } }, // 获取基础数据列表 @@ -1144,7 +1151,7 @@ rollNumber: row.rollNumber, customerID: '无', fGPartNo: '无', - referencePartDesc: row.referencePartDesc, + referencePartDesc: '', checked: false, sOPartNo: row.sOPartNo, }; @@ -1159,7 +1166,7 @@ } var dateString = year + "-" + month + "-" + day; this.$set(this.dataForm, 'receive', dateString) - this.dataForm.referencePartDesc = this.dataForm.partNo; + this.getReferenceData(); let inData = { site: row.site, orderRef1: row.orderNo, @@ -1227,7 +1234,8 @@ rolltypeDb: 0, parttypeFlag: 'R', customerID: this.dataForm.customerID, - + refPartDesc:this.dataForm.referencePartDesc, + refSupplierID:this.dataForm.referenceSupplierID, fGPartNo: this.dataForm.fGPartNo, orderRef5: this.dataForm.sOPartNo, } @@ -1389,11 +1397,11 @@ rollNumber: row.rollNumber, customerID: '无', fGPartNo: '无', - referencePartDesc: row.referencePartDesc, + referencePartDesc: '', checked: false, sOPartNo: row.sOPartNo, }; - this.dataForm.referencePartDesc = this.dataForm.partNo; + this.getReferenceData(); this.$set(this.dataForm, 'receive', new Date()); let inData = { site: this.dataForm.site, @@ -1430,11 +1438,11 @@ rollNumber: row.rollNumber, customerID: '无', fGPartNo: '无', - referencePartDesc: row.referencePartDesc, + referencePartDesc: '', checked: false, sOPartNo: row.sOPartNo, }; - this.dataForm.referencePartDesc = this.dataForm.partNo; + this.getReferenceData(); this.$set(this.dataForm, 'receive', new Date()); let inData = { site: this.dataForm.site, @@ -1704,6 +1712,25 @@ return s }, // 导出 end + getReferenceData(){ + let inData = { + site: this.dataForm.site, + partNo: this.dataForm.partNo, + partDescription: this.dataForm.partDescription, + customerID: this.dataForm.customerID, + fGPartNo: this.dataForm.fGPartNo, + supplierID: '*', + } + getReferenceData(inData).then(({data}) => { + if (data.success) { + if (data.rows.length > 0) { + this.dataForm.referenceSupplierID = data.rows[0].SupplierID; + this.dataForm.referencePartDesc = data.rows[0].PartDescription; + this.dataForm.referenceSupplierName = data.rows[0].SupplierName; + } + } + }) + }, }, created() {