diff --git a/src/api/Outsourcing/PreorderAssociation.js b/src/api/Outsourcing/PreorderAssociation.js index db039569..0d639e96 100644 --- a/src/api/Outsourcing/PreorderAssociation.js +++ b/src/api/Outsourcing/PreorderAssociation.js @@ -97,7 +97,7 @@ export function edit2(num1, num2, num3) { }) } // 保存每行价格 -export function saveRowPrice(num1, price1, num2, price2) { +export function saveRowPrice(num1, price1, num2, price2, id) { return request({ url: '', method: 'post', @@ -106,7 +106,7 @@ export function saveRowPrice(num1, price1, num2, price2) { ModularID: router.currentRoute.path, type: '2', name: '车间生产管理工艺_零件工序_修改数据_序间外协预算价格_系数', - param: '工序流水号=' + num1 + '&外协预算价格=' + price1 + '&工艺计划流水号=' + num2 + '&材料费=' + price2 + param: '工序流水号=' + num1 + '&外协预算价格=' + price1 + '&工艺计划流水号=' + num2 + '&材料费=' + price2 + '&外协分配人员编号=' + id } }) } diff --git a/src/api/TechnologyCenter/ImportParts.js b/src/api/TechnologyCenter/ImportParts.js index b4cf1289..68b28d88 100644 --- a/src/api/TechnologyCenter/ImportParts.js +++ b/src/api/TechnologyCenter/ImportParts.js @@ -407,7 +407,7 @@ export function allDelete(project, machine, group) { }) } // 传递零件 -export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, id, Num, tiaojian) { +export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, id, Num, tiaojian, peopleid) { return request({ url: '', method: 'post', @@ -416,12 +416,12 @@ export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, num ModularID: router.currentRoute.path, type: '2', name: 'PDM_零件明细表_基本件_大量导入', - param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注\\=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&备件数量=' + Num + '&条件=' + tiaojian + param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注\\=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&id=' + id + '&备件数量=' + Num + '&条件=' + tiaojian + '&导入人员编号=' + peopleid } }) } // 传递零件 -export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, num8, num9, id, oldId, oldNum, tiaojian) { +export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, num8, num9, id, oldId, oldNum, tiaojian, peopleid) { return request({ url: '', method: 'post', @@ -430,11 +430,11 @@ export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, nu ModularID: router.currentRoute.path, type: '2', name: 'PDM_零件明细表_整改件_大量导入', - param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注\\=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&分类码=' + num8 + '&整改类型=' + num9 + '&id=' + id + '&前id=' + oldId + '&前图号或者型号=' + oldNum + param: '图号或者型号=' + num1 + '&零件名称=' + name + '&零件数量=' + num2 + '&零件备注\\=' + remark + '&标记=' + mark + '&设计者编号=' + num3 + '&组件流水号=' + num4 + '&材料流水号=' + num5 + '&规格\\=' + num7 + '&数据类型=' + type + '&是否传递=' + transmit + '&序号=' + num6 + '&分类码=' + num8 + '&整改类型=' + num9 + '&id=' + id + '&前id=' + oldId + '&前图号或者型号=' + oldNum + '&导入人员编号=' + peopleid } }) } -export function transferWG(groupNum, materialNum, totalNum, remarks, mark, designNum, isTransfer, dataType, No, id, Num) { +export function transferWG(groupNum, materialNum, totalNum, remarks, mark, designNum, isTransfer, dataType, No, id, Num, peopleid) { return request({ url: '', method: 'post', @@ -443,11 +443,11 @@ export function transferWG(groupNum, materialNum, totalNum, remarks, mark, desig ModularID: router.currentRoute.path, type: '2', name: 'PDM_零件明细表_标准件和外购件_大量导入', - param: `组件流水号=${groupNum}&物料流水号=${materialNum}&零件数量=${totalNum}&备注\\=${remarks}&标记=${mark}&设计者编号=${designNum}&是否传递=${isTransfer}&数据类型=${dataType}&序号=${No}&id=${id}&备件数量=${Num}` + param: `组件流水号=${groupNum}&物料流水号=${materialNum}&零件数量=${totalNum}&备注\\=${remarks}&标记=${mark}&设计者编号=${designNum}&是否传递=${isTransfer}&数据类型=${dataType}&序号=${No}&id=${id}&备件数量=${Num}&导入人员编号=${peopleid}` } }) } -export function transferWG1(groupNum, materialNum, totalNum, remarks, mark, designNum, isTransfer, dataType, No, id, Num, num6, num7) { +export function transferWG1(groupNum, materialNum, totalNum, remarks, mark, designNum, isTransfer, dataType, No, id, Num, num6, num7, peopleid) { return request({ url: '', method: 'post', @@ -456,7 +456,7 @@ export function transferWG1(groupNum, materialNum, totalNum, remarks, mark, desi ModularID: router.currentRoute.path, type: '2', name: 'PDM_零件明细表_标准件和外购件_大量导入', - param: `组件流水号=${groupNum}&物料流水号=${materialNum}&零件数量=${totalNum}&备注\\=${remarks}&标记=${mark}&设计者编号=${designNum}&是否传递=${isTransfer}&数据类型=${dataType}&序号=${No}&id=${id}&备件数量=${Num}&分类码=${num6}&整改类型=${num7}` + param: `组件流水号=${groupNum}&物料流水号=${materialNum}&零件数量=${totalNum}&备注\\=${remarks}&标记=${mark}&设计者编号=${designNum}&是否传递=${isTransfer}&数据类型=${dataType}&序号=${No}&id=${id}&备件数量=${Num}&分类码=${num6}&整改类型=${num7}&导入人员编号=${peopleid}` } }) } diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue index 0e618e34..f39141ba 100644 --- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue @@ -11,7 +11,7 @@ {{ scope.row.项目名称 }} - + @@ -31,6 +31,16 @@ {{ scope.row.外协工序 }} + + + + + + diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue index 147a7d6d..5e402cea 100644 --- a/src/views/Outsourcing/PreorderAssociation/index.vue +++ b/src/views/Outsourcing/PreorderAssociation/index.vue @@ -288,7 +288,8 @@ export default { if (this.count !== this.tableData2.length) { this.a = 0 for (let i = 0; i < this.tableData2.length; i++) { - saveRowPrice(this.tableData2[i].工序流水号, 0, this.tableData2[i].工艺计划流水号, 0).then(response => { + console.log(this.$store.state.user.id, 9090) + saveRowPrice(this.tableData2[i].工序流水号, 0, this.tableData2[i].工艺计划流水号, 0, this.$store.state.user.id).then(response => { this.a += parseInt(response.data[0].result) if (this.a === this.tableData2.length) { this.$message.success('保存成功') diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue index b0a119f5..ecefa3a3 100644 --- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue +++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue @@ -728,7 +728,7 @@ export default { for (let i = 0; i < this.tableDataAll.length; i++) { const data = this.tableDataAll[i] const total = parseInt(data.备件数量) + parseInt(data.装机数量) * parseInt(data.部件数量) - const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.分类码, data.整改类型, data.id, data.前id, data.前图号或者型号) + const resp = await transferMX1(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.分类码, data.整改类型, data.id, data.前id, data.前图号或者型号, this.$store.user.id) await sleep(10) if (resp.data[0].result === '0') { this.err++ @@ -745,7 +745,7 @@ export default { dataType = 1 } console.log(data) - const resp = await transferWG1(data.组件流水号, data.物料流水号, total, data.备注, data.标记, data.设计者编号, data.是否传递, dataType, data.序号, data.id, data.备件数量, data.分类码, data.整改类型) + const resp = await transferWG1(data.组件流水号, data.物料流水号, total, data.备注, data.标记, data.设计者编号, data.是否传递, dataType, data.序号, data.id, data.备件数量, data.分类码, data.整改类型, this.$store.state.user.id) await sleep(10) if (resp.data[0].result === '0') { this.err++ diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue index 34eb2311..02df1d8f 100644 --- a/src/views/TechnologyCenter/ImportParts/specificationData.vue +++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue @@ -588,7 +588,7 @@ export default { data.图号或者型号 = data.图号或者型号.substring(index + 1) if (data.图号或者型号.indexOf('组') > -1) { const total = parseInt(data.备件数量) + parseFloat(data.装机数量) * parseInt(data.部件数量) - const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.备件数量) + const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.备件数量, '', this.$store.state.user.id) await sleep(10) if (resp.data[0].result === '0') { this.err++ @@ -603,7 +603,7 @@ export default { } } else { const total = parseInt(data.备件数量) + parseFloat(data.装机数量) * parseInt(data.部件数量) - const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.备件数量) + const resp = await transferMX(data.图号或者型号, data.名称, total, data.备注, data.标记, data.设计者编号, data.组件流水号, data.材料流水号, data.规格, 1, data.是否传递, data.序号, data.id, data.备件数量, '', this.$store.state.user.id) await sleep(10) if (resp.data[0].result === '0') { this.err++ @@ -620,7 +620,7 @@ export default { } else { dataType = 1 } - const resp = await transferWG(data.组件流水号, data.物料流水号, total, data.备注, data.标记, data.设计者编号, data.是否传递, dataType, data.序号, data.id, data.备件数量) + const resp = await transferWG(data.组件流水号, data.物料流水号, total, data.备注, data.标记, data.设计者编号, data.是否传递, dataType, data.序号, data.id, data.备件数量, this.$store.state.user.id) await sleep(10) if (resp.data[0].result === '0') { this.err++ diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue index 2c791570..d919f352 100644 --- a/src/views/TechnologyCenter/QueryParts/index.vue +++ b/src/views/TechnologyCenter/QueryParts/index.vue @@ -134,6 +134,16 @@ {{ scope.row.整改类型 }} + + + + + +