From b1f4fd336894f56b09838f3eccde9b57c14cac20 Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Tue, 5 Nov 2019 09:27:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManufacturingCenter/InitialProduction/index.vue    |  4 ++--
 .../ProductionCapacityBalance/index.vue                | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index bde6f60f..46c70e4d 100644
--- a/src/views/ManufacturingCenter/InitialProduction/index.vue
+++ b/src/views/ManufacturingCenter/InitialProduction/index.vue
@@ -165,13 +165,13 @@
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"/>
           <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-button :loading="listLoading3" type="danger" size="small" style="float:right;margin-left: 10px" @click="back">打回</el-button>
           </el-tooltip>
           <el-tooltip :open-delay="1200" effect="dark" content="选中零件进行投产" placement="top">
             <el-button :loading="listLoading3" type="primary" size="small" style="float:right;" @click="production">投产</el-button>
           </el-tooltip>
           <el-tooltip :open-delay="1200" effect="dark" content="选中零件进行备料投产" placement="top">
-            <el-button :loading="listLoading3" type="primary" size="small" style="float:right;" @click="production10">备料投产</el-button>
+            <el-button :loading="listLoading3" type="success" size="small" style="float:right;" @click="production10">备料投产</el-button>
           </el-tooltip>
           <el-tooltip :open-delay="1200" effect="dark" content="将不同组号中相同图号的零件合并" placement="top">
             <el-checkbox v-model="checked_hebing" style="float:right;margin-top:10px;margin-right:10px">合并生产</el-checkbox>
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index b65efc54..11a4aa3e 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -136,7 +136,7 @@
         <el-pagination
           v-show="false"
           :current-page="currentPage"
-          :page-sizes="[10, 20, 30, 1000000]"
+          :page-sizes="[10, 20, 30, 100]"
           :page-size="pageSize"
           :total="total"
           style="float:left"
@@ -151,7 +151,7 @@
       <div v-if="是否扫描 === true" class="block" style="margin-top: 10px;">
         <el-pagination
           :current-page="currentPage5"
-          :page-sizes="[10, 20, 30, 1000000]"
+          :page-sizes="[10, 20, 30, 100]"
           :page-size="pageSize5"
           :total="total5"
           style="float:left"
@@ -706,15 +706,15 @@ export default {
       tableData2: [], // 导出临时表
       length: 0, // 记TABLEDATA1的长度
       total: 0, // 总条数
-      pageSize: 1000000, // 每页显示条数
+      pageSize: 100, // 每页显示条数
       pageList: 1, // 后台获取页
       currentPage: 1, // 显示当前页
       total1: 0, // 总条数
-      pageSize1: 1000000, // 每页显示条数
+      pageSize1: 10, // 每页显示条数
       pageList1: 1, // 后台获取页
       currentPage1: 1, // 显示当前页
       total5: 0, // 总条数
-      pageSize5: 1000000, // 每页显示条数
+      pageSize5: 100, // 每页显示条数
       pageList5: 1, // 后台获取页
       currentPage5: 1 // 显示当前页
     }