From 973c2b9178a52f754fef505405f0be8a0d525743 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Sat, 21 Mar 2020 10:17:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E6=8E=92=E4=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ManufacturingCenter/ShopScheduling.js |  3 +-
 .../ShopScheduling/index.vue                  | 28 ++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/api/ManufacturingCenter/ShopScheduling.js b/src/api/ManufacturingCenter/ShopScheduling.js
index 0bd43bc8..6933f49f 100644
--- a/src/api/ManufacturingCenter/ShopScheduling.js
+++ b/src/api/ManufacturingCenter/ShopScheduling.js
@@ -24,8 +24,7 @@ export function getParts(num1, num2, pageCurrent, pageSize) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间生产管理工艺_车间排产_零件查询',
-      param: `零件图号_check=${num1}&零件图号=${num2}`,
-      Pagination: pageCurrent + '&' + pageSize
+      param: `零件图号_check=${num1}&零件图号=${num2}&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue
index 27a52032..f72be551 100644
--- a/src/views/ManufacturingCenter/ShopScheduling/index.vue
+++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue
@@ -14,11 +14,17 @@
             </el-select>
           </el-row>
           <el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName" height="600" highlight-current-row size="mini" style="width: 100%" border @row-click="getGongxu">
-            <el-table-column
-              label="序号"
-              type="index"
-              align="center"
-              width="50"/>
+            <el-table-column label="序号" type="index" align="center" width="50"/>
+            <el-table-column label="机床图号" show-overflow-tooltip align="center" width="110px">
+              <template slot-scope="scope">
+                {{ scope.row.机床图号 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="图号及规格" show-overflow-tooltip align="center" width="150px">
+              <template slot-scope="scope">
+                {{ scope.row.图号及规格 }}
+              </template>
+            </el-table-column>
             <el-table-column label="图号及规格" show-overflow-tooltip align="center" width="150px">
               <template slot-scope="scope">
                 {{ scope.row.图号及规格 }}
@@ -29,16 +35,11 @@
                 {{ scope.row.零件名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="数量" align="center" width="70px">
+            <el-table-column label="投产数" align="center" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.投产数量 }}
               </template>
             </el-table-column>
-            <el-table-column label="计划开始" align="center" width="90px">
-              <template slot-scope="scope">
-                {{ scope.row.计划开始时间 }}
-              </template>
-            </el-table-column>
             <el-table-column label="计划完成" align="center" width="90px">
               <template slot-scope="scope">
                 {{ scope.row.计划结束时间 }}
@@ -165,18 +166,19 @@ export default {
       let check
       this.Parts ? check = 1 : check = 0
       getParts(check, this.Parts, this.pageCurrent, this.pageSize).then(response => {
-        response.data.rows.map(v => {
+        response.data.result.map(v => {
           this.tableData1.push({
             工艺计划流水号: v.工艺计划流水号,
             图号及规格: v.图号及规格,
             零件名称: v.零件名称,
+            机床图号: v.机床图号,
             投产数量: v.投产数量,
             计划开始时间: v.计划开始时间 ? v.计划开始时间.split(' ')[0] : '',
             计划结束时间: v.计划结束时间 ? v.计划结束时间.split(' ')[0] : '',
             状态: v.状态
           })
         })
-        this.total = response.data.total
+        this.total = parseInt(response.data.output[0].ItemCount)
         this.loading1 = false
       })
     },