From 54165d682bd19bd1426b6155e2de7da9bb208a34 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Fri, 10 Apr 2020 08:36:22 +0800 Subject: [PATCH 1/4] a --- src/views/Outsourcing/PreorderAssociation/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue index 147a7d6d..a3971156 100644 --- a/src/views/Outsourcing/PreorderAssociation/index.vue +++ b/src/views/Outsourcing/PreorderAssociation/index.vue @@ -100,6 +100,7 @@ import { machine, getToolNum, getNum, searchTable, searchTable2, edit, edit2, sa export default { data() { return { + a: '', saveRowPrice_disable: false, entryNameValue: '', entryName: [], // 项目名称 From 7b3c2301a2ef163fe10e42583164e20e2bc07afd Mon Sep 17 00:00:00 2001 From: liulujia1 <759670076@qq.com> Date: Fri, 10 Apr 2020 10:38:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=96=E5=8D=8F=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E8=BF=BD=E6=BA=AFV3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Outsourcing/PreorderAssociation.js | 4 ++-- src/views/Outsourcing/OutsourcingTaskExecution/index.vue | 7 ++++++- src/views/Outsourcing/PreorderAssociation/index.vue | 3 ++- src/views/layout/components/Navbar.vue | 5 ++++- 4 files changed, 14 insertions(+), 5 deletions(-) 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/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue index 0e618e34..d06fa870 100644 --- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue @@ -11,7 +11,7 @@ {{ scope.row.项目名称 }} - + @@ -31,6 +31,11 @@ {{ 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/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue index 7d675dac..d4bc3f1a 100644 --- a/src/views/layout/components/Navbar.vue +++ b/src/views/layout/components/Navbar.vue @@ -1,3 +1,4 @@ + + + + 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.整改类型 }} + + + + + +