From dda5114f52c5d15b93e4330cc19c8703a13132f6 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 23 Oct 2019 17:52:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InitialProduction/index.vue               | 48 ++++-----------
 .../ProductionCapacityBalance/index.vue       | 23 +++----
 .../PurchaseMaterielModify/index.vue          | 60 +++++++++----------
 3 files changed, 50 insertions(+), 81 deletions(-)

diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index 69cd60fc..7d11e704 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -29,7 +29,7 @@
                 :label="item.label"
                 :value="item.value"/>
             </el-select>
-            <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total = 0;pageSize = 10;pageList = 1;getTable()">查询</el-button>
+            <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total = 0;pageSize = 10000;pageList = 1;getTable()">查询</el-button>
           </el-form-item>
         </el-form>
       </el-col>
@@ -142,30 +142,6 @@
               {{ scope.row.零件类型名称 }}
             </template>
           </el-table-column>
-          <!--<el-table-column label="是否外协" align="center" width="90">-->
-          <!--<template slot-scope="scope">-->
-          <!--<el-checkbox v-model="tableData[scope.$index].checked_waixie" @change="gaibianwaixie(scope.$index, scope.row)"/>-->
-          <!--外协-->
-          <!--</template>-->
-          <!--</el-table-column>-->
-          <!--<el-table-column label="是否带料" align="center" width="90">-->
-          <!--<template slot-scope="scope">-->
-          <!--<el-checkbox :disabled="!tableData[scope.$index].checked_waixie" v-model="tableData[scope.$index].checked_dailiao"/>-->
-          <!--带料-->
-          <!--</template>-->
-          <!--</el-table-column>-->
-          <!--<el-table-column label="是否着急" align="center" width="90">-->
-          <!--<template slot-scope="scope">-->
-          <!--<el-checkbox v-model="tableData[scope.$index].checked_zhaoji"/>-->
-          <!--着急-->
-          <!--</template>-->
-          <!--</el-table-column>-->
-          <!--<el-table-column prop="name" label="打回原因" width="170" align="center">-->
-          <!--<template slot-scope="scope">-->
-          <!--<el-input v-model="tableData[scope.$index].name" type="textarea" :rows="1" style="width:150px" placeholder="原因">-->
-          <!--</el-input>-->
-          <!--</template>-->
-          <!--</el-table-column>-->
           <el-table-column label="操作" width="200px" fixed="right" align="center">
             <template slot-scope="scope">
               <el-button
@@ -174,24 +150,20 @@
                 type="primary"
                 plain
                 @click="handleEdit(scope.$index, scope.row, 'form')">分批投产</el-button>
-                <!--<el-button-->
-                <!--size="mini"-->
-                <!--type="primary"-->
-                <!--@click="handleDele(scope.$index, scope.row, 'form1')">打回</el-button>-->
             </template>
           </el-table-column>
         </el-table>
         <div class="block" style="margin-top: 10px;">
           <el-pagination
+            v-show="false"
             :current-page="currentPage"
-            :page-sizes="[10, 20, 30, 40]"
+            :page-sizes="[10, 20, 30, 10000]"
             :page-size="pageSize"
             :total="total"
             style="width:50%;display:inline-block;"
             layout="total, sizes, prev, pager, next, jumper"
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"/>
-          <!--<el-checkbox v-model="checked_baitu" style="margin-top:0px">是否白图</el-checkbox>-->
           <el-tooltip :open-delay="1200" effect="dark" content="打回到零件分配" placement="top">
             <el-button :loading="listLoading3" type="primary" size="small" style="float:right;margin-left: 10px" @click="back">打回</el-button>
           </el-tooltip>
@@ -267,15 +239,15 @@
         </el-table>
         <div class="block" style="margin-top: 10px;">
           <el-pagination
+            v-show="false"
             :current-page="currentPage3"
-            :page-sizes="[10, 20, 30, 40]"
+            :page-sizes="[10, 20, 30, 10000]"
             :page-size="pageSize3"
             :total="total3"
             layout="total, sizes, prev, pager, next, jumper"
             @size-change="handleSizeChange3"
             @current-change="handleCurrentChange3"/>
         </div>
-
       </div>
     </el-card>
 
@@ -425,11 +397,11 @@ export default {
       gongyijihua: '',
       radio: 0, // 第一组
       total: 0, // 总条数
-      pageSize: 10, // 每页显示条数
+      pageSize: 10000, // 每页显示条数
       pageList: 1, // 后台获取页
       currentPage: 1, // 显示当前页
       total3: 0, // 总条数
-      pageSize3: 10, // 每页显示条数
+      pageSize3: 10000, // 每页显示条数
       pageList3: 1, // 后台获取页
       currentPage3: 1, // 显示当前页
       listLoading: false,
@@ -724,7 +696,7 @@ export default {
                 this.listLoading1 = false
               })
               this.total = 0
