From 792b1caf2b84478cf0bec95e97f2dd6d55b34101 Mon Sep 17 00:00:00 2001 From: liulujia1 <759670076@qq.com> Date: Thu, 9 Apr 2020 18:05:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E8=BF=BD=E6=BA=AFV2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreatePreparationBill.js | 4 ++-- .../CreatePreparationBill/index.vue | 3 ++- .../ProductionPlanQuery/index.vue | 2 +- .../ScheduleCompletionDetails/index.vue | 12 ++++++++++ .../OutsourcingPartsQuery/index.vue | 22 ++++++++++++------- .../CreatingPurchasingMaterials/index.vue | 5 +++++ 6 files changed, 36 insertions(+), 12 deletions(-) diff --git a/src/api/ManufacturingCenter/CreatePreparationBill.js b/src/api/ManufacturingCenter/CreatePreparationBill.js index 5d2122ee..724af6f7 100644 --- a/src/api/ManufacturingCenter/CreatePreparationBill.js +++ b/src/api/ManufacturingCenter/CreatePreparationBill.js @@ -46,7 +46,7 @@ export function edit(num1) { }) } // 外购备料 -export function edit2(num1) { +export function edit2(num1, id) { return request({ url: '', method: 'post', @@ -55,7 +55,7 @@ export function edit2(num1) { ModularID: router.currentRoute.path, type: '2', name: '车间生产管理工艺_备料单导出_外购备料', - param: `工艺计划流水号组=${num1}&是否外购备料=1` + param: `工艺计划流水号组=${num1}&是否外购备料=1&分配人员编号=${id}` } }) } diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index 0a3d0d9d..3c5a1619 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -250,12 +250,13 @@ export default { } }, edit2() { + console.log(this.$store.state.user.id, 9090) if (this.tableData2.length === 0) { this.$message.warning('暂无数据') } else { this.a = 0 for (let i = 0; i < this.tableData2.length; i++) { - edit2(this.tableData2[i].工艺计划流水号).then(response => { + edit2(this.tableData2[i].工艺计划流水号, this.$store.state.user.id).then(response => { this.a += parseInt(response.data[0].result) if (this.a === this.tableData2.length) { this.pageSize = 10 diff --git a/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue b/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue index 87b2d17f..4b0d539f 100644 --- a/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue +++ b/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue @@ -127,7 +127,7 @@ export default { loginsession() { this.$axios({ methods: 'post', - url: 'http://192.168.1.192:8045/submit/SessionID.ashx?userName=0000', + url: 'http://192.168.1.192:8045/submit/SessionID.ashx?userName=1222', data: { userName: '0000' } diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue index 220a7e4a..301caead 100644 --- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue +++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue @@ -111,6 +111,16 @@ {{ scope.row.完成日期 }} + + + + + + - + @@ -75,6 +76,11 @@ {{ scope.row.任务下达日期.split(' ')[0] }} + + +
+ + +