From a25a3fa47301ac767d999af1944c9de9c881981c Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sun, 5 Jan 2020 15:31:26 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScheduleCompletionDetails.js | 12 +-- .../ScheduleCompletionDetails/index.vue | 91 +++++++------------ 2 files changed, 38 insertions(+), 65 deletions(-) diff --git a/src/api/ManufacturingCenter/ScheduleCompletionDetails.js b/src/api/ManufacturingCenter/ScheduleCompletionDetails.js index c06d4713..e0d25e79 100644 --- a/src/api/ManufacturingCenter/ScheduleCompletionDetails.js +++ b/src/api/ManufacturingCenter/ScheduleCompletionDetails.js @@ -1,27 +1,27 @@ import request from '@/utils/request' // 查询人员总工工时 -export function searchtable(num2, num3, num4, num5, pageCurrent, pageSize) { +export function searchtable(num1, num2, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', - name: '车间生产管理工艺_工时统计_查询数据2_新', - param: '操作者_check=0&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5, + name: '车间生产管理工艺_工时统计_设备工时_Vue', + param: '开始时间=' + num1 + '&结束时间=' + num2, Pagination: pageCurrent + '&' + pageSize } }) } // 查询人员具体工序 -export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) { +export function searchtable2(num1, num2, num3, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', - name: '车间生产管理工艺_工时统计按人员查询_查询数据2_新', - param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4, + name: '车间生产管理工艺_工时统计_设备工时_Vue_详细', + param: '人员编号=' + num1 + '&开始时间=' + num2 + '&结束时间=' + num3, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue index aa2f6807..2e5f07e8 100644 --- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue +++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue @@ -17,24 +17,11 @@ type="date" placeholder="选择加工完成日期"/> 查询 - - - - + - + - - - - - - - - - + - + - + + + + @@ -168,12 +160,7 @@ export default { this.tableData = [] this.tableData2 = [] this.total2 = 0 - if (this.startTime !== '' && this.startTime !== null && this.endTime !== null && this.endTime !== null) { - this.timeCheck = 1 - } else { - this.timeCheck = 0 - } - searchtable(this.operater, this.timeCheck, this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => { + searchtable(this.startTime, this.endTime, this.pageCurrent, this.pageSize).then(response => { if (response.data.total === 0) { this.loading = false } else { @@ -188,23 +175,9 @@ export default { this.loading2 = true this.tableData2 = [] this.pageCurrent2 = 1 - searchtable2(row.人员编号, this.timeCheck, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => { + searchtable2(row.人员编号, this.startTime, this.endTime, this.pageCurrent2, this.pageSize2).then(response => { if (response.data.rows.length !== 0) { - for (let i = 0; i < response.data.rows.length; i++) { - this.tableData2.push({ - 零件图号: response.data.rows[i].零件图号, - 零件名称: response.data.rows[i].零件名称, - 工艺名称: response.data.rows[i].工艺名称, - 完成数量: response.data.rows[i].完成数量, - 质检结果: response.data.rows[i].质检结果, - 设备工时: response.data.rows[i].设备工时, - 不合格数量: response.data.rows[i].不合格数量, - 理论加工时间段: response.data.rows[i].理论加工时间段, - 实际加工时间段: response.data.rows[i].实际加工时间段, - 加工开始时间: response.data.rows[i].加工开始时间 ? response.data.rows[i].加工开始时间 : '', - 加工完成时间: response.data.rows[i].加工完成时间 ? response.data.rows[i].加工完成时间 : '' - }) - } + this.tableData2 = response.data.rows } this.loading2 = false this.total2 = response.data.total From 6847e0e3cbd3c074cfa071bf84022f3df1bd0a0d Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Mon, 6 Jan 2020 14:14:19 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=AE=9E=E9=99=85=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScheduleCompletionDetails/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue index 2e5f07e8..33dde32f 100644 --- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue +++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue @@ -19,9 +19,9 @@ 查询 - + - + + + +
- + - - - - + @@ -111,6 +106,11 @@ {{ scope.row.操作时间 }} + + +
Date: Tue, 7 Jan 2020 12:17:45 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Inventory/Inboundscanning/index.vue | 34 +++++++------------ .../MonthEndHourAccounting/index.vue | 14 ++++---- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue index eaceafc5..92e3f4f7 100644 --- a/src/views/Inventory/Inboundscanning/index.vue +++ b/src/views/Inventory/Inboundscanning/index.vue @@ -11,15 +11,6 @@ 入库 - - 移除 - @@ -27,7 +18,6 @@ + + +
@@ -122,17 +122,9 @@ export default { }, methods: { // 移除 - handleDelete() { - this.tableDataNum.splice(this.NUM, 1) - this.tableData.splice(this.NUM, 1) - this.NUM = '' - }, - tableRowClassName({ row, rowIndex }) { - console.log(rowIndex) - this.NUM = rowIndex - }, - searchData(index) { - this.NUM = index + handleDelete(index, row) { + this.tableDataNum.splice(index, 1) + this.tableData.splice(index, 1) }, // 获取人员编号 getpeopleid() { diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue index affbd18b..4a51526e 100644 --- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue +++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue @@ -37,19 +37,19 @@ {{ scope.row.工序顺序 }} - + - + - + @@ -132,8 +132,8 @@ export default { return } import('@/vendor/Export2Excel').then(excel => { - const tHeader = ['姓名', '图号', '跟单号', '序号', '工序名称', '准结工时', '定额工时', '合格数', '不合格数', '备注', '日期', '计划准结工时', '计划定额工时', '项目名称', '机床图号', '组号', '设计', '材料'] - const filterVal = ['姓名', '零件图号_短', '跟单号', '工序顺序', '工艺名称', '准结工时', '单件工时', '合格数', '不合格数', '备注', '操作时间', '准结定额工时', '单件定额工时', '项目名称', '机床图号', '组号', '设计者', '材料'] + const tHeader = ['姓名', '图号', '跟单号', '序号', '工序名称', '录入准结工时', '实际工时', '合格数', '不合格数', '备注', '日期', '计划准结工时', '计划定额工时', '项目名称', '机床图号', '组号', '设计', '材料'] + const filterVal = ['姓名', '零件图号_短', '跟单号', '工序顺序', '工艺名称', '修补准结工时', '设备工时', '合格数', '不合格数', '备注', '操作时间', '准结定额工时', '单件定额工时', '项目名称', '机床图号', '组号', '设计者', '材料'] const list = this.tableData const data = this.formatJson(filterVal, list) excel.export_json_to_excel({