From 988ed4f09764c0d40e0f4a748fec266a2528b069 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Fri, 3 Apr 2020 17:11:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=83=85=E5=86=B5=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Assembly/QualityInspectionInformationInquiry.js     | 3 +--
 .../Assembly/QualityInspectionInformationInquiry/index.vue  | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/api/Assembly/QualityInspectionInformationInquiry.js b/src/api/Assembly/QualityInspectionInformationInquiry.js
index 3a7388ea..e89968e0 100644
--- a/src/api/Assembly/QualityInspectionInformationInquiry.js
+++ b/src/api/Assembly/QualityInspectionInformationInquiry.js
@@ -148,8 +148,7 @@ export function selecttable(check1, value1, check2, value2, check3, value3, chec
       type: '1',
       name: '质检管理_质量情况_查询数据',
       param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 +
-        '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7 + '&人员编号_check=' + check8 + '&人员编号=' + value8,
-      Pagination: pageCurrent + '&' + pageSize
+        '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6 + '&质检情况_check=' + check7 + '&质检情况=' + value7 + '&人员编号_check=' + check8 + '&人员编号=' + value8 + `8&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
     }
   })
 }
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index 1a46b381..95e62e4a 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -908,11 +908,9 @@ export default {
       if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check7 = 1 } else { this.check7 = 0 }
       if (this.personNum !== '' && this.personNum !== null) { this.check8 = 1 } else { this.check8 = 0 }
       selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.check7, this.qualityInspectionValue, this.check8, this.personNum, this.pageCurrent, this.pageSize).then(response => {
-        console.log(response.data.rows, 111)
-        this.tableData1 = response.data.rows
+        this.tableData1 = response.data.result
         this.loading = false
-        this.total = response.data.total
-        console.log(this.tableData1)
+        this.total = parseInt(response.data.output[0].ItemCount)
       })
     },
     viewPicture(row) {