From e567e52a2aaeaa62f30fdbef0abd8a332f052650 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 26 Mar 2019 16:59:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machiningHoursStatistics.js | 6 ++--- .../machiningHoursStatistics/index.vue | 27 +++++++++---------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/api/ManufacturingCenter/machiningHoursStatistics.js b/src/api/ManufacturingCenter/machiningHoursStatistics.js index 749c2705..444da7f9 100644 --- a/src/api/ManufacturingCenter/machiningHoursStatistics.js +++ b/src/api/ManufacturingCenter/machiningHoursStatistics.js @@ -7,8 +7,8 @@ export function searchtable(num1, num2, num3, num4, num5, pageCurrent, pageSize) method: 'post', data: { type: '1', - name: '车间生产管理工艺_工时统计_查询数据', - param: '操作者_check=' + num1 + '&操作者=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5, + name: '车间生产管理工艺_工时统计_查询数据2', + param: '操作者_check=' + num1 + '&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5, Pagination: pageCurrent + '&' + pageSize } }) @@ -20,7 +20,7 @@ export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) { method: 'post', data: { type: '1', - name: '车间生产管理工艺_工时统计按人员查询_查询数据', + name: '车间生产管理工艺_工时统计按人员查询_查询数据2', param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4, Pagination: pageCurrent + '&' + pageSize } diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue index ea29520e..15622569 100644 --- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue +++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue @@ -34,12 +34,12 @@ width="50"/> - + @@ -76,14 +76,19 @@ {{ scope.row.工艺名称 }} - + + + + @@ -160,14 +165,11 @@ export default { this.loading2 = true this.tableData2 = [] this.pageCurrent2 = 1 - this.gongzuozhebianhao = row.工作者编号 - searchtable2(row.工作者编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => { + this.gongzuozhebianhao = row.人员编号 + searchtable2(row.人员编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => { if (response.data.total === 0) { this.loading2 = false } else { - for (let i = 0; i < response.data.rows.length; i++) { - response.data.rows[i].完成日期 = response.data.rows[i].完成日期.split(' ')[0] - } this.total2 = response.data.total this.tableData2 = response.data.rows } @@ -182,9 +184,6 @@ export default { if (response.data.total === 0) { this.loading2 = false } else { - for (let i = 0; i < response.data.rows.length; i++) { - response.data.rows[i].完成日期 = response.data.rows[i].完成日期.split(' ')[0] - } this.total2 = response.data.total this.tableData2 = response.data.rows } From 8266a64bbe68f7972c28d609feedbf9feeefa817 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 26 Mar 2019 17:07:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../machiningHoursStatistics/index.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue index 15622569..177c52bf 100644 --- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue +++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue @@ -25,14 +25,14 @@ - + - + @@ -54,7 +54,7 @@ @current-change="handleCurrentChange"/> - + - + - + - + - +