From 6a18d961182e4ee20b99bbfb4862607d7b9c704a Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Tue, 18 Feb 2020 14:33:57 +0800
Subject: [PATCH] a

---
 .../ProcessTaskAssignment/index.vue           |  4 +--
 .../ProcessingStatusNew/index.vue             | 25 ++++++++-----------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index 1c54d590..b009adba 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -80,8 +80,8 @@
       </div>
     </el-card>
 
-    <el-dialog :visible.sync="dialogFormVisible" :title="title" center width="400px">
-      <el-table ref="multipleTable" :data="tableData2" size="mini" height="400" border>
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" :title="title" center width="400px">
+      <el-table :data="tableData2" size="mini" height="400" border>
         <el-table-column align="center" label="序号" width="80">
           <template slot-scope="scope">
             {{ scope.row.工序顺序 }}
diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
index 67e2a617..c4aadfcd 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -29,9 +29,9 @@
       <el-col style="width: 37%">
         <el-card>
           <el-table
+            v-loading="loading2"
             :data="tableData1"
             :row-class-name="tableRowClassName1"
-            loading="loading"
             class="table"
             style="max-height: 830px"
             highlight-current-row
@@ -44,11 +44,6 @@
                 {{ scope.row.工艺名称 }}
               </template>
             </el-table-column>
-            <!--<el-table-column align="center" label="已完数量" show-overflow-tooltip min-width="70">-->
-            <!--<template slot-scope="scope">-->
-            <!--{{ scope.row.完成数量 }}-->
-            <!--</template>-->
-            <!--</el-table-column>-->
             <el-table-column align="center" label="质检" width="60">
               <template slot-scope="scope">
                 {{ scope.row.序间质检 }}
@@ -75,20 +70,15 @@
       <el-col style="width: 63%">
         <el-card>
           <el-table
+            v-loading="loading"
             ref="singleTable"
             :data="tableData"
             :row-class-name="tableRowClassName"
-            loading="loading"
             class="table"
             highlight-current-row
             border
             height="630"
             @row-click="getCurrentRow">
-            <!--<el-table-column type="index" align="center" label="跟单号" width="140">-->
-            <!--<template slot-scope="scope">-->
-            <!--<el-radio :label="scope.row.跟单号" v-model="radio"/>-->
-            <!--</template>-->
-            <!--</el-table-column>-->
             <el-table-column align="center" label="零件图号" show-overflow-tooltip width="200">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
@@ -127,6 +117,7 @@
           </el-table>
           <div class="block">
             <el-pagination
+              v-if="!loading"
               :current-page="pageCurrent"
               :page-sizes="[100, 200, 300, 400]"
               :page-size="pageSize"
@@ -285,7 +276,8 @@ export default {
       Groups: [],
       number: '', // 零件图号
       tableData: [], // 工序表
-      loading: '',
+      loading: false,
+      loading2: false,
       checkbox_Machine: '', // 机床
       checkbox_Group: '', // 分组
       checkbox_number: '',
@@ -529,12 +521,13 @@ export default {
         this.Group = response.data[0].组件流水号
       })
       this.getTableData()
-    }, // 按条件查询
+    },
+    // 按条件查询
     getTableData() {
       this.tableData = []
       this.tableData1 = []
       this.isDisabled = true
-      this.Loading = true
+      this.loading = true
       if (this.Machine === '') {
         this.checkbox_Machine = 0
       } else {
@@ -574,6 +567,7 @@ export default {
     },
     // 获取工序表
     getCurrentRow(row) {
+      this.loading2 = true
       this.批次数量 = row.批次数量
       this.index = row.index
       this.row2 = row.工艺计划流水号
@@ -599,6 +593,7 @@ export default {
               完成数量: response.data[i].完成数量
             })
           }
+          this.loading2 = false
         }
       })
     },