From 76b3e57e9e0837e50c578fd1c67c7cb436194a49 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 28 Nov 2019 11:28:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E5=B7=A5=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessTaskAssignment.js | 12 +++++ .../ActualTimeSupplement/index.vue | 7 ++- .../ProcessTaskAssignment/index.vue | 25 +++++++++-- .../ProcessingStatusEdit/index.vue | 6 +-- .../ScheduleCompletionDetails/index.vue | 44 ++++++++++--------- 5 files changed, 64 insertions(+), 30 deletions(-) diff --git a/src/api/ManufacturingCenter/ProcessTaskAssignment.js b/src/api/ManufacturingCenter/ProcessTaskAssignment.js index 8b763061..9b2151ba 100644 --- a/src/api/ManufacturingCenter/ProcessTaskAssignment.js +++ b/src/api/ManufacturingCenter/ProcessTaskAssignment.js @@ -133,3 +133,15 @@ export function initPerson() { } }) } +// 保存 +export function save2(num1, num2, num3) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_工艺任务分配_保存数据', + param: '工艺计划流水号=' + num1 + '&人员编号=' + num2 + '&零件图号=' + num3 + } + }) +} diff --git a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue index 3ca27de2..aa250568 100644 --- a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue +++ b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue @@ -37,11 +37,11 @@ 操作者: - + 零件图号: - + 工艺名称: - + 查询 新增 @@ -507,7 +507,6 @@ export default { this.partNumber ? check4 = 1 : check4 = 0 this.startTime2 && this.endTime2 ? check5 = 1 : check5 = 0 searchTable(this.technologyName, check1, this.workerName, check2, check3, this.endTime1, this.startTime1, this.partNumber, check4, check5, this.endTime2, this.startTime2, this.pageCurrent, this.pageSize).then(res => { - console.log(res.data.rows, 898989) this.tableData = res.data.rows this.total = res.data.total this.tableData.map(v => { diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue index fafd06aa..182b9ded 100644 --- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue +++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue @@ -24,7 +24,7 @@ 全选 保存 - 保存 + 保存 { + if (!v.工艺员) { + return false + } + console.log(111) + this.通用件图号.push(v.零件号) + this.通用件规格.push(v.规格) + this.工艺员.push(v.工艺员) + }) + console.log(this.通用件图号, this.通用件规格, this.工艺员) } } } diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue index bd86ff96..ce57deab 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue @@ -14,7 +14,7 @@ 组号: - + 零件号: + 查询 - + 计划下达时间: - 查询 diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue index 80af3cc6..f2a4a0ce 100644 --- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue +++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue @@ -22,7 +22,7 @@ - + - + - + - + - + @@ -66,15 +66,15 @@ - + - + - + @@ -84,7 +84,7 @@ {{ scope.row.工艺名称 }} - + @@ -94,11 +94,11 @@ {{ scope.row.质检结果 }} - - - + + + + + - + + + + @@ -145,10 +150,10 @@ export default { loading2: '', pageCurrent: 1, pageSize: 10000, - total: '', + total: 0, pageCurrent2: 1, pageSize2: 10000, - total2: '', + total2: 0, timeCheck: '', operater: '' } @@ -166,8 +171,6 @@ export default { if (this.startTime !== '' && this.startTime !== null && this.endTime !== null && this.endTime !== null) { this.timeCheck = 1 } else { - // this.startTime = '' - // this.endTime = '' this.timeCheck = 0 } searchtable(this.operater, this.timeCheck, this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => { @@ -197,7 +200,8 @@ export default { 不合格数量: response.data.rows[i].不合格数量, 理论加工时间段: response.data.rows[i].理论加工时间段, 实际加工时间段: response.data.rows[i].实际加工时间段, - 加工完成时间: response.data.rows[i].加工完成时间 ? response.data.rows[i].加工完成时间.split(' ')[0] : '' + 加工开始时间: response.data.rows[i].加工开始时间 ? response.data.rows[i].加工开始时间 : '', + 加工完成时间: response.data.rows[i].加工完成时间 ? response.data.rows[i].加工完成时间 : '' }) } }