From 818eceb3502c6dc97e97902222aac3c8257b5bea Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Tue, 17 Mar 2020 16:58:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=88=B6=E4=BB=B6=E5=8A=A0=E5=BA=8F?=
 =?UTF-8?q?=E5=88=98=E7=92=90=E7=8F=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManufacturingCenter/AddingOrder/index.vue | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/views/ManufacturingCenter/AddingOrder/index.vue b/src/views/ManufacturingCenter/AddingOrder/index.vue
index 1e3a5ed4..a4937a78 100644
--- a/src/views/ManufacturingCenter/AddingOrder/index.vue
+++ b/src/views/ManufacturingCenter/AddingOrder/index.vue
@@ -24,14 +24,15 @@
       <el-button type="danger" class="el-icon-delete" size="small" plain style="margin: 0px 10px;" @click="deleteProcess()">删除加序</el-button>
     </el-card>
     <el-row>
-      <el-col style="width: 550px">
+      <el-col style="width: 570px">
         <el-card>
           <el-table
             :data="tableData1"
             :row-class-name="tableRowClassName"
             loading="loading"
             class="table"
-            style="max-height: 830px"
+            style="max-height: 808px;"
+            height="663"
             highlight-current-row
             empty-text="   "
             border
@@ -78,6 +79,7 @@
       <el-col style="width: 810px">
         <el-card>
           <el-table
+            v-loading="loading0"
             :data="tableData"
             :row-class-name="tableRowClassName1"
             loading="loading"
@@ -254,6 +256,7 @@ import Cookie from 'js-cookie'
 export default {
   data() {
     return {
+      loading0: false,
       Machine: '', // 机床号
       Machines: [],
       Group: '', // 组号
@@ -422,7 +425,8 @@ export default {
     }, // 按条件查询
     getTableData() {
       this.tableData = []
-      this.Loading = true
+      // this.tableData1 = []
+      this.loading0 = true
       if (this.Machine === '') {
         this.checkbox_Machine = 0
       } else {
@@ -457,7 +461,9 @@ export default {
           }
         }
         this.total = response.data.total
-        this.loading = false
+        this.loading0 = false
+      }).catch(() => {
+        this.loading0 = false
       })
     },
     getID(row) {
@@ -465,6 +471,9 @@ export default {
     },
     // 获取工序表
     getCurrentRow(row) {
+      if (row === null) {
+        return
+      }
       this.completeTime = ''
       this.dateOfProduction = ''
       this.processSerialNumber = ''
@@ -490,7 +499,6 @@ export default {
           }
         }
       })
-      console.log(this.tableData1, 123)
     }, // 补加完成日期
     EditData() {
       this.dialogFormVisible = true
@@ -499,6 +507,7 @@ export default {
       this.form.完成时间 = ''
     },
     getRow(row) {
+      if (row === null) return
       this.Id = row.ID
       this.completeTime = row.完成日期
       this.dateOfProduction = row.排产日期