From 97d67c9876dfa9f7c773cfae80d631a570e6bd89 Mon Sep 17 00:00:00 2001 From: liushuai Date: Tue, 18 Feb 2020 08:49:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContractDetailsInquiry/index.vue | 40 ++++++++++++++----- .../ManHourStatistics/index.vue | 34 ++++++++++------ .../MonthEndHourAccounting/index.vue | 36 ++++++++++++----- .../ProcessPlanningNew/index.vue | 32 ++++++++------- 4 files changed, 96 insertions(+), 46 deletions(-) diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue index 645d673e..b24e8b35 100644 --- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue +++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue @@ -51,46 +51,61 @@ {{ scope.row.工序名 }} - + - + - + - + - + - + - + - + + + + + + + + + + - + - + - + @@ -138,8 +153,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({ @@ -155,6 +170,9 @@ export default { if (this.startTime[0] && this.startTime[1]) { this.loading = true searchTable(this.startTime[0], this.startTime[1]).then(response => { + response.data.map(v => { + this.$set(v, '工时比值', v.计划工时 === 0 ? 0 : Math.round(v.扫码工时 / v.计划工时 * 100) / 100.00) + }) this.tableData = response.data this.loading = false }) diff --git a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue index c896b9c3..e206be97 100644 --- a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue @@ -164,7 +164,7 @@ 复制并保存 - 保存 + 保存 记录修改备注 @@ -558,6 +558,7 @@ export default { dialogMateria2: false, prepareMateriel: '', lastFocusText: '', + loading: false, Result1: '', Result2: '', Result3: '', @@ -1206,6 +1207,7 @@ export default { this.batchNum = response.data[0].批次数量 this.material = response.data[0].材料流水号 this.materialName = response.data[0].材料 + this.Specifications = response.data[0].规格 this.spec = response.data[0].原材料规格 this.工艺是否更改 = response.data[0].工艺是否更改 if (response.data[0].重量 === null) { @@ -1524,19 +1526,21 @@ export default { flag++ if (flag === this.tableData.length) { TableAddLi1(this.partNumValue, this.CraftmenValue).then(() => { - TableAddLi2(this.partNumValue) - this.checked = false - this.partNumValue = '' - this.typeValue = '' - this.Specifications = '' - this.partName = '' - this.batchNum = '' - this.material = '' - this.materialName = '' - this.spec = '' - this.newNum = '' - this.searchPartsByMachineGroup() - this.$message.success('保存成功') + TableAddLi2(this.partNumValue).then(() => { + this.loading = false + this.checked = false + this.partNumValue = '' + this.typeValue = '' + this.Specifications = '' + this.partName = '' + this.batchNum = '' + this.material = '' + this.materialName = '' + this.spec = '' + this.newNum = '' + this.searchPartsByMachineGroup() + this.$message.success('保存成功') + }) }) } })