From 315b9f023b95febd60487a09536241448914024b Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Mon, 2 Dec 2019 13:44:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompletionOfWorkshopComponents.js | 29 +- .../CompletionOfWorkshopComponents/index.vue | 250 ++++++++---------- .../ProcessingStatusNew/index.vue | 2 +- 3 files changed, 143 insertions(+), 138 deletions(-) diff --git a/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js b/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js index f6d31018..723e8a17 100644 --- a/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js +++ b/src/api/ManufacturingCenter/CompletionOfWorkshopComponents.js @@ -7,7 +7,7 @@ export function getMachines() { method: 'post', data: { type: '1', - name: 'PDM_机床名称_全部_查询数据' + name: 'PDM_机床名称_查询数据_查询全部' } }) } @@ -18,9 +18,32 @@ export function getGroups(stepNumber) { method: 'post', data: { type: '1', - name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组_新', + name: '车间生产管理工艺_传递后_组件名称_查询数据_查询所有组', param: '机床流水号=' + stepNumber + '=int' } }) } - +// 查询零件 +export function selectParts(check1, stepNumber, check2, num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_车间组件完成情况_查询数据', + param: '组件流水号_check=' + check1 + '&组件流水号=' + stepNumber + '&工艺计划流水号_check=' + check2 + '&工艺计划流水号=' + num + } + }) +} +// 查询工序 +export function selectProcedure(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工序_查询数据_车间组件完成情况', + param: '工艺计划流水号=' + num + } + }) +} diff --git a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue index f7da2ffe..7fc75019 100644 --- a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue +++ b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue @@ -1,9 +1,9 @@ - diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue index d520e241..dd7449c7 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue @@ -413,7 +413,7 @@ export default { }) }, getTable9() { - this.khbmbh = 12 + this.khbmbh = 12 // 考核部门编号 getTable8(this.khbmbh).then(response => { this.List1 = response.data }) From 46308b43d16371e18069a792658310e613cace7e Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Mon, 2 Dec 2019 14:10:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompletionOfWorkshopComponents/index.vue | 2 + .../ShippingInquiries/index.vue | 262 ++++++++---------- 2 files changed, 112 insertions(+), 152 deletions(-) diff --git a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue index 7fc75019..13a8076a 100644 --- a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue +++ b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue @@ -131,6 +131,8 @@ export default { }, // 获取树状数据 getTreeData() { + this.tableData1 = [] + this.tableData2 = [] for (let i = 0; i < this.Machine.length; i++) { if (this.MachineValue === this.Machine[i].value) { this.机床图号 = this.Machine[i].label diff --git a/src/views/MarketingCenter/ShippingInquiries/index.vue b/src/views/MarketingCenter/ShippingInquiries/index.vue index 5a8b38c8..19b8528c 100644 --- a/src/views/MarketingCenter/ShippingInquiries/index.vue +++ b/src/views/MarketingCenter/ShippingInquiries/index.vue @@ -1,162 +1,121 @@