From 7e830d562c5da67ce323c307daad4f28f528c858 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 20 Mar 2019 09:55:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=83=BD=E5=8A=9B=E5=B9=B3?=
 =?UTF-8?q?=E8=A1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProductionCapacityBalance/index.vue       | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index e8d423a4..0c9914fb 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -27,8 +27,8 @@
           <span>零件图号:</span>
           <el-input v-model="partNumber" clearable size="small" placeholder="零件图号" style="width: 200px;"/>
 
-          <el-button v-if="是否扫描 === false" size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="total = 0;pageSize = 10;pageList = 1;getTable()">查询</el-button>
-          <el-button v-if="是否扫描 === true" size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="total5 = 0;pageSize5 = 10;pageList5 = 1;getTable5()">查询</el-button>
+          <el-button v-if="是否扫描 === false" size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="total = 0;pageList = 1;getTable()">查询</el-button>
+          <el-button v-if="是否扫描 === true" size="small" type="success" icon="el-icon-search" style="margin: 10px 0 0 10px" @click="total5 = 0;pageList5 = 1;getTable5()">查询</el-button>
           <el-checkbox v-if="false" v-model="是否扫描">是否扫描查询</el-checkbox>
 
         </el-row>
@@ -431,11 +431,10 @@
             @current-change="handleCurrentChange1"/>
           <div style="float:right">
             <el-button type="primary" size="small" style="margin:5px 10px 10px 10px" @click="Discharge">虚拟排产</el-button>
-            <el-button type="primary" size="small" style="margin:5px 10px 10px 10px" @click="Plan" >确定零件计划</el-button>
+            <el-button :disabled="listLoading1" type="primary" size="small" style="margin:5px 10px 10px 10px" @click="Plan" >确定零件计划</el-button>
             <el-button type="danger" size="small" icon="el-icon-upload2" style="float:right;margin:5px 50px 10px 10px" @click="allOut">全部选出</el-button>
           </div>
         </div>
-
       </div>
     </el-card>
 
@@ -1103,11 +1102,9 @@ export default {
             if (this.result1 === this.multipleSelection.length) {
               this.result1 = 0
               this.total1 = 0
-              this.pageSize1 = 10
               this.pageList1 = 1
               this.Selection1()
               this.total = 0
-              this.pageSize = 10
               this.pageList = 1
               this.getTable()
             }
@@ -1128,11 +1125,9 @@ export default {
           }
         }).then(() => {
           this.total = 0
-          this.pageSize = 10
           this.pageList = 1
           this.getTable()
           this.total1 = 0
-          this.pageSize1 = 10
           this.pageList1 = 1
           this.Selection1()
         })
@@ -1148,7 +1143,6 @@ export default {
       xuanchu(this.工艺计划流水号[index]).then(response => {
       }).then(() => {
         this.pageList = 1
-        this.pageSize = 10
         this.total = 0
         this.getTable()
       }).then(() => {
@@ -1232,7 +1226,6 @@ export default {
                   this.计划日期.push(response.data[i].计划日期)
                 }
               })
-              this.listLoading1 = false
             })
           }
         } else {
@@ -1240,6 +1233,8 @@ export default {
           this.listLoading1 = false
           this.total1 = 0
         }
+      }).then(() => {
+        this.listLoading1 = false
       })
     },
     // 调整
@@ -1285,11 +1280,9 @@ export default {
           }
         }).then(() => {
           this.total = 0
-          this.pageSize = 10
           this.pageList = 1
           this.getTable()
           this.total1 = 0
-          this.pageSize1 = 10
           this.pageList1 = 1
           this.Selection1()
         })
@@ -1408,7 +1401,6 @@ export default {
             message: '板焊结束时间修改成功!'
           })
           this.pageList = 1
-          this.pageSize = 10
           this.total = 0
           this.getTable()
         } else {
@@ -1495,7 +1487,6 @@ export default {
                     if (i === this.multipleSelection.length - 1) {
                       this.$message.success('零件计划制定成功')
                       this.pageList = 1
-                      this.pageSize = 10
                       this.total = 0
                       this.getTable()
                     }
@@ -1565,7 +1556,6 @@ export default {
           }).then(() => {
             this.total = 0
             this.pageList = 1
-            this.pageSize = 10
             this.getTable()
           })
         })