From 8578d88a605642ef6ca53d1b7f138ff1fb6ce0b5 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Mon, 16 Mar 2020 10:34:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=88=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          |  5 ++---
 src/views/ManufacturingCenter/StatusQuery/index.vue | 12 ++++++------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/api/ManufacturingCenter/StatusQuery.js
index 285d2860..b19b8c49 100644
--- a/src/api/ManufacturingCenter/StatusQuery.js
+++ b/src/api/ManufacturingCenter/StatusQuery.js
@@ -57,9 +57,8 @@ export function searchTable(check1, machine, check2, groupNum, check3, partNumbe
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '车间生产管理工艺_零件工艺计划_查询数据_状态_最新_MESWORK',
-      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int',
-      Pagination: pageCurrent + '&' + pageSize
+      name: '车间生产管理工艺_自制件状态查询_查询',
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index b49b41b7..797a164b 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -172,15 +172,15 @@ export default {
       if (this.partTypeValue) { check5 = 1 } else { check5 = 0 }
       this.loading0 = true
       searchTable(check1, this.machineToolValue, check2, this.groupNumberValue, check3, this.partNumber, check4, this.partStateValue, check5, this.partTypeValue, this.pageCurrent, this.pageSize).then(response => {
-        for (let i = 0; i < response.data.rows.length; i++) {
-          response.data.rows[i].考核状态 = parseInt(response.data.rows[i].考核状态) - 2
-          if (response.data.rows[i].传递时间 !== undefined || response.data.rows[i].hasOwnProperty('传递时间')) {
-            response.data.rows[i].传递时间 = response.data.rows[i].传递时间.split(' ', 2)[0]
+        for (let i = 0; i < response.data.result.length; i++) {
+          response.data.result[i].考核状态 = parseInt(response.data.result[i].考核状态) - 2
+          if (response.data.result[i].传递时间 !== undefined || response.data.result[i].hasOwnProperty('传递时间')) {
+            response.data.result[i].传递时间 = response.data.result[i].传递时间.split(' ', 2)[0]
           }
         }
         this.loading0 = false
-        this.total = response.data.total
-        this.tableData = response.data.rows
+        this.total = parseInt(response.data.output[0].ItemCount)
+        this.tableData = response.data.result
       })
     },
     handleSizeChange(val) {