From eafbf35346bd4495062b24a884ec1975041445fc Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 12 Feb 2019 09:30:46 +0800 Subject: [PATCH] 02-12 --- .../CreatePreparationBill/index.vue | 13 ++++-- .../InitialProduction/index.vue | 3 +- .../ProcessPlanning/index.vue | 21 ++++----- .../ProcessingStatus/index.vue | 6 ++- .../QuotaFormulation/index.vue | 46 +++++-------------- .../InterBudgetaryBudgets/index.vue | 4 +- .../Outsourcing/PreorderAssociation/index.vue | 7 +-- 7 files changed, 40 insertions(+), 60 deletions(-) diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index 0073eb2c..fe0d40b5 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -185,11 +185,14 @@ export default { } else { this.a = 0 for (let i = 0; i < this.tableData2.length; i++) { - edit(this.tableData2[i].工艺计划流水号) - this.a = this.a + 1 - } - if (this.a === this.tableData2.length) { - this.searchTable() + edit(this.tableData2[i].工艺计划流水号).then(response => { + this.a += parseInt(response.data[0].result) + if (this.a === this.tableData2.length) { + this.pageSize = 10 + this.pageCurrent = 1 + this.searchTable() + } + }) } } }, diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index 6186ad48..e80ac537 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -528,11 +528,10 @@ export default { this.$message.error('请选择机床组号') } else { this.listLoading = true - this.tableData = [] this.tableData1 = [] getTable(this.NumValue, this.pageList, this.pageSize).then(response => { - console.log(this.NumValue, this.pageList, this.pageSize) this.total = parseInt(response.data.total) + this.tableData = [] for (let i = 0; i < response.data.rows.length; i++) { this.tableData.push({ 零件图号: response.data.rows[i].零件图号, diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue index 53cefd83..4bc1f9f8 100644 --- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue @@ -41,13 +41,10 @@ :label="item.label" :value="item.value"/> - 查询 - + 查询 是否核准 - 在制零件工艺调整 - - 切换编辑模式 - + 在制零件工艺调整 + 切换编辑模式
种类: @@ -816,7 +813,6 @@ export default { insertThestring(NewCode) { this.lastFocusText = event.srcElement this.lastFocusText.focus() - console.log(this.lastFocusText) var sel = document.selection.createRange() sel.text = NewCode return @@ -1064,7 +1060,6 @@ export default { numChange() { numChange(this.processNumValue).then(response => { this.tableData2 = response.data - console.log(this.tableData2) }) }, // 典艺工艺拷贝 @@ -1072,14 +1067,13 @@ export default { if (this.partNumValue === '') { this.$message.error('请在主界面选择一个零件作为被拷贝对象') this.dialogFormVisible = false - } else if (this.partNameValue1 === '') { - this.$message.error('请选择零件名称') + } else if (this.processNumValue === '') { + this.$message.error('请选择零件图号') } else { for (let i = 0; i < this.tableData2.length; i++) { this.tableData[i].工艺名称 = this.tableData2[i].工艺名称 this.tableData[i].工艺难度等级 = this.tableData2[i].工艺难度等级 this.tableData[i].工艺要求 = this.tableData2[i].工艺要求 - console.log(this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号, this.tableData2[i].工艺编号, this.tableData2[i].工序顺序, this.tableData2[i].工艺要求) selectRequest(this.tableData[i].工序流水号, this.tableData[i].工艺计划流水号, this.tableData2[i].工艺编号, this.tableData2[i].工序顺序, this.tableData2[i].工艺要求) hardEdit(this.tableData[i].工序流水号, this.tableData2[i].工艺难度等级) } @@ -1124,12 +1118,13 @@ export default { if (this.partNumValue === '') { this.$message.error('请在主界面选择一个零件作为被拷贝对象') } else { - gongyiCopy(this.num, this.partNumValue).then(() => { // 工艺计划流水号_完成工艺, 工艺计划流水号_被拷工艺 + gongyiCopy(this.num, this.partNumValue).then(res => { // 工艺计划流水号_完成工艺, 工艺计划流水号_被拷工艺 this.searchDetail() }) } }, - numChange1() { // 当完成工艺号改变时，零件名称改变，并获取工艺要求 + // 当完成工艺号改变时，零件名称改变，并获取工艺要求 + numChange1() { this.remark1 = '' this.tableData4 = null for (let i = 0; i < this.tuhao.length; i++) { diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue index 144c8ffd..420f993c 100644 --- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue @@ -456,12 +456,16 @@ export default { for (let i = 0; i < this.零件图号.length; i++) { getTable2(this.checkbox_project, this.project, this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.零件图号[i], 1).then(response => { this.liushuihao = response.data[0].工艺计划流水号 + console.log(response.data) for (let k = 0; k < response.data.length; k++) { if (response.data[k].工艺计划流水号 === this.liushuihao) { this.process[i][k] = response.data[k].工艺名称简称 this.planDate[i][k] = response.data[k].计划日期_短 - this.worker[i][k] = response.data[k].员工姓名 this.realDate[i][k] = response.data[k].完成日期_短 + if (response.data[k].员工姓名 === '超级管理员') { + response.data[k].员工姓名 = '请选择' + } + this.worker[i][k] = response.data[k].员工姓名 if (response.data[k].工序状态 === 5) { // 灰色是已经完成 未入库 this.colorCode[i][k] = 'grey' } else { diff --git a/src/views/ManufacturingCenter/QuotaFormulation/index.vue b/src/views/ManufacturingCenter/QuotaFormulation/index.vue index 22dac643..f7dfed94 100644 --- a/src/views/ManufacturingCenter/QuotaFormulation/index.vue +++ b/src/views/ManufacturingCenter/QuotaFormulation/index.vue @@ -15,7 +15,7 @@ :value="item.value"/> 零件号: - + 未编制的数量{{ partNum.length }} {{ shuliang }}
-
种类: - + 零件名称: - + 投产总数量: - + 材质: - + + 保存 + 保存
- + @@ -88,9 +69,6 @@ - 保存 - 保存 -
diff --git a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue index 1f04e907..f0c7bbee 100644 --- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue +++ b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue @@ -115,7 +115,7 @@ - +