-              this.pageSize = 10
+              this.pageSize = 10000
               this.pageList = 1
               this.getTable()
             } else {
@@ -787,7 +759,7 @@ export default {
             this.checked_baitu = false
             this.checked_gaonandu = false
             this.total = 0
-            this.pageSize = 10
+            this.pageSize = 10000
             this.pageList = 1
             this.shijiancuo1 = 0
             this.shijiancuo = 0
@@ -999,7 +971,7 @@ export default {
             message: '打回档案成功!'
           })
           this.total = 0
-          this.pageSize = 10
+          this.pageSize = 10000
           this.pageList = 1
           this.getTable()
         } else {
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index 7cee2dd8..7478a8dc 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -48,7 +48,7 @@
         style="top: 1px;"
         placeholder="选择开始日期"/>
       <el-tooltip :open-delay="1200" effect="dark" content="变更零件加工开始和结束时间" placement="top">
-        <el-button size="small" type="primary" style="margin: 10px" @click="PartPlan()">零件计划变更</el-button>
+        <el-button size="small" type="primary" @click="PartPlan()">零件计划变更</el-button>
       </el-tooltip>
       <el-button v-if="false" size="small" type="primary" icon="el-icon-download" @click="Export()">导出Excel</el-button>
       <el-table
@@ -134,24 +134,25 @@
       </el-table>
       <div v-if="是否扫描 === false" class="block" style="margin-top: 10px;">
         <el-pagination
+          v-show="false"
           :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="10"
+          :page-sizes="[10, 20, 30, 1000000]"
+          :page-size="pageSize"
           :total="total"
           style="float:left"
           layout="total, sizes, prev, pager, next, jumper"
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"/>
         <el-tooltip :open-delay="1200" effect="dark" content="将选中零件自动排出加工工序" placement="top">
-          <el-button type="warning" size="small" icon="el-icon-download" style="float:right;margin:5px 50px 10px 10px" @click="Selection">选入</el-button>
+          <el-button type="warning" size="small" icon="el-icon-download" @click="Selection">选入</el-button>
         </el-tooltip>
-        <el-button type="warning" size="small" icon="el-icon-download" style="float:right;margin:5px 20px 10px 10px" @click="SelectionAll">全部选入</el-button>
+        <el-button type="warning" size="small" icon="el-icon-download" @click="SelectionAll">全部选入</el-button>
       </div>
       <div v-if="是否扫描 === true" class="block" style="margin-top: 10px;">
         <el-pagination
           :current-page="currentPage5"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="10"
+          :page-sizes="[10, 20, 30, 1000000]"
+          :page-size="pageSize5"
           :total="total5"
           style="float:left"
           layout="total, sizes, prev, pager, next, jumper"
@@ -424,7 +425,7 @@
           <el-pagination
             :current-page="currentPage1"
             :page-sizes="[10, 20, 30, 40]"
-            :page-size="10"
+            :page-size="pageSize1"
             :total="total1"
             style="float:left"
             layout="total, sizes, prev, pager, next, jumper"
@@ -705,15 +706,15 @@ export default {
       tableData2: [], // 导出临时表
       length: 0, // 记TABLEDATA1的长度
       total: 0, // 总条数
-      pageSize: 10, // 每页显示条数
+      pageSize: 1000000, // 每页显示条数
       pageList: 1, // 后台获取页
       currentPage: 1, // 显示当前页
       total1: 0, // 总条数
-      pageSize1: 10, // 每页显示条数
+      pageSize1: 1000000, // 每页显示条数
       pageList1: 1, // 后台获取页
       currentPage1: 1, // 显示当前页
       total5: 0, // 总条数
-      pageSize5: 10, // 每页显示条数
+      pageSize5: 1000000, // 每页显示条数
       pageList5: 1, // 后台获取页
       currentPage5: 1 // 显示当前页
     }
diff --git a/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue b/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
index 1013682b..1afdf371 100644
--- a/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
+++ b/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
@@ -13,39 +13,35 @@
             {{ scope.row.申请人姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="原物料" align="center">
-          <el-table-column label="原物料名称" align="center" min-width="150px">
-            <template slot-scope="scope">
-              {{ scope.row.原物料名称 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="原物料规格" align="center" min-width="150px">
-            <template slot-scope="scope">
-              {{ scope.row.原物料规格 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="原物料型号" align="center" min-width="150px">
-            <template slot-scope="scope">
-              {{ scope.row.原物料型号 }}
-            </template>
-          </el-table-column>
+        <el-table-column label="原物料名称" align="center" min-width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.原物料名称 }}
+          </template>
         </el-table-column>
-        <el-table-column label="新物料" align="center">
-          <el-table-column label="新物料名称" align="center" min-width="150px">
-            <template slot-scope="scope">
-              {{ scope.row.新物料名称 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="新物料规格" align="center" min-width="150px">
-            <template slot-scope="scope">
-              {{ scope.row.新物料规格 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="新物料型号" align="center" min-width="150px">
-            <template slot-scope="scope">
-              {{ scope.row.新物料型号 }}
-            </template>
-          </el-table-column>
+        <el-table-column label="原物料规格" align="center" min-width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.原物料规格 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="原物料型号" align="center" min-width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.原物料型号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="新物料名称" align="center" min-width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.新物料名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="新物料规格" align="center" min-width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.新物料规格 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="新物料型号" align="center" min-width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.新物料型号 }}
+          </template>
         </el-table-column>
         <el-table-column label="是否同意修改" width="200px" align="center" fixed="right">
           <template slot-scope="scope">