From 5c02dac392f37ce7f9155dd2e6a8bdd704da69bb Mon Sep 17 00:00:00 2001
From: sujiaqi <liulujia@meswork.com>
Date: Thu, 6 Feb 2020 23:06:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E9=80=A0=E4=B8=AD=E5=BF=83-=E5=88=B6?=
 =?UTF-8?q?=E9=80=A0=EF=BC=88=E9=9B=B6=E4=BB=B6=E5=88=86=E9=85=8D=EF=BC=8C?=
 =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=EF=BC=8C=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E8=83=BD=E5=8A=9B=E5=B9=B3=E8=A1=A1=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InitialProduction/index.vue                  | 14 ++++++++------
 .../ManufacturingCenter/PartAssignment/index.vue | 10 +++++-----
 .../ProductionCapacityBalance/index.vue          | 16 ++++++++--------
 .../OutsourcingPaymentPlanManagement/index.vue   |  4 ++--
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue
index 5fe39080..f268c55d 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 = 10000;pageList = 1;getTable()">查询</el-button>
+            <el-button type="primary" size="small" icon="el-icon-search" style="margin-left:10px" plain @click="total = 0;pageSize = 10000;pageList = 1;getTable()">查询</el-button>
           </el-form-item>
         </el-form>
       </el-col>
@@ -103,7 +103,7 @@
             type="selection"
             align="center"
             width="35"/>
-          <el-table-column label="零件号" prop="零件图号" align="center" min-width="220">
+          <el-table-column label="零件号" prop="零件图号" align="center" min-width="150">
             <template slot-scope="scope">
               {{ scope.row.零件图号 }}
             </template>
