From 841812c7e92f1c53e5b68eebc533c02b3b5ad1cc Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Tue, 24 Mar 2020 17:54:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E7=BB=84=E9=85=8D=E5=A5=97=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/ManufacturingCenter/GroupMatching.js  |  3 +-
 .../GroupMatching/index.vue                   | 49 ++++++++++---------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/api/ManufacturingCenter/GroupMatching.js b/src/api/ManufacturingCenter/GroupMatching.js
index fe2c9d02..ec5ef062 100644
--- a/src/api/ManufacturingCenter/GroupMatching.js
+++ b/src/api/ManufacturingCenter/GroupMatching.js
@@ -36,8 +36,7 @@ export function searchTable(check1, machine, check2, groupNum, pageCurrent, page
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间生产管理工艺_基本件成组配套_查询数据_新',
-      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int',
-      pagination: pageCurrent + '&' + pageSize
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index 9584fff2..8bf4d8ef 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -11,7 +11,7 @@
           <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
         </el-option>
       </el-select>
-      <el-select v-model="Group" size="small" clearable placeholder="组号" style="width: 150px;" @change="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">
+      <el-select v-model="Group" size="small" clearable placeholder="组号" style="width: 150px;" @change="total=0;pageSize=50;pageCurrent=1;searchData();searchTable()">
         <el-option
           v-for="item in Groups"
           :key="item.value"
@@ -21,7 +21,7 @@
           <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
         </el-option>
       </el-select>
-      <el-button type="primary" plain icon="el-icon-search" size="small" style="margin-left: 20px" @click="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">查询</el-button>
+      <el-button type="primary" plain icon="el-icon-search" size="small" style="margin-left: 20px" @click="total=0;pageSize=50;pageCurrent=1;searchData();searchTable()">查询</el-button>
     </el-card>
     <el-card>
       <el-tabs v-model="PartType2" type="border-card" style="margin-top: 10px">
@@ -77,10 +77,10 @@
           <div class="block">
             <el-pagination
               :current-page="pageCurrent"
-              :page-sizes="[10, 20, 30, 40, 50]"
+              :page-sizes="[50, 100, 150, 200]"
               :page-size="pageSize"
               :total="total"
-              layout="total"
+              layout="total, sizes, prev, pager, next, jumper"
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"/>
           </div>
@@ -139,11 +139,11 @@
               <div class="block">
                 <el-pagination
                   :current-page="pageCurrent00"
-                  :page-sizes="[10, 20, 30, 40]"
+                  :page-sizes="[50, 100, 150, 200]"
                   :page-size="pageSize00"
                   :total="total00"
                   style="margin-top:10px;display:inline-block;width:50%"
-                  layout="total"
+                  layout="total, sizes, prev, pager, next, jumper"
                   @size-change="handleSizeChange00"
                   @current-change="handleCurrentChange00"/>
               </div>
@@ -199,11 +199,11 @@
               <div class="block">
                 <el-pagination
                   :current-page="pageCurrent01"
-                  :page-sizes="[10, 20, 30, 40]"
+                  :page-sizes="[50, 100, 150, 200]"
                   :page-size="pageSize01"
                   :total="total01"
                   style="margin-top:10px;display:inline-block;width:50%"
-                  layout="total"
+                  layout="total, sizes, prev, pager, next, jumper"
                   @size-change="handleSizeChange01"
                   @current-change="handleCurrentChange01"/>
               </div>
@@ -264,11 +264,11 @@
               <div class="block">
                 <el-pagination
                   :current-page="pageCurrent02"
-                  :page-sizes="[10, 20, 30, 40]"
+                  :page-sizes="[50, 100, 150, 200]"
                   :page-size="pageSize02"
                   :total="total02"
                   style="margin-top:10px;display:inline-block;width:50%"
-                  layout="total"
+                  layout="total, sizes, prev, pager, next, jumper"
                   @size-change="handleSizeChange02"
                   @current-change="handleCurrentChange02"/>
               </div>
@@ -317,10 +317,10 @@
           <div class="block" style="margin-top: 10px;">
             <el-pagination
               :current-page="pageCurrent5"
-              :page-sizes="[10, 20, 30, 40]"
+              :page-sizes="[50, 100, 150, 200]"
               :page-size="pageSize5"
               :total="total5"
-              layout="total"
+              layout="total, sizes, prev, pager, next, jumper"
               @size-change="handleSizeChange5"
               @current-change="handleCurrentChange5"/>
           </div>
@@ -398,13 +398,13 @@ export default {
       PartType: '标准件',
       PartType2: '车间生产',
       pageCurrent00: 1,
-      pageSize00: 1000,
+      pageSize00: 50,
       pageCurrent01: 1,
       pageSize01: 10,
       pageCurrent02: 1,
-      pageSize02: 1000,
+      pageSize02: 50,
       pageCurrent: 1,
-      pageSize: 1000,
+      pageSize: 50,
       pageCurrent1: 1,
       pageSize1: 10,
       pageCurrent2: 1,
@@ -496,19 +496,20 @@ export default {
       this.Machine ? this.check1 = 1 : this.check1 = 0
       this.Group ? this.check2 = 1 : this.check2 = 0
       searchTable(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
-        for (let i = 0; i < response.data.rows.length; i++) {
-          if (response.data.rows[i].入库时间 !== '') {
-            response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
+        console.log(response.data)
+        for (let i = 0; i < response.data.result.length; i++) {
+          if (response.data.result[i].入库时间) {
+            response.data.result[i].入库时间 = response.data.result[i].入库时间.split(' ', 2)[0]
           }
-          if (response.data.rows[i].计划完成时间 !== '') {
-            response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
+          if (response.data.result[i].计划完成时间) {
+            response.data.result[i].计划完成时间 = response.data.result[i].计划完成时间.split(' ', 2)[0]
           }
-          if (response.data.rows[i].机加工实际完成时间 !== '') {
-            response.data.rows[i].机加工实际完成时间 = response.data.rows[i].机加工实际完成时间.split(' ', 2)[0]
+          if (response.data.result[i].机加工实际完成时间) {
+            response.data.result[i].机加工实际完成时间 = response.data.result[i].机加工实际完成时间.split(' ', 2)[0]
           }
         }
-        this.tableData = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.tableData = response.data.result
+        this.total = parseInt(response.data.output[0].ItemCount)
         this.loading = false
       })
       searchTable22(this.check1, this.Machine, this.check2, this.Group, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {