From a1d19c9fc8bc32bb083321c72a4f71ed71ab1519 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 20 May 2020 15:55:16 +0800
Subject: [PATCH] a

---
 src/views/ManufacturingCenter/GroupMatching/index.vue | 11 +----------
 src/views/ManufacturingCenter/StatusQuery/index.vue   |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index 0bdf62c6..cca95312 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -27,7 +27,6 @@
     <el-card>
       <el-tabs v-model="PartType2" type="border-card" style="margin-top: 10px">
         <el-tab-pane label="车间生产" name="车间生产">
-          <!--<h3 style="text-align: center;">车间生产</h3>-->
           <el-table v-loading="loading" :data="tableData" :summary-method="getSummaries" style="width: 100%;margin-top: 6px" highlight-current-row height="600" size="mini" show-summary border stripe>
             <el-table-column align="center" label="零件图号">
               <template slot-scope="scope">
@@ -41,7 +40,7 @@
             </el-table-column>
             <el-table-column align="center" label="投产数量">
               <template slot-scope="scope">
-                {{ scope.row.投产数量 }}
+                {{ scope.row.投产数 }}
               </template>
             </el-table-column>
             <el-table-column align="center" label="入库数量">
@@ -536,14 +535,6 @@ export default {
         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 => {
-      //   console.log(response.data, 123243)
-      //   for (let i = 0; i < response.data.length; i++) {
-      //     if (response.data[i].入库时间 !== null) {
-      //       this.totalNum += 1
-      //     }
-      //   }
-      // })
       searchTable1(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
         this.tableData1 = response.data.rows
         this.total5 = parseInt(response.data.total)
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index b08916ef..53ba9053 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -52,7 +52,7 @@
         </el-table-column>
         <el-table-column align="center" label="数量" width="50px">
           <template slot-scope="scope">
-            {{ scope.row.批次数量 }}
+            {{ scope.row.投产数 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="质检数" width="65px">