From 3fdd766ebdb9374ecca7a7fd3941651694329b27 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Tue, 31 Mar 2020 15:26:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=AE=9A=E9=A2=9D=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManufacturingCenter/PartWorkCraftSelect_rdlc.js    |  3 +--
 .../PartWorkCraftSelect_rdlc/index.vue                 | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
index 02349744..5c48899d 100644
--- a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
+++ b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js
@@ -53,8 +53,7 @@ export function search(pageCurrent, pageSize, check1, val1, check2, val2, check3
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_按机床分组图号人员查',
-      param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${val5}&编制开始时间=${val5}&编制结束时间=${val6}`,
-      Pagination: pageCurrent + '&' + pageSize
+      param: `机床流水号_check=${check1}&机床流水号=${val1}&组件流水号_check=${check2}&组件流水号=${val2}&零件图号_check=${check3}&零件图号=${val3}&人员编号_check=${check4}&人员编号=${val4}&编制时间_check=${val5}&编制开始时间=${val5}&编制结束时间=${val6}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
index ee9305eb..32b4e1bb 100644
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -47,7 +47,7 @@
       </div>
     </el-card>
     <el-row>
-      <el-col style="width: 750px">
+      <el-col style="width: 700px">
         <el-card>
           <el-table v-loading="loading" :data="tableData" size="mini" height="740" style="width: 750px" border stripe highlight-current-row @selection-change="handleSelectionChange" @row-click="click">
             <el-table-column type="selection" align="center" width="50"/>
@@ -81,7 +81,7 @@
                 {{ scope.row.批次数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="工艺员" prop="工艺员" align="center" width="67px">
+            <el-table-column label="工艺员" prop="工艺员" align="center" width="90px">
               <template slot-scope="scope">
                 {{ scope.row.工艺员 }}
               </template>
@@ -115,7 +115,7 @@
           </div>
         </el-card>
       </el-col>
-      <el-col style="width: 1000px">
+      <el-col style="width: 680px">
         <el-card v-if="tableData2.length">
           <table class="tg">
             <tr>
@@ -296,8 +296,8 @@ export default {
       this.personValue ? check4 = 1 : check4 = 0
       this.finishTime ? check5 = 1 : (check5 = 0, this.finishTime = '')
       search(this.pageCurrent, this.pageSize, check1, this.machineNumberValue, check2, this.groupNumberValue, check3, this.PrNum, check4, this.personValue, check5, this.finishTime[0], this.finishTime[1]).then(response => {
-        this.tableData = response.data.rows
-        this.total = response.data.total
+        this.tableData = response.data.result
+        this.total = parseInt(response.data.output[0].ItemCount)
         this.loading = false
       })
     },