From 0c0608bb99207953a570f7c449cfaf8767ba5e03 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Tue, 31 Mar 2020 10:38:17 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E6=8E=92=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ManufacturingCenter/ShopScheduling/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue index bad17529..e6c156c9 100644 --- a/src/views/ManufacturingCenter/ShopScheduling/index.vue +++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue @@ -226,7 +226,7 @@ export default { if (row.工序状态 !== 4 && row.工序间是否外协 !== 2) { XuanRu(this.PersonValue, row.工序流水号).then(response => { if (response.data[0].result === '1') { - this.tableData1[this.index].状态 = '1' + this.tableData1[this.index].状态 = 1 this.loading3 = true this.tableData3 = [] getGongxu(this.工艺计划流水号).then(response => { From 3fdd766ebdb9374ecca7a7fd3941651694329b27 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Tue, 31 Mar 2020 15:26:19 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=AE=9A=E9=A2=9D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/PartWorkCraftSelect_rdlc.js | 3 +-- .../PartWorkCraftSelect_rdlc/index.vue | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js index 02349744..5c48899d 100644 --- a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js +++ b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js @@ -53,8 +53,7 @@ export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3 ModularID: router.currentRoute.path, type: '1', name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_按机床分组图号人员查', - param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${val5}&编制开始时间=${val5}&编制结束时间=${val6}`, - Pagination: pageCurrent + '&' + pageSize + param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${val5}&编制开始时间=${val5}&编制结束时间=${val6}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` } }) } diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index ee9305eb..32b4e1bb 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -47,7 +47,7 @@ - + @@ -81,7 +81,7 @@ {{ scope.row.批次数量 }} - + @@ -115,7 +115,7 @@ - + @@ -296,8 +296,8 @@ export default { this.personValue ? check4 = 1 : check4 = 0 this.finishTime ? check5 = 1 : (check5 = 0, this.finishTime = '') search(this.pageCurrent, this.pageSize, check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.PrNum, check4, this.personValue, check5, this.finishTime[0], this.finishTime[1]).then(response => { - this.tableData = response.data.rows - this.total = response.data.total + this.tableData = response.data.result + this.total = parseInt(response.data.output[0].ItemCount) this.loading = false }) }, From 45930c2c758b961b44eeda925e6f220b6362c498 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Tue, 31 Mar 2020 15:42:16 +0800 Subject: [PATCH 3/4] a --- src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js index 5c48899d..45f71679 100644 --- a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js +++ b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js @@ -53,7 +53,7 @@ export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3 ModularID: router.currentRoute.path, type: '1', name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_按机床分组图号人员查', - param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${val5}&编制开始时间=${val5}&编制结束时间=${val6}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` + param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${check5}&编制开始时间=${val5}&编制结束时间=${val6}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output` } }) } From 1a2d9063cedec3680310e901d7ce3da1258099f8 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Tue, 31 Mar 2020 16:14:14 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/ProcessPlanningNew.js | 2 +- .../ProcessPlanningNew/index.vue | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/api/ManufacturingCenter/ProcessPlanningNew.js b/src/api/ManufacturingCenter/ProcessPlanningNew.js index 28e1b23c..a08b6816 100644 --- a/src/api/ManufacturingCenter/ProcessPlanningNew.js +++ b/src/api/ManufacturingCenter/ProcessPlanningNew.js @@ -400,7 +400,7 @@ export function deleteOne(num0, num1) { data: { UserID: state.state.user.id, ModularID: router.currentRoute.path, - type: '2', + type: '1', name: '车间生产管理工艺_零件工序_删除数据_工序流水号', param: '工艺计划流水号=' + num0 + '=int&工序流水号=' + num1 + '=int' } diff --git a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue index cdfc3b0b..cccda101 100644 --- a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue @@ -400,13 +400,7 @@ - + { - this.searchDetail() + deleteOne(this.partNumValue, row.工序流水号).then(response => { + if (response.data[0].结果 === '成功') { + this.searchDetail() + } else { + this.$message.error('此工序已加工，无法删除') + } }) } },