From fd6f422264ba4f5bb978eff869d6b56a2e05a89b Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 15 Mar 2019 11:15:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/StatusQuery.js | 10 ++++--- .../MachiningSequenceAdjustment/index.vue | 2 ++ .../ManufacturingCenter/StatusQuery/index.vue | 29 +++++++++---------- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/api/ManufacturingCenter/StatusQuery.js index f5019a57..e27efdec 100644 --- a/src/api/ManufacturingCenter/StatusQuery.js +++ b/src/api/ManufacturingCenter/StatusQuery.js @@ -26,8 +26,9 @@ export function searchmachine(num, check, pageCurrent, pageSize) { method: 'post', data: { type: '1', - name: 'PDM_机床名称_查询数据_分页', - param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床类型代码_check=0=int&机床类型代码=1=int&机床流水号_check=0=int&PageCurrent=' + pageCurrent + '=int&PageSize=' + pageSize + '=int&PageCount=1=int=output&ItemCount=1=int=output' + name: 'PDM_机床名称_查询数据', + param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床类型代码_check=0=int&机床类型代码=1=int&机床流水号_check=0', + Pagination: pageCurrent + '&' + pageSize } }) } @@ -37,8 +38,9 @@ export function searchgroup(num, pageCurrent, pageSize) { method: 'post', data: { type: '1', - name: 'PDM_组件名称_查询数据_分页', - param: '机床流水号=' + num + '=int&PageCurrent=' + pageCurrent + '=int&PageSize=' + pageSize + '=int&PageCount=1=int=output&ItemCount=1=int=output' + name: 'PDM_组件名称_查询数据', + param: '机床流水号=' + num, + Pagination: pageCurrent + '&' + pageSize } }) } diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue index 6031ff66..366faa8d 100644 --- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue +++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue @@ -470,6 +470,7 @@ export default { if (this.MachineValue !== '' && this.MachineValue !== null) { this.loading0 = true searchtable(this.MachineValue, this.pageCurrent, this.pageSize).then(response => { + console.log(response.data) this.tableData = response.data.rows this.total = response.data.total this.loading0 = false @@ -530,6 +531,7 @@ export default { Jurisdiction() { this.count = 0 getMachine2().then(response => { + console.log(response.data) this.gridData = response.data for (let i = 0; i < response.data.length; i++) { if (response.data[i].调序权限 === '1') { this.count = this.count + 1 } diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue index 47ca1a41..1f6f39b1 100644 --- a/src/views/ManufacturingCenter/StatusQuery/index.vue +++ b/src/views/ManufacturingCenter/StatusQuery/index.vue @@ -381,22 +381,22 @@ export default { this.dialogFormVisible2 = true this.check6 = 1 searchmachine(this.entryNameValue, this.check6, this.pageCurrent1, this.pageSize1).then(response => { - for (let i = 0; i < response.data.result.length; i++) { - if (response.data.result[i].机床开始时间 !== '') { - response.data.result[i].机床开始时间 = response.data.result[i].机床开始时间.substr(0, 10) + for (let i = 0; i < response.data.total; i++) { + if (response.data.rows[i].机床开始时间 !== '') { + response.data.rows[i].机床开始时间 = response.data.rows[i].机床开始时间.substr(0, 10) } - if (response.data.result[i].机床结束时间 !== '') { - response.data.result[i].机床结束时间 = response.data.result[i].机床结束时间.substr(0, 10) + if (response.data.rows[i].机床结束时间 !== '') { + response.data.rows[i].机床结束时间 = response.data.rows[i].机床结束时间.substr(0, 10) } - if (response.data.result[i].工位属性 === '请选择') { - response.data.result[i].工位属性 = '' + if (response.data.rows[i].工位属性 === '请选择') { + response.data.rows[i].工位属性 = '' } - if (response.data.result[i].机床主管 === '请选择') { - response.data.result[i].机床主管 = '' + if (response.data.rows[i].机床主管 === '请选择') { + response.data.rows[i].机床主管 = '' } } - this.tableData6 = response.data.result - this.total1 = parseInt(response.data.output[0].ItemCount) + this.tableData6 = response.data.rows + this.total1 = parseInt(response.data.total) }) } else { this.$message.warning('请先选择项目') @@ -415,10 +415,11 @@ export default { }, searchGroupList() { // 查询组号 if (this.machineToolNumber !== '') { + this.tableData7 = [] this.dialogFormVisible3 = true searchgroup(this.machine, this.pageCurrent2, this.pageSize2).then(response => { - this.tableData7 = response.data.result - this.total2 = parseInt(response.data.output[0].ItemCount) + this.tableData7 = response.data.rows + this.total2 = parseInt(response.data.total) }) } else { this.$message.warning('请先选择机床') @@ -460,7 +461,6 @@ export default { this.searchData() }, handleSizeChange1(val) { - this.pageCurrent1 = 1 this.pageSize1 = val this.SearchMachine() }, @@ -469,7 +469,6 @@ export default { this.SearchMachine() }, handleSizeChange3(val) { - this.pageCurrent2 = 1 this.pageSize2 = val this.searchGroupList() }, From 18aaa31c1e01a8db7a92f85dc5c4d9ae0356cd75 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sat, 16 Mar 2019 09:51:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MachiningSequenceAdjustment.js | 26 +++++- .../MachiningSequenceAdjustment/index.vue | 82 +++++++++++-------- 2 files changed, 72 insertions(+), 36 deletions(-) diff --git a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js index 9375414f..ad8dd709 100644 --- a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js +++ b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js @@ -64,7 +64,7 @@ export function getTable2(stepNumber) { method: 'post', data: { type: '1', - name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序', + name: '车间生产管理工艺_零件工序_查询数据_加工顺序调整查询', param: '项目流水号_check=0&项目流水号=0&机床流水号_check=0&机床流水号=0&组件流水号_check=0&组件流水号=0&零件图号_check=1=string&零件图号=' + stepNumber + '=string&是否查询全部数据=1=string&单件是否外协=1&考核状态=6=int' } }) @@ -81,3 +81,27 @@ export function searchParts(stepNumber) { } }) } +// 跳序权限 +export function JurisdictionContro2(num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_加工顺序调整_更改跳序权限', + param: 'MES终端号=' + num1 + '&变更类型=' + num2 + } + }) +} +// 撤出零件 +export function outParts(code) { + return request({ + url: '', + method: 'post', + data: { + type: 2, + name: '车间生产管理工艺_零件撤出待加工库', + param: '工艺计划流水号=' + code + '&结果=11111=string=output' + } + }) +} diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue index 366faa8d..9848e49e 100644 --- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue +++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue @@ -18,7 +18,7 @@ 加工零件： {{ Parts }};加工工序： {{ gongxu }} 无正在加工零件 - 调序权限 + 跳序权限 @@ -260,26 +260,11 @@ @@ -312,16 +297,20 @@ + + + + + + @@ -331,7 +320,7 @@