更新

src/views/ManufacturingCenter/GroupMatching/index.vue

@@ -112,7 +112,6 @@
     </el-card>
     <el-card>
       <el-table
-        v-loading="listLoading1"
         :data="tableDataPurchase"
         border
         style="width: 100%;"
@@ -154,12 +153,17 @@
         </el-table-column>
         <el-table-column label="零件数量" align="center" min-width="80">
           <template slot-scope="scope">
-            {{ scope.row.货位存量 }}
+            {{ scope.row.数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件类型" align="center" min-width="80">
+        <el-table-column label="到货数量" align="center" min-width="80">
           <template slot-scope="scope">
-            {{ scope.row.类型名称 }}
+            {{ scope.row.实际到货数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="到货时间" align="center" min-width="80">
+          <template slot-scope="scope">
+            {{ scope.row.到货时间 }}
           </template>
         </el-table-column>
       </el-table>
@@ -177,7 +181,6 @@
 
     <el-card>
       <el-table
-        v-loading="listLoading2"
         :data="tableData1"
         border
         style="width: 100%;"
@@ -543,15 +546,16 @@ export default {
           }
         })
         searchPurchaseTable(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
-          console.log(response)
+          for (let i = 0; i < response.data.rows.length; i++) {
+            if (response.data.rows[i].到货时间 !== '' || response.data.rows[i].到货时间 !== null) {
+              response.data.rows[i].到货时间 = response.data.rows[i].到货时间.split(' ', 2)[0]
+            }
+          }
           this.tableDataPurchase = response.data.rows
-          this.listLoading1 = false
           this.total4 = parseInt(response.data.total)
         })
         searchTable1(this.check, this.entryNameValue, this.check1, this.machine, this.check2, this.groupNum, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {
-          console.log(response)
           this.tableData1 = response.data.rows
-          this.listLoading2 = false
           this.total5 = parseInt(response.data.total)
         })
       } else {
@@ -946,22 +950,6 @@ export default {
           sums[index] = '入库数量'
         } else if (index === 7) {
           sums[index] = this.totalNum + ' 件'
-          // const values = data.map(item => item['入库时间'])
-          // console.log(values)
-          // if (!values.every(value => value !== '')) {
-          //   sums[index] = values.reduce((prev, curr) => {
-          //     const value = curr
-          //     console.log(value)
-          //     if (value !== '') {
-          //       return this.totalNum1 + 1
-          //     } else {
-          //       return this.totalNum1
-          //     }
-          //   }, '')
-          //   sums[index] += '件'
-          // } else {
-          //   sums[index] = 'N/A'
-          // }
         }
       })
       return sums