@@ -148,18 +148,20 @@
               {{ scope.row.零件类型名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="170px" fixed="right" align="center">
+          <el-table-column label="操作" width="220px" fixed="right" align="center">
             <template slot-scope="scope">
               <el-button
                 :disabled="checked_hebing"
                 size="mini"
                 type="primary"
+                icon="el-icon-star-off"
                 style="padding: 4px 8px"
                 plain
                 @click="handleEdit(scope.$index, scope.row, 'form')">分批投产</el-button>
               <el-button
                 size="mini"
                 type="primary"
+                icon="el-icon-star-off"
                 style="padding: 4px 8px"
                 plain
                 @click="handleEditNumber(scope.$index, scope.row)">更改数量</el-button>
@@ -178,13 +180,13 @@
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"/>
           <el-tooltip :open-delay="1200" effect="dark" content="打回到零件分配" placement="top">
-            <el-button :loading="listLoading3" type="danger" 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" plain @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-button :loading="listLoading3" type="warning" size="small" style="float:right;" plain @click="production">投产</el-button>
           </el-tooltip>
           <el-tooltip :open-delay="1200" effect="dark" content="选中零件进行备料投产" placement="top">
-            <el-button :loading="listLoading3" type="success" size="small" style="float:right;" @click="production10">备料投产</el-button>
+            <el-button :loading="listLoading3" type="primary" size="small" style="float:right;" plain @click="production10">备料投产</el-button>
           </el-tooltip>
           <el-tooltip :open-delay="1200" effect="dark" content="将零件加急处理" placement="top">
             <el-checkbox v-model="checked_UrgentItem" style="float:right;margin-top:10px;margin-right:10px">是否加急</el-checkbox>
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index 060763bd..03e6e2b7 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -64,7 +64,7 @@
     <el-card>
       <el-tabs type="border-card" @tab-click="selectPart">
         <el-tab-pane label="基本件">
-          <el-table :data="tableData1" :row-class-name="tableRowClassName1" border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
+          <el-table :data="tableData1" :row-class-name="tableRowClassName1" stripe border size="mini" style="width: 100%" height="300px" @selection-change="handleSelectionChange">
             <el-table-column align="center" width="50" type="selection"/>
             <el-table-column label="零件名称" align="center" width="120px">
               <template slot-scope="scope">
@@ -229,15 +229,15 @@
         placeholder="选择日期"/>
       <span style="font-weight: bold">制造:</span>
       <el-tooltip :open-delay="1200" effect="dark" content="将零件选择到采购单" placement="top">
-        <el-button type="success" size="small" icon="el-icon-star-off" style="margin-top: 3px; margin-left: 5px" @click="purchaseRequisition()">制造部采购</el-button>
+        <el-button type="primary" size="small" icon="el-icon-star-off" plain style="margin-top: 3px; margin-left: 5px" @click="purchaseRequisition()">制造部采购</el-button>
       </el-tooltip>
       <span style="margin-left: 40px;font-weight: bold">金工:</span>
       <el-tooltip :open-delay="1200" effect="dark" content="所选零件分配为自家生产" placement="top">
-        <el-button type="danger" size="small" icon="el-icon-star-off" style="margin-top: 3px; margin-left: 5px" @click="Production()">车间生产</el-button>
+        <el-button type="danger" size="small" icon="el-icon-star-off" plain style="margin-top: 3px; margin-left: 5px" @click="Production()">车间生产</el-button>
       </el-tooltip>
       <span style="margin-left: 40px;font-weight: bold">采购:</span>
       <el-tooltip :open-delay="1200" effect="dark" content="所选零件分配到采购部" placement="top">
-        <el-button type="primary" size="small" icon="el-icon-star-off" style="margin-top: 3px; margin-left: 5px" @click="PurchasingDepartment()">采购部门采购</el-button>
+        <el-button type="success" size="small" icon="el-icon-star-off" plain style="margin-top: 3px; margin-left: 5px" @click="PurchasingDepartment()">采购部门采购</el-button>
       </el-tooltip>
     </el-card>
     <el-card>
@@ -252,7 +252,7 @@
     <el-row>
       <el-col style="width: 400px">
         <el-card>
-          <el-table :data="tableData4" border size="mini" style="width: 100%" height="300px" highlight-current-row @row-click="searchDetailed">
+          <el-table :data="tableData4" stripe border size="mini" style="width: 100%" height="300px" highlight-current-row @row-click="searchDetailed">
             <el-table-column label="请购单号" show-overflow-tooltip align="center" width="120px">
               <template slot-scope="scope">
                 {{ scope.row.请购单编号 }}
diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
index 7d2a2e7b..f14ca5c5 100644
--- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
+++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue
@@ -21,11 +21,11 @@
               :value="item.value"/>
           </el-select>
           <el-input v-model="partNumber" clearable size="small" placeholder="零件图号" style="width: 150px;margin: 0px 10px;"/>
-          <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-button v-if="是否扫描 === false" size="small" type="primary" icon="el-icon-search" plain style="margin: 10px 0 0 10px" @click="total = 0;pageList = 1;getTable()">查询</el-button>
+          <el-button v-if="是否扫描 === true" size="small" type="primary" icon="el-icon-search" plain style="margin: 10px 0 0 10px" @click="total5 = 0;pageList5 = 1;getTable5()">查询</el-button>
           <el-checkbox v-if="false" v-model="是否扫描">是否扫描查询</el-checkbox>
           <el-tooltip :open-delay="1200" effect="dark" content="变更零件加工开始和结束时间" style="margin-left:200px" placement="top">
-            <el-button size="small" type="primary" @click="PartPlan()">零件计划变更</el-button>
+            <el-button size="small" type="warning" plain @click="PartPlan()">零件计划变更</el-button>
           </el-tooltip>
           <el-date-picker
             v-model="startTime"
@@ -139,9 +139,9 @@
           @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" @click="Selection">选入</el-button>
+          <el-button type="warning" size="small" icon="el-icon-download" plain @click="Selection">选入</el-button>
         </el-tooltip>
-        <el-button type="warning" size="small" icon="el-icon-download" @click="SelectionAll">全部选入</el-button>
+        <el-button type="warning" size="small" icon="el-icon-download" plain @click="SelectionAll">全部选入</el-button>
       </div>
       <div v-if="是否扫描 === true" class="block" style="margin-top: 10px;">
         <el-pagination
@@ -428,11 +428,11 @@
             @current-change="handleCurrentChange1"/>
           <div style="float:right">
             <el-tooltip :open-delay="1200" effect="dark" content="自动计算工序加工时间" placement="top">
-              <el-button type="primary" size="small" style="margin:5px 10px 10px 10px" @click="Discharge">虚拟排产</el-button>
+              <el-button type="warning" size="small" style="margin:5px 10px 10px 10px" plain @click="Discharge">虚拟排产</el-button>
             </el-tooltip>
-            <el-button v-if="可以确定零件计划" type="primary" size="small" style="margin:5px 10px 10px 10px" @click="Plan" >确定零件计划</el-button>
+            <el-button v-if="可以确定零件计划" type="warning" size="small" style="margin:5px 10px 10px 10px" plain @click="Plan" >确定零件计划</el-button>
             <el-tooltip :open-delay="1200" effect="dark" content="选出重新设置零件的加工时间" placement="top">
-              <el-button type="danger" size="small" icon="el-icon-upload2" style="float:right;margin:5px 50px 10px 10px" @click="allOut">全部选出</el-button>
+              <el-button type="danger" size="small" icon="el-icon-upload2" style="float:right;margin:5px 50px 10px 10px" plain @click="allOut">全部选出</el-button>
             </el-tooltip>
           </div>
         </div>
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index 2b8d5423..a43552a6 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -50,7 +50,7 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=20;searchTable()">查询</el-button>
+        <el-button type="primary" class="el-icon-search" size="small" plain @click="pageCurrent=1;pageSize=20;searchTable()">查询</el-button>
       </el-row>
       <el-table v-loading="loading" :data="tableData" height="500" size="mini" stripe style="width: 100%;" border highlight-current-row element-loading-text="拼命加载中">
         <el-table-column label="序号" type="index" align="center" fixed="left" width="50"/>
@@ -174,7 +174,7 @@
               <el-button :disabled="scope.row.实际付款时间!==''" size="mini" type="primary" plain class="el-icon-edit" @click="Withdrawing(scope.$index, scope.row, 'form2')">扣款</el-button>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="付款信息" placement="top">
-              <el-button :disabled="scope.row.实际付款时间!==''||scope.row.单据状态!=='3'" size="mini" type="success" class="el-icon-check" @click="payment(scope.$index, scope.row)">付款</el-button>
+              <el-button :disabled="scope.row.实际付款时间!==''||scope.row.单据状态!=='3'" size="mini" type="success"  class="el-icon-check" @click="payment(scope.$index, scope.row)">付款</el-button>
             </el-tooltip>
           </template>
         </el-table-column>