From fd6d5b806af712fab9dd621d1c8594b640674acc Mon Sep 17 00:00:00 2001
From: yanggongyan <929128837@qq.com>
Date: Sat, 8 Feb 2020 15:26:52 +0800
Subject: [PATCH 1/5] 1

---
 .../EquipmentMonitoring/index.vue                    |  2 +-
 .../ContractInformationManagement/index.vue          |  8 ++++----
 src/views/MarketingCenter/CreateProject/index.vue    | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
index 930631c3..97f66d79 100644
--- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
+++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
@@ -553,7 +553,7 @@
         <div style="margin-top: 6px">
           <div class="circle4" style="margin-top: 3px"/>
           <el-tooltip>
-            <div slot="content">设备开机<br/>电流计正常工作<br/>工控机关机</div>
+            <div slot="content">设备开机<br/>电流计正常工作<br/> 工控机关机</div>
             <span style="margin-left: 5px">电脑关机</span>
           </el-tooltip>
         </div>
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index dceca54c..ecab7e45 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -177,10 +177,10 @@
         <el-table-column label="操作" align="center" width="170">
           <template slot-scope="scope">
             <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-circle-plus-outline"
-            @click.stop="addMachine(scope.row);flag = 1">增加机床</el-button>
+              size="mini"
+              type="text"
+              icon="el-icon-circle-plus-outline"
+              @click.stop="addMachine(scope.row);flag = 1">增加机床</el-button>
             <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button
diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index 0ef7b892..f875869d 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -86,12 +86,12 @@
             <el-table-column label="操作" align="center" width="160">
               <template slot-scope="scope">
                 <!--<el-tooltip :open-delay="1200" effect="dark" content="增加机床" placement="top">-->
-                  <!--<el-button-->
-                    <!--size="mini"-->
-                    <!--type="warning"-->
-                    <!--plain-->
-                    <!--icon="el-icon-plus"-->
-                    <!--@click.stop="addMachine(scope.row);flag = 1">机床</el-button>-->
+                <!--<el-button-->
+                <!--size="mini"-->
+                <!--type="warning"-->
+                <!--plain-->
+                <!--icon="el-icon-plus"-->
+                <!--@click.stop="addMachine(scope.row);flag = 1">机床</el-button>-->
                 <!--</el-tooltip>-->
                 <el-button
                   size="mini"

From a565d53262fc7515f1ee9aece882b43d178295bd Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Sat, 8 Feb 2020 16:13:43 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E7=89=A9=E6=96=99=E5=87=BA=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Inventory/MaterialOut.js          |  4 ++--
 src/views/Inventory/MaterialOut/index.vue | 29 ++++++++++++++++-------
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js
index 797881b9..81fd68f8 100644
--- a/src/api/Inventory/MaterialOut.js
+++ b/src/api/Inventory/MaterialOut.js
@@ -35,14 +35,14 @@ export function searchgroup(num) {
   })
 }
 // 领料单查询
-export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) {
+export function searchList(pageCurrent, pageSize, listPeople_check, listPeople, check1, time1, time2) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间装配管理_领料单_查询数据',
-      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber + '&是否审批=1',
+      param: '制单人_check=' + listPeople_check + '&制单人=' + listPeople + '&时间段_check=' + check1 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&是否审批=1',
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index b9199e7f..77f9a30e 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -2,11 +2,21 @@
   <div class="app-container">
     <el-card>
       <div style="margin-top: 8px;margin-bottom: 8px">
-        <span style="margin: 5px">领料单编号:</span>
-        <el-input v-model="pickingListNumber" clearable size="small" style="width:200px" />
-        <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
+        <el-date-picker
+          v-model="startTime"
+          size="small"
+          type="daterange"
+          align="center"
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+          range-separator="～"
+          style="width:250px"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"/>
+        <el-input v-model="pickingListPeople" clearable size="small" placeholder="制单人" style="width:120px;margin-left: 10px" />
+        <el-button size="small" type="primary" plain icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
         <!--        <el-button size="small" type="warning" style="float: right;margin-right: 10px" @click="prepareConfirm()">备料确认</el-button>-->
-        <el-button :disabled="审批未通过===true" size="small" type="primary" style="float: right; margin-right: 30px" @click="inputPassword()">领料确认</el-button>
+        <el-button :disabled="审批未通过===true" size="small" type="warning" plain style="float: right; margin-right: 30px" @click="inputPassword()">领料确认</el-button>
       </div>
     </el-card>
     <div style="width: 27%;float: left;margin-right: 16px">
@@ -264,6 +274,8 @@ export default {
       pickingListNumber: '',
       pickingListNumberShow: '',
       pickListTable1: [],
+      startTime: '',
+      pickingListPeople: '', // 制单人
       pageCurrent3: 1,
       pageSize3: 10000,
       total3: 0,
@@ -532,9 +544,10 @@ export default {
     },
     // 查询领料单列表
     searchList() {
-      let check
-      this.pickingListNumber ? check = 1 : check = 0
-      searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber).then(response => {
+      let check, check1
+      this.pickingListPeople ? check = 1 : check = 0
+      this.startTime ? check1 = 1 : (check1 = 0, this.startTime = '')
+      searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListPeople, check1, this.startTime[0], this.startTime[1]).then(response => {
         this.pickListTable1 = response.data.rows
         this.total3 = response.data.total
       })
@@ -569,7 +582,7 @@ export default {
       })
     },
     tableRowClassName({ row }) {
-      if (parseInt(row.是否审批) === 0) {
+      if (parseInt(row.是否审批) === 1) {
         return 'shenpi-row'
       } else {
         return ''

From b4ab7b62bcf044330b412304fc8fbf76d6394f3d Mon Sep 17 00:00:00 2001
From: yangjiahang <asdasd>
Date: Sat, 8 Feb 2020 16:18:50 +0800
Subject: [PATCH 3/5] a

---
 config/index.js                               |  4 +-
 src/views/BasicData/MenuManagement/index.vue  | 21 ++++++-
 .../PartsNumberMaintenance/index.vue          | 15 +++--
 .../BasicData/PersonnelManagement/index.vue   | 31 +++++++---
 src/views/BasicData/ShiftManagement/index.vue | 21 ++++++-
 .../SystemRrolemaintenance/index.vue          | 21 ++++++-
 .../WorkshopPersonnelRoleMana/index.vue       | 21 ++++++-
 .../WorkshopProcessMaintenance/index.vue      | 23 ++++++-
 src/views/Inventory/InventoryCheck/index.vue  | 21 ++++++-
 .../Inventory/InventoryManagement/index.vue   | 23 ++++++-
 src/views/Inventory/MaterialOut/index.vue     |  2 +-
 src/views/Inventory/OfflinePartOut/index.vue  |  2 +-
 .../Inventory/OfflinePartsStorage/index.vue   | 21 ++++++-
 .../Inventory/PurchaseInRecord/index.vue      |  2 +-
 .../Inventory/PurchaseOutRecord/index.vue     |  2 +-
 .../Inventory/PurchasePartsStorage/index.vue  | 21 ++++++-
 .../ActualWorkQuery/index.vue                 |  2 +-
 .../ContractDetailsInquiry/index.vue          |  2 +-
 .../InventoryQuery/index.vue                  |  2 +-
 .../MonthEndHourAccounting/index.vue          |  4 +-
 .../PartWorkCraftSelect_rdlc/index.vue        |  2 +-
 .../ProcessPlanningNew/index.vue              | 22 +++----
 .../ProcessTaskAssignment/index.vue           |  6 +-
 src/views/MarketingCenter/BidBond/index.vue   | 37 ++++++++---
 src/views/MarketingCenter/CRM/index.vue       | 47 ++++++++++++--
 .../ComprehensiveInquiryMS/index.vue          |  6 +-
 .../ContractCapitalManagement/index.vue       |  5 +-
 .../ContractInformationManagement/index.vue   | 61 ++++++++++++-------
 .../DeliveryApplication/index.vue             | 33 +++++++---
 .../MarketingCenter/InvoiceRecord/index.vue   | 33 +++++++---
 .../MarketingCenter/PerformanceBond/index.vue |  4 +-
 .../MarketingCenter/ProjectProgress/index.vue |  6 +-
 .../MarketingCenter/SafetyMargin/index.vue    |  4 +-
 .../ShippingInquiries/index.vue               |  4 +-
 .../OutFactoryMaintenance/index.vue           | 19 +++++-
 .../OutsourcingPartsQuery/index.vue           |  4 +-
 .../index.vue                                 |  4 +-
 .../OutsourcingTaskExecution/index.vue        | 39 ++++++++----
 .../OutsourcingTaskQuery/index.vue            |  6 +-
 .../InvoiceSettlementApprove/index.vue        |  2 +-
 40 files changed, 460 insertions(+), 145 deletions(-)

diff --git a/config/index.js b/config/index.js
index 7609b831..6427159f 100644
--- a/config/index.js
+++ b/config/index.js
@@ -7,8 +7,8 @@ const os = require('os')
 
 const networkInterfaces = os.networkInterfaces()
 
-const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address
-// const ip = '127.0.0.1'
+// const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address
+const ip = '127.0.0.1'
 module.exports = {
   dev: {
     // Paths
diff --git a/src/views/BasicData/MenuManagement/index.vue b/src/views/BasicData/MenuManagement/index.vue
index 46147ef0..d2f56526 100644
--- a/src/views/BasicData/MenuManagement/index.vue
+++ b/src/views/BasicData/MenuManagement/index.vue
@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="7">
         <el-card style="margin-bottom: 20px">
-          <el-button size="small" type="primary" @click="addFisrtLevel">创建一级菜单</el-button>
+          <el-button size="small" class="button111" @click="addFisrtLevel">创建一级菜单</el-button>
         </el-card>
         <el-card>
           <div slot="header">
@@ -83,7 +83,7 @@
       </el-col>
       <el-col :span="7">
         <el-card style="margin-bottom: 20px">
-          <el-button size="small" type="primary" @click="addSecondLevel">创建二级菜单</el-button>
+          <el-button size="small" class="button111" @click="addSecondLevel">创建二级菜单</el-button>
         </el-card>
         <el-card>
           <div slot="header">
@@ -394,3 +394,20 @@ export default {
     padding-right: 8px;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/BasicData/PartsNumberMaintenance/index.vue b/src/views/BasicData/PartsNumberMaintenance/index.vue
index 55d90c68..4d5167f1 100644
--- a/src/views/BasicData/PartsNumberMaintenance/index.vue
+++ b/src/views/BasicData/PartsNumberMaintenance/index.vue
@@ -22,13 +22,13 @@
       <span>零件图号:</span>
       <el-input v-model="partNumber" clearable filterable size="small" placeholder="零件图号" style="width: 200px;"/>
 
-      <el-button icon="el-icon-search" type="success" size="small" @click="pageCurrentWB = 1;pageSizeWB = 10;pageCurrent = 1;pageSize = 10;getTableData();pageCurrent1 = 1;pageSize1 = 10;getTable();pageCurrent2 = 1;pageSize2 = 10;getTable1()">查询</el-button>
+      <el-button icon="el-icon-search" type="primary" size="small" plain @click="pageCurrentWB = 1;pageSizeWB = 10;pageCurrent = 1;pageSize = 10;getTableData();pageCurrent1 = 1;pageSize1 = 10;getTable();pageCurrent2 = 1;pageSize2 = 10;getTable1()">查询</el-button>
     </el-card>
     <el-card>
       <div>
         <span style="font-size: 20px">基本件三表数量</span>
         <el-tooltip :open-delay="1000" effect="dark" content="删除基本件三表数量" placement="top">
-          <el-button style="float: right;margin-bottom: 3px" type="danger" size="small" @click="alldelete()">全部删除</el-button>
+          <el-button style="float: right;margin-bottom: 3px" type="danger" size="small" plain @click="alldelete()">全部删除</el-button>
         </el-tooltip>
       </div>
       <el-table
@@ -151,7 +151,7 @@
       <div>
         <span style="font-size: 20px">外购件和标准件三表数量</span>
         <el-tooltip :open-delay="1000" effect="dark" content="删除外购件和标准件数量" placement="top">
-          <el-button style="float: right;margin-bottom: 3px" type="danger" size="small" @click="alldeleteWB()">全部删除</el-button>
+          <el-button style="float: right;margin-bottom: 3px" type="danger" size="small" plain @click="alldeleteWB()">全部删除</el-button>
         </el-tooltip>
       </div>
       <el-table
@@ -222,11 +222,13 @@
             <el-button
               size="mini"
               type="primary"
+              plain
               icon="el-icon-edit"
               @click="type=1;handleEdit(scope.row)">编辑</el-button>
             <el-button
               size="mini"
               type="danger"
+              plain
               icon="el-icon-delete"
               @click="handleDelete(scope.row)">删除</el-button>
           </template>
@@ -291,6 +293,7 @@
               <el-button
                 size="mini"
                 type="primary"
+                plain
                 @click="type=1;handleEdit(scope.row)">编辑</el-button>
             </template>
           </el-table-column>
@@ -350,6 +353,7 @@
             <el-button
               size="mini"
               type="primary"
+              plain
               @click="handleEdit(scope.row)">编辑</el-button>
           </template>
         </el-table-column>
@@ -421,6 +425,7 @@
                 <el-button
                   size="mini"
                   type="primary"
+                  plain
                   @click="type=2;handleEdit(scope.row)">编辑</el-button>
               </template>
             </el-table-column>
@@ -505,7 +510,7 @@
     <el-card>
       <div>
         <span style="font-size: 20px">临时表</span>
-        <el-button style="float: right" type="danger" size="small" @click="alldelete5()">全部删除</el-button>
+        <el-button style="float: right" type="danger" size="small" plain @click="alldelete5()">全部删除</el-button>
       </div>
       <el-tabs v-model="activeName" style="margin-top: 10px" type="border-card" @tab-click="searchTable5();searchTable6()">
         <el-tab-pane label="标准件和外购件" name="1">
@@ -550,6 +555,7 @@
                 <el-button
                   size="mini"
                   type="danger"
+                  plain
                   @click="handleDelete5(scope.row)">删除</el-button>
               </template>
             </el-table-column>
@@ -603,6 +609,7 @@
                 <el-button
                   size="mini"
                   type="danger"
+                  plain
                   @click="handleDelete6(scope.row)">删除</el-button>
               </template>
             </el-table-column>
diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue
index deb1164d..e27e0da0 100644
--- a/src/views/BasicData/PersonnelManagement/index.vue
+++ b/src/views/BasicData/PersonnelManagement/index.vue
@@ -3,9 +3,9 @@
     <el-row>
       <el-col :span="6">
         <el-card>
-          <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd('department_Form')">新增</el-button>
-          <el-button type="warning" icon="el-icon-edit" size="small" @click="handleEdit()">编辑</el-button>
-          <el-button type="danger" icon="el-icon-delete" size="small" @click="deleteTable()">删除</el-button>
+          <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd('department_Form')">新增</el-button>
+          <el-button type="warning" icon="el-icon-edit" size="small" plain @click="handleEdit()">编辑</el-button>
+          <el-button type="danger" icon="el-icon-delete" size="small" plain @click="deleteTable()">删除</el-button>
         </el-card>
       </el-col>
       <el-col :span="18">
@@ -14,10 +14,10 @@
           <el-input v-model="Name" placeholder="请输入人员名称" class="input-with-select" size="small" style="width: 200px; margin-right: 15px" clearable>
             <el-button slot="append" icon="el-icon-search" @click="fetchPeopleForName"/>
           </el-input>
-          <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="addPeople()">新增</el-button>
-          <el-button type="danger" icon="el-icon-circle-close-outline" size="small" @click="Quit()">离职</el-button>
-          <el-button type="text" size="small" style="float: right" @click="searchLeavingList">离职名单</el-button>
-          <el-button v-popover:popover4 :disabled="disabledMove" type="success" icon="el-icon-sort" size="small" @click="moveGroup">移动
+          <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" @click="addPeople()">新增</el-button>
+          <el-button type="danger" icon="el-icon-circle-close-outline" size="small" plain @click="Quit()">离职</el-button>
+          <el-button type="text" size="small" style="float: right" plain @click="searchLeavingList">离职名单</el-button>
+          <el-button v-popover:popover4 :disabled="disabledMove" type="success" icon="el-icon-sort" size="small" plain @click="moveGroup">移动
           </el-button>
           <!--<el-button size="small" @click="postMaintain()">岗位维护</el-button>-->
           <el-popover
@@ -912,3 +912,20 @@ export default {
 <style scoped>
 
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/BasicData/ShiftManagement/index.vue b/src/views/BasicData/ShiftManagement/index.vue
index 9c4d1c72..99082e4c 100644
--- a/src/views/BasicData/ShiftManagement/index.vue
+++ b/src/views/BasicData/ShiftManagement/index.vue
@@ -9,8 +9,8 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="searchTable()">查询</el-button>
-      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="addShifttable()">新增</el-button>
+      <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 15px" plain @click="searchTable()">查询</el-button>
+      <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" @click="addShifttable()">新增</el-button>
       <el-button type="warning" icon="el-icon-circle-plus-outline" plain size="small" @click="ShiftType()">班次类型工作时间</el-button>
     </el-card>
 
@@ -475,3 +475,20 @@ export default {
     margin: 0px;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/BasicData/SystemRrolemaintenance/index.vue b/src/views/BasicData/SystemRrolemaintenance/index.vue
index 6116e022..ad0c1740 100644
--- a/src/views/BasicData/SystemRrolemaintenance/index.vue
+++ b/src/views/BasicData/SystemRrolemaintenance/index.vue
@@ -3,8 +3,8 @@
     <el-card>
       <!--      <span>角色功能:</span>-->
       <el-input v-model="RoleFunctioning" size="small" clearable placeholder="请输入角色功能" style="width:200px"/>
-      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="searchData()">查询</el-button>
-      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
+      <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 15px" plain @click="searchData()">查询</el-button>
+      <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
     </el-card>
     <el-card style="margin-top: 0px">
       <el-table
@@ -216,3 +216,20 @@ export default {
     margin: 0px;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue
index ede3a0eb..60ffc6be 100644
--- a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue
+++ b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue
@@ -13,8 +13,8 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="searchData">查询</el-button>
-        <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" @click="handelAdd">增加</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 15px" plain @click="searchData">查询</el-button>
+        <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" @click="handelAdd">增加</el-button>
       </el-card>
 
       <el-card>
@@ -403,3 +403,20 @@ export default {
     margin: 0px;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
index f8f99a4c..6f5f66b4 100644
--- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue
+++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue
@@ -7,9 +7,9 @@
             <span>工艺分类：</span>
           </el-row>
           <el-row>
-            <el-button type="primary" style="margin: 3px" icon="el-icon-circle-plus-outline" size="small" @click="addProcessClassification()">新增</el-button>
-            <el-button size="small" style="margin-left: 10px" type="warning" icon="el-icon-edit-outline" @click="editProcessClassification()">编辑</el-button>
-            <el-button size="small" style="margin-left: 10px" type="danger" icon="el-icon-delete" @click="delProcessClassification()">删除</el-button>
+            <el-button class="button111" style="margin: 3px" icon="el-icon-circle-plus-outline" size="small" @click="addProcessClassification()">新增</el-button>
+            <el-button size="small" style="margin-left: 10px" type="warning" icon="el-icon-edit-outline" plain @click="editProcessClassification()">编辑</el-button>
+            <el-button size="small" style="margin-left: 10px" type="danger" icon="el-icon-delete" plain @click="delProcessClassification()">删除</el-button>
           </el-row>
         </el-card>
       </el-col>
@@ -606,3 +606,20 @@ export default {
     }
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue
index 31d5b1d0..72c1130a 100644
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -20,8 +20,8 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=20;searchMaterial()">查询</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>
+          <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="pageCurrent=1;pageSize=20;searchMaterial()">查询</el-button>
+          <el-button class="button111" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>
         </el-row>
       </div>
       <el-table :data="tableData1" stripe highlight-current-row border height="550px" style="width: 850px" size="mini">
@@ -384,3 +384,20 @@ export default {
     width:165px
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue
index 79c95e6f..cf46232e 100644
--- a/src/views/Inventory/InventoryManagement/index.vue
+++ b/src/views/Inventory/InventoryManagement/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <div slot="header" class="clearfix">
-        <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADD()">新建仓库</el-button>
+        <el-button size="small" class="button111" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADD()">新建仓库</el-button>
       </div>
       <el-table :data="tableData" border stripe highlight-current-row size="mini" style="width: 100%;max-height: 300px" height="300" @row-click="getWarehouse">
         <el-table-column label="仓库编号" align="center" width="90" show-overflow-tooltip>
@@ -41,7 +41,7 @@
               size="mini"
               icon="el-icon-edit"
               plain
-              type="warning"
+              type="primary"
               @click="handleEdit(scope.$index, scope.row, 'form')">修改</el-button>
             <el-button
               size="mini"
@@ -49,7 +49,7 @@
               plain
               icon="el-icon-delete"
               @click="handleDelete(scope.row)">删除</el-button>
-            <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" plain style="margin: 0 0 0 10px" @click="ADDLocate()">增加货位</el-button>
+            <el-button size="mini" class="button111" icon="el-icon-circle-plus-outline" plain style="margin: 0 0 0 10px" @click="ADDLocate()">增加货位</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -605,3 +605,20 @@ export default {
     margin: 10px 0 10px 10px;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index b9199e7f..b730652a 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -4,7 +4,7 @@
       <div style="margin-top: 8px;margin-bottom: 8px">
         <span style="margin: 5px">领料单编号:</span>
         <el-input v-model="pickingListNumber" clearable size="small" style="width:200px" />
-        <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
+        <el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchList()">查询</el-button>
         <!--        <el-button size="small" type="warning" style="float: right;margin-right: 10px" @click="prepareConfirm()">备料确认</el-button>-->
         <el-button :disabled="审批未通过===true" size="small" type="primary" style="float: right; margin-right: 30px" @click="inputPassword()">领料确认</el-button>
       </div>
diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue
index e9a2284f..9fc75916 100644
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -8,7 +8,7 @@
         <!--<el-input v-model="materialSpec" placeholder="物料规格" clearable size="small"/>-->
         <!--<span>物料型号：</span>-->
         <!--<el-input v-model="materialModel" placeholder="物料型号" clearable size="small"/>-->
-        <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
+        <el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="pageCurrent1=1;pageSize1=20;total1=0;searchTable1()">查询</el-button>
       </el-row>
     </el-card>
 
diff --git a/src/views/Inventory/OfflinePartsStorage/index.vue b/src/views/Inventory/OfflinePartsStorage/index.vue
index b6818390..58873d1c 100644
--- a/src/views/Inventory/OfflinePartsStorage/index.vue
+++ b/src/views/Inventory/OfflinePartsStorage/index.vue
@@ -17,7 +17,7 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button type="success" size="small" style="margin-left: 10px" @click="searchContractDetail">查询明细</el-button>
+      <el-button type="primary" size="small" style="margin-left: 10px" plain @click="searchContractDetail">查询明细</el-button>
     </el-card>
     <el-card>
       <el-table ref="multipleTable" :data="table1" border stripe size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px">
@@ -68,7 +68,7 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button type="primary" style="margin-left: 5px" size="small" @click="submitInStorage">确认入库</el-button>
+      <el-button class="button111" style="margin-left: 5px" size="small" @click="submitInStorage">确认入库</el-button>
     </el-card>
   </div>
 </template>
@@ -351,3 +351,20 @@ export default {
 <style scoped>
 
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue
index fb22417f..3a28894d 100644
--- a/src/views/Inventory/PurchaseInRecord/index.vue
+++ b/src/views/Inventory/PurchaseInRecord/index.vue
@@ -22,7 +22,7 @@
         <el-input v-model="name" placeholder="名称图号规格" style="width:150px;margin-left: 10px" clearable size="small" @keyup.enter.native="searchRecord()"/>
         <!--<el-input v-model="model" placeholder="图号或型号" style="width:150px;margin-left: 10px" clearable size="small" />-->
         <!--<el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;margin: 0px 10px" />-->
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchRecord()">查询</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="searchRecord()">查询</el-button>
       </el-row>
       <el-row v-show="false" style="margin-bottom:10px">
         <el-date-picker
diff --git a/src/views/Inventory/PurchaseOutRecord/index.vue b/src/views/Inventory/PurchaseOutRecord/index.vue
index 1ae4bcc2..8db31c35 100644
--- a/src/views/Inventory/PurchaseOutRecord/index.vue
+++ b/src/views/Inventory/PurchaseOutRecord/index.vue
@@ -22,7 +22,7 @@
         <el-input v-model="name" placeholder="名称图号规格" clearable size="small" style="width:150px;margin-left: 10px" @keyup.enter.native="pageCurrent1=1;pageSize1=100;searchRecord()"/>
         <!--<el-input v-model="model" placeholder="图号或型号" clearable size="small" style="width:150px;margin-left: 10px" />-->
         <!--<el-input v-model="spec" placeholder="规格" clearable size="small" style="width:150px;margin: 0px 10px" />-->
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=100;searchRecord()">查询</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="pageCurrent1=1;pageSize1=100;searchRecord()">查询</el-button>
       </el-row>
       <el-row v-show="false" style="margin-bottom:10px">
         <el-date-picker
diff --git a/src/views/Inventory/PurchasePartsStorage/index.vue b/src/views/Inventory/PurchasePartsStorage/index.vue
index bf9eed2b..31ce6d78 100644
--- a/src/views/Inventory/PurchasePartsStorage/index.vue
+++ b/src/views/Inventory/PurchasePartsStorage/index.vue
@@ -25,7 +25,7 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button type="success" size="small" style="margin-left: 10px" @click="searchContractDetail">查询明细</el-button>
+      <el-button type="primary" size="small" style="margin-left: 10px" plain @click="searchContractDetail">查询明细</el-button>
     </el-card>
     <el-card>
       <el-table ref="multipleTable" :data="table1" border stripe size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px" @selection-change="handleSelectionChange">
@@ -72,7 +72,7 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button type="primary" style="margin: 10px" size="small" @click="submitInStorage">确认入库</el-button>
+      <el-button class="button111" style="margin: 10px" size="small" @click="submitInStorage">确认入库</el-button>
     </el-card>
   </div>
 </template>
@@ -475,3 +475,20 @@ export default {
     margin-bottom: 5px;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue
index 8ffe0043..8984137e 100644
--- a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue
+++ b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue
@@ -14,7 +14,7 @@
           @change="pageCurrent=1;total=0;searchTable()"/>
         <span>操作者:</span>
         <el-input v-model="workerName" placeholder="操作者" size="small" clearable style="width:100px; margin-top: 10px;margin-bottom: 10px"/>
-        <el-button :disabled="loading" type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="pageCurrent=1;total=0;searchTable();">查询</el-button>
+        <el-button :disabled="loading" type="primary" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" plain @click="pageCurrent=1;total=0;searchTable();">查询</el-button>
       </el-row>
     </el-card>
 
diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
index 2daef2e2..57c42f58 100644
--- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
+++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
@@ -31,7 +31,7 @@
       <el-input v-model="totalProcessingHours" clearable size="small" style="margin-right:10px;width: 100px"/>
       <span>计划总工时（小时）:</span>
       <el-input v-model="totalPlannedHours" clearable size="small" style="margin-right:10px;width: 100px"/>
-      <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchTable()">查询</el-button>
+      <el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchTable()">查询</el-button>
     </el-card>
     <el-card>
       <el-table :data="tableData" highlight-current-row border style="width: 100%;" size="mini" height="300">
diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue
index f7a8ec02..18349977 100644
--- a/src/views/ManufacturingCenter/InventoryQuery/index.vue
+++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue
@@ -6,7 +6,7 @@
           <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable style="margin-bottom: 10px; width: 180px;"/>
           <!--          <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
           <!--          <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
-          <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
           <!--          <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>-->
         </el-row>
       </div>
diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
index f42b1569..cce8e487 100644
--- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
+++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
@@ -12,8 +12,8 @@
         style="width:250px;margin-left: 5px;margin-top: 10px;margin-bottom: 10px"
         start-placeholder="开始日期"
         end-placeholder="结束日期"/>
-      <el-button size="small" type="success" icon="el-icon-search" style="margin-left: 5px" @click="searchTable">查询</el-button>
-      <el-button size="small" type="primary" icon="el-icon-download" @click="exportExcel">导出</el-button>
+      <el-button size="small" type="primary" icon="el-icon-search" style="margin-left: 5px" plain @click="searchTable">查询</el-button>
+      <el-button size="small" type="primary" icon="el-icon-download" plain @click="exportExcel">导出</el-button>
     </el-card>
     <el-card>
       <el-table :data="tableData" size="mini" style="max-height: 720px" height="720px" border>
diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
index 7a7fd68d..1cb6a61a 100644
--- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
+++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue
@@ -28,7 +28,7 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-button type="success" size="small" style="margin: 0px 10px" icon="el-icon-search" @click="pageCurrent=1;pageSize=300;total=0;searchData()">查询</el-button>
+          <el-button type="primary" size="small" style="margin: 0px 10px" icon="el-icon-search" plain @click="pageCurrent=1;pageSize=300;total=0;searchData()">查询</el-button>
           <el-tooltip effect="dark" content="将零件打回，重新编制工艺定额" placement="top">
             <el-button v-show="true" type="danger" plain style="margin-left: 0px;margin-top: 3px" icon="el-icon-edit" size="small" @click="returnEdit">零件工艺调整</el-button>
           </el-tooltip>
diff --git a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
index fdc5d7b2..d14edc10 100644
--- a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue
@@ -29,7 +29,7 @@
         </el-option>
       </el-select>
       <el-checkbox v-model="checked" :disabled="isShow2 || (parseInt(token) !== 6 && parseInt(token) !== 19)" size="small" style="margin-left:10px">是否核准</el-checkbox>
-      <el-button :disabled="disabled" type="baocun" size="small" icon="el-icon-tickets" @click="saveApprove">保存</el-button>
+      <el-button :disabled="disabled" type="success" size="small" plain icon="el-icon-tickets" @click="saveApprove">保存</el-button>
       <el-button v-show="isShowN" type="text" style="margin-top: 8px;float: right" @click="isShowN=false">折叠</el-button>
       <el-button v-show="!isShowN" type="text" style="margin-top: 8px;float: right" @click="isShowN=true">展开</el-button>
     </el-card>
@@ -69,7 +69,7 @@
             <el-input-number v-model="diameter" size="small" controls-position="right" style="width:100px;margin-top: 7px"/>
             <span>长度:</span>
             <el-input-number v-model="height2" size="small" controls-position="right" style="width:100px;margin-top:3px;"/>
-            <el-button style="margin-top: 3px;margin-left: 10px;" type="success" size="small" @click="Calculation1()">计算重量</el-button>
+            <el-button style="margin-top: 3px;margin-left: 10px;" type="primary" size="small" plain @click="Calculation1()">计算重量</el-button>
             <span>重量:</span>
             <el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
               <el-button slot="append" icon="el-icon-cjn-09" @click="saveWeight"/>
@@ -84,7 +84,7 @@
             <el-input-number v-model="Width" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
             <span>厚:</span>
             <el-input-number v-model="height1" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
-            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation2()">计算重量
+            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" plain @click="Calculation2()">计算重量
             </el-button>
             <span>重量:</span>
             <el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
@@ -112,7 +112,7 @@
             <el-input-number v-model="bianhou" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
             <span>长度:</span>
             <el-input-number v-model="changdu" size="small" controls-position="right" style="width:100px;margin-top:20px;"/>
-            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" @click="Calculation4()">计算重量
+            <el-button style="margin-top: 20px;margin-left: 10px;" type="primary" size="small" plain @click="Calculation4()">计算重量
             </el-button>
             <span>重量:</span>
             <el-input v-model="weight" style="width:150px" size="small" placeholder="重量">
@@ -150,21 +150,21 @@
         </el-select>
         <span>公差:</span>
         <el-input v-model="tolerance" size="small" style="width:100px" placeholder="公差"/>
-        <el-button style="margin-left: 10px" type="success" size="small" @click="calTol()">计算公差</el-button>
+        <el-button style="margin-left: 10px" type="primary" size="small" plain @click="calTol()">计算公差</el-button>
         <el-button-group v-if="isShow1" style="margin-left: 10px" >
-          <el-button v-if="isShow1" type="info" size="small" icon="el-icon-document" @click="pasteTable">粘贴
+          <el-button v-if="isShow1" type="info" size="small" icon="el-icon-document" plain @click="pasteTable">粘贴
           </el-button>
-          <el-button v-if="true" :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="DYbtn">原有
+          <el-button v-if="true" :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" plain @click="DYbtn">原有
           </el-button>
-          <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" @click="WYbtn">
+          <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-tickets" plain @click="WYbtn">
             完艺
           </el-button>
-          <el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" @click="deleteTable">删除
+          <el-button :disabled="disabled" type="danger" size="small" icon="el-icon-delete" plain @click="deleteTable">删除
           </el-button>
-          <el-button v-if="isShow1" type="baocun" size="small" icon="el-icon-tickets" style="margin-left: 1px;margin-right: 1px" @click="copyAndSave">
+          <el-button v-if="isShow1" type="success" size="small" icon="el-icon-tickets" style="margin-left: 1px;margin-right: 1px" plain @click="copyAndSave">
             复制并保存
           </el-button>
-          <el-button :disabled="disabled" type="baocun" size="small" icon="el-icon-tickets" @click="saveApprove">保存
+          <el-button :disabled="disabled" type="success" size="small" icon="el-icon-tickets" plain @click="saveApprove">保存
           </el-button>
         </el-button-group>
         <el-button v-if="!isShow1" type="warning" size="small" icon="el-icon-tickets" @click="saveCompiled">记录修改备注</el-button>
diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
index 282a1c6a..f50ddaa6 100644
--- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue
@@ -22,9 +22,9 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button type="primary" size="small" icon="el-icon-bangzhu" style="margin-left: 10px" @click="selectAll(tableData)">全选</el-button>
-      <el-button type="baocun" size="small" icon="el-icon-upload" style="margin-left: 10px" @click="save">保存</el-button>
-      <el-button type="baocun" size="small" icon="el-icon-upload" style="margin-left: 10px;float: right" @click="currency">通用件保存</el-button>
+      <el-button type="primary" size="small" icon="el-icon-bangzhu" style="margin-left: 10px" plain @click="selectAll(tableData)">全选</el-button>
+      <el-button type="success" size="small" icon="el-icon-upload" style="margin-left: 10px" plain @click="save">保存</el-button>
+      <el-button type="success" size="small" icon="el-icon-upload" style="margin-left: 10px;float: right" plain @click="currency">通用件保存</el-button>
     </el-card>
     <el-card>
       <el-table
diff --git a/src/views/MarketingCenter/BidBond/index.vue b/src/views/MarketingCenter/BidBond/index.vue
index ce745441..0eb43e36 100644
--- a/src/views/MarketingCenter/BidBond/index.vue
+++ b/src/views/MarketingCenter/BidBond/index.vue
@@ -25,8 +25,8 @@
       <!--        size="small"-->
       <!--        type="date"-->
       <!--        placeholder="请选择结束日期"/>-->
-      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
-      <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button>
+      <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
+      <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;margin-right: 15px" @click="addBidBond();flag1 = 2">新增</el-button>
     </el-card>
 
     <!--投标保证金表格-->
@@ -70,7 +70,7 @@
         </el-table-column>
         <el-table-column align="center" label="保证金金额" width="100">
           <template slot-scope="scope">
-            <el-tag style="width: 80px" size="mini">{{ Number(scope.row.保证金金额).toFixed(2) }}</el-tag>
+            <span style="width: 80px" size="mini">{{ Number(scope.row.保证金金额).toFixed(2) }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="中标服务费" width="100">
@@ -90,8 +90,8 @@
         </el-table-column>
         <el-table-column align="center" label="实收回金额" width="100">
           <template slot-scope="scope">
-            <el-tag v-if="parseInt(scope.row.是否收回) === 2" size="mini" type="success" style="width: 66px">{{ scope.row.应收回金额 }}</el-tag>
-            <el-tag v-else slot="reference" type="danger" size="mini" style="width: 66px">未收回</el-tag>
+            <span v-if="parseInt(scope.row.是否收回) === 2" size="mini" type="success" style="width: 66px">{{ scope.row.应收回金额 }}</span>
+            <span v-else slot="reference" type="danger" size="mini" style="width: 66px">未收回</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="投标人" prop="投标人" width="100">
@@ -133,7 +133,7 @@
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="200">
+        <el-table-column label="操作" fixed="right" align="center" width="320">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="收回" placement="top">
               <div style="display: inline-block">
@@ -142,7 +142,7 @@
                   size="mini"
                   type="text"
                   icon="el-icon-money"
-                  @click.stop="TakeBack(scope.row);flag1 = 1"/>
+                  @click.stop="TakeBack(scope.row);flag1 = 1">收回</el-button>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1000" class="item" effect="dark" content="转入履约金" placement="top">
@@ -153,7 +153,7 @@
                   type="text"
                   style="margin-left: 20px"
                   icon="el-icon-stopwatch"
-                  @click.stop="ComplianceGold(scope.row)"/>
+                  @click.stop="ComplianceGold(scope.row)">转入履约金</el-button>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1000" class="item" effect="dark" content="编辑" placement="top">
@@ -164,7 +164,7 @@
                   type="text"
                   style="margin-left: 20px"
                   icon="el-icon-edit-outline"
-                  @click.stop="editBidBond(scope.row);flag1 = 3"/>
+                  @click.stop="editBidBond(scope.row);flag1 = 3">编辑</el-button>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1000" class="item" effect="dark" content="删除" placement="top">
@@ -175,7 +175,7 @@
                   type="text"
                   style="margin-left: 20px"
                   icon="el-icon-delete"
-                  @click.stop="delBidBond(scope.row)"/>
+                  @click.stop="delBidBond(scope.row)">删除</el-button>
               </div>
             </el-tooltip>
           </template>
@@ -782,3 +782,20 @@ export default {
 <style scoped>
 
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue
index 9aa4de6a..828e18b1 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -21,11 +21,11 @@
       <!--:value="item.value">-->
       <!--</el-option>-->
       <!--</el-select>-->
-      <el-button type="success" icon="el-icon-search" class="move" size="small" style="margin-left: 10px" @click="selectCustomerOfName">查询</el-button>
+      <el-button type="primary" icon="el-icon-search" class="move" size="small" style="margin-left: 10px" plain @click="selectCustomerOfName">查询</el-button>
     </el-card>
     <el-card>
-      <el-button icon="el-icon-circle-plus-outline" type="primary" size="small" style="margin-top: 3px;" @click="addMarketingManager();flag = 1" >添加营销经理</el-button>
-      <el-button icon="el-icon-circle-plus-outline" type="primary" plain size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">新增客户</el-button>
+      <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px;" @click="addMarketingManager();flag = 1" >添加营销经理</el-button>
+      <el-button class="button222" icon="el-icon-circle-plus-outline" size="small" style="margin-top: 3px" @click = "addCustomer();flag1 = 1">新增客户</el-button>
       <el-table v-loading="loading3" :data="tableData3" highlight-current-row height="192" size="mini" stripe style="width: 100%;margin-top: 3px;margin-bottom: 0px" border>
         <!--<el-table-column label="责权省份" align="center" min-width="80">-->
         <!--<template slot-scope="scope">-->
@@ -52,7 +52,7 @@
             {{ scope.row.出生日期 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="100px" fixed="right">
+        <el-table-column label="操作" align="center" width="150px" fixed="right">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" class="item" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
@@ -60,7 +60,7 @@
                   size="mini"
                   type="text"
                   class="el-icon-edit-outline"
-                  @click="handleEditMarketingManager(scope.row);flag = 2"/>
+                  @click="handleEditMarketingManager(scope.row);flag = 2">编辑</el-button>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1000" class="item" effect="dark" content="删除" placement="top">
@@ -70,7 +70,7 @@
                   type="text"
                   style="margin-left: 20px"
                   class="el-icon-delete"
-                  @click="handleDeleteMarketingManager(scope.$index, scope.row)"/>
+                  @click="handleDeleteMarketingManager(scope.$index, scope.row)">删除</el-button>
               </div>
             </el-tooltip>
           </template>
@@ -672,3 +672,38 @@ export default {
     border: 1px solid black!important;
   }
 </style>
+<style lang="scss">
+  .button111
+  {
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+<style lang="scss">
+  .button222{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
index 7ba05cfa..9bb21cd0 100644
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -10,7 +10,7 @@
             :value="item.value"/>
         </el-select>
         <el-input v-model="customerName1" clearable size="small" style="width:200px;margin: 0px 10px" placeholder="合同编号或客户名称" @keyup.enter.native="PageSize = 30;PageCurrent = 1;fetchTableData1()"/>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
       </el-row>
     </el-card>
 
@@ -60,7 +60,7 @@
           <el-table-column align="center" label="合同编号" prop="合同编号" width="130">
             <template slot-scope="scope">
               <template>
-                <el-tag slot="reference" type="mini">{{ scope.row.合同编号 }}</el-tag>
+                <span slot="reference" type="mini">{{ scope.row.合同编号 }}</span>
               </template>
             </template>
           </el-table-column>
@@ -82,7 +82,7 @@
         </div>
       </el-col>
       <el-col :span="9">
-        <el-table :data="tableData2" class="subTableHeader" border stripe style="text-align: center" size="mini">
+        <el-table :data="tableData2" class="subTableHeader" border style="text-align: center" size="mini">
           <el-table-column label="设备型号" align="center" width="230" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.机床图号 }}
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index 5c605f46..2df6bada 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -15,7 +15,7 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
+      <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;tableData2=[];getTableData()">查询</el-button>
       <!--<el-badge :value="value" :max="99" class="item">-->
       <!--<el-button size="small" plain @click="AccountsReceivable">查看收款信息</el-button>-->
       <!--</el-badge>-->
@@ -58,7 +58,7 @@
           </el-table-column>
           <el-table-column align="center" label="合同编号" prop="合同编号" width="140">
             <template slot-scope="scope">
-              <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
+              {{ scope.row.合同编号 }}
             </template>
           </el-table-column>
           <el-table-column align="center" label="项目名称" prop="项目名称" width="100" show-overflow-tooltip>
@@ -143,7 +143,6 @@
           style="width: 500px;max-height: 440px;text-align: center"
           highlight-current-row
           border
-          stripe
           size="mini">
           <el-table-column
             align="center"
diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue
index ecab7e45..5d0f6025 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -27,8 +27,8 @@
         <!--          size="small"-->
         <!--          type="date"-->
         <!--          placeholder="请选择结束日期"/>-->
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
-        <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()" >查询</el-button>
+        <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()" >新增</el-button>
       </div>
     </el-card>
     <el-card>
@@ -91,22 +91,23 @@
         </el-table-column>
         <el-table-column align="center" label="合同编号" prop="合同编号" width="130">
           <template slot-scope="scope">
-            <template>
-              <el-popover
-                placement="right"
-                width="200"
-                trigger="hover">
-                <div v-show="!scope.row.招标企业" style="text-align: center">
-                  <h4 style="margin: 5px 0">未缴纳投标保证金</h4>
-                </div>
-                <div v-show="scope.row.招标企业">
-                  <h4>招标企业： {{ scope.row.招标企业 }}</h4>
-                  <h4>投标保证金金额： {{ scope.row.保证金金额 }}</h4>
-                  <h4>是否收回： {{ parseInt(scope.row.是否收回) === 1 ? '未收回' : '已收回' }}</h4>
-                </div>
-                <el-tag slot="reference" size="mini">{{ scope.row.合同编号 }}</el-tag>
-              </el-popover>
-            </template>
+            {{ scope.row.合同编号 }}
+          <!--            <template>-->
+          <!--              <el-popover-->
+          <!--                placement="right"-->
+          <!--                width="200"-->
+          <!--                trigger="hover">-->
+          <!--                <div v-show="!scope.row.招标企业" style="text-align: center">-->
+          <!--                  <h4 style="margin: 5px 0">未缴纳投标保证金</h4>-->
+          <!--                </div>-->
+          <!--                <div v-show="scope.row.招标企业">-->
+          <!--                  <h4>招标企业： {{ scope.row.招标企业 }}</h4>-->
+          <!--                  <h4>投标保证金金额： {{ scope.row.保证金金额 }}</h4>-->
+          <!--                  <h4>是否收回： {{ parseInt(scope.row.是否收回) === 1 ? '未收回' : '已收回' }}</h4>-->
+          <!--                </div>-->
+          <!--                <el-tag slot="reference" size="mini">{{ scope.row.合同编号 }}</el-tag>-->
+          <!--              </el-popover>-->
+          <!--            </template>-->
           </template>
         </el-table-column>
         <el-table-column align="center" label="客户名称" prop="客户名称" width="190" show-overflow-tooltip>
@@ -174,7 +175,7 @@
             {{ scope.row.合同信息备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="170">
+        <el-table-column label="操作" align="center" width="300">
           <template slot-scope="scope">
             <el-button
               size="mini"
@@ -188,7 +189,7 @@
                   type="text"
                   icon="el-icon-edit-outline"
                   style="margin-left: 20px"
-                  @click.stop="handleEdit(scope.row)"/>
+                  @click.stop="handleEdit(scope.row)">修改</el-button>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
@@ -198,7 +199,7 @@
                   type="text"
                   icon="el-icon-delete"
                   style="margin-left: 20px"
-                  @click.stop="handleDelete(scope.row)"/>
+                  @click.stop="handleDelete(scope.row)">删除</el-button>
               </div>
             </el-tooltip>
           </template>
@@ -1385,9 +1386,25 @@ a{
     tr.el-table__row td {
       background-color: #d8e5f6 !important;
     }
-
     tr.el-table__row.el-table__row--striped td {
       background: #e9f0f9 !important;
     }
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/MarketingCenter/DeliveryApplication/index.vue b/src/views/MarketingCenter/DeliveryApplication/index.vue
index a1a980e1..7ff1df3d 100644
--- a/src/views/MarketingCenter/DeliveryApplication/index.vue
+++ b/src/views/MarketingCenter/DeliveryApplication/index.vue
@@ -3,12 +3,12 @@
     <el-card class="box-card">
       <div>
         <el-row>
-          <el-button :disabled="disabledAdd" type="primary" icon="el-icon-circle-plus-outline" size="mini" @click="function_InvoiceAdd">新增</el-button>
-          <el-button :disabled="disabledEdit" type="warning" icon="el-icon-edit" size="mini" @click="function_InvoiceEdit">编辑</el-button>
-          <el-button :disabled="disabledSave" type="success" icon="el-icon-upload" size="mini" @click="function_InvoiceSave">保存</el-button>
-          <el-button :disabled="disabledExamine" type="success" icon="el-icon-lock" size="mini" @click="function_InvoiceExamine">核准</el-button>
-          <el-button :disabled="disabledAbandoningTrial" type="info" icon="el-icon-unlock" size="mini" @click="function_InvoiceAbandoningTrial">放弃</el-button>
-          <el-button :disabled="disabledDelete" type="danger" icon="el-icon-delete" size="mini" @click="function_InvoiceDelete">删除</el-button>
+          <el-button :disabled="disabledAdd" class="button111" icon="el-icon-circle-plus-outline" size="mini" @click="function_InvoiceAdd">新增</el-button>
+          <el-button :disabled="disabledEdit" type="warning" icon="el-icon-edit" size="mini" plain @click="function_InvoiceEdit">编辑</el-button>
+          <el-button :disabled="disabledSave" type="success" icon="el-icon-upload" size="mini" plain @click="function_InvoiceSave">保存</el-button>
+          <el-button :disabled="disabledExamine" type="success" icon="el-icon-lock" size="mini" plain @click="function_InvoiceExamine">核准</el-button>
+          <el-button :disabled="disabledAbandoningTrial" type="info" icon="el-icon-unlock" size="mini" plain @click="function_InvoiceAbandoningTrial">放弃</el-button>
+          <el-button :disabled="disabledDelete" type="danger" icon="el-icon-delete" size="mini" plain @click="function_InvoiceDelete">删除</el-button>
           <div style="float: right">
             <el-autocomplete
               v-model="searchCriteria"
@@ -177,8 +177,8 @@
                   size="small"
                   type="datetime"
                   placeholder="结束日期"/>
-                <el-button type="success" icon="el-icon-menu" size="mini" style="margin-left: 74px" @click="openSearch">加载</el-button>
-                <el-button type="warning" icon="el-icon-delete" size="mini" @click="clearSearch">清空</el-button>
+                <el-button type="primary" icon="el-icon-menu" size="mini" style="margin-left: 74px" plain @click="openSearch">加载</el-button>
+                <el-button type="warning" icon="el-icon-delete" size="mini" plain @click="clearSearch">清空</el-button>
               </el-col>
             </el-row>
           </div>
@@ -1221,3 +1221,20 @@ export default {
     clear: both
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue
index 2b8bc71a..64e34359 100644
--- a/src/views/MarketingCenter/InvoiceRecord/index.vue
+++ b/src/views/MarketingCenter/InvoiceRecord/index.vue
@@ -26,9 +26,10 @@
         <!--          size="small"-->
         <!--          type="date"-->
         <!--          placeholder="请选择结束日期"/>-->
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
         <el-button
-          size="mini"
+          class="button111"
+          size="small"
           type="primary"
           icon="el-icon-circle-plus-outline"
           @click.stop="openAddInvoiceRecordingDialog(); flag = 1">新增记录</el-button>
@@ -48,7 +49,8 @@
         @row-click="fetchTableData2">
         <el-table-column align="center" label="合同编号" prop="合同编号" width="140">
           <template slot-scope="scope">
-            <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
+            <!--            <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>-->
+            {{ scope.row.合同编号 }}
           </template>
         </el-table-column>
         <el-table-column align="center" label="项目名称" prop="项目名称" width="150" show-overflow-tooltip>
@@ -68,14 +70,14 @@
         </el-table-column>
         <el-table-column align="center" label="合同总金额（含税）" width="130">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.合同总金额===''||scope.row.合同总金额===null" slot="reference" size="mini" style="width: 80px" type="success">0.00</el-tag>
-            <el-tag v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.合同总金额).toFixed(2) }} </el-tag>
+            <span v-if="scope.row.合同总金额===''||scope.row.合同总金额===null" slot="reference" size="mini" style="width: 80px" type="success">0.00</span>
+            <span v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.合同总金额).toFixed(2) }} </span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="已到账金额" width="120">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.已支付===''||scope.row.已支付===null" slot="reference" size="mini" style="width: 80px" type="success">0.00</el-tag>
-            <el-tag v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.已支付).toFixed(2) }} </el-tag>
+            <span v-if="scope.row.已支付===''||scope.row.已支付===null" slot="reference" size="mini" style="width: 80px" type="success">0.00</span>
+            <span v-else slot="reference" type="success" size="mini" style="width: 80px"> {{ Number(scope.row.已支付).toFixed(2) }} </span>
           </template>
         </el-table-column>
         <!--        <el-table-column align="center" label="税率" width="100">-->
@@ -820,3 +822,20 @@ export default {
   /*  }*/
   /*}*/
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue
index 3e0b5081..df38300d 100644
--- a/src/views/MarketingCenter/PerformanceBond/index.vue
+++ b/src/views/MarketingCenter/PerformanceBond/index.vue
@@ -26,7 +26,7 @@
       <!--        size="small"-->
       <!--        type="date"-->
       <!--        placeholder="请选择结束日期"/>-->
-      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
+      <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 30;PageCurrent = 1;fetchTableData1()">查询</el-button>
     </el-card>
 
     <el-card>
@@ -42,7 +42,7 @@
         @row-click="fetchTableData2">
         <el-table-column align="center" label="合同编号" prop="合同编号" width="150">
           <template slot-scope="scope">
-            <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
+            <span size="mini" type="primary">{{ scope.row.合同编号 }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="项目名称" prop="项目名称" width="150" show-overflow-tooltip>
diff --git a/src/views/MarketingCenter/ProjectProgress/index.vue b/src/views/MarketingCenter/ProjectProgress/index.vue
index 6b835551..0e375a39 100644
--- a/src/views/MarketingCenter/ProjectProgress/index.vue
+++ b/src/views/MarketingCenter/ProjectProgress/index.vue
@@ -4,14 +4,14 @@
       <el-col :span="12">
         <el-card v-loading="loading1" style="height: 450px">
           <span>年营销金额图表</span>
-          <el-button size="small" type="success" icon="el-icon-search" @click="search1()">查询</el-button>
+          <el-button size="small" type="primary" icon="el-icon-search" plain @click="search1()">查询</el-button>
           <div id="myChart1" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
         </el-card>
       </el-col>
       <el-col :span="12">
         <el-card v-loading="loading2" style="height: 450px">
           <span>客户分布图</span>
-          <el-button size="small" type="success" icon="el-icon-search" @click="search2()">查询</el-button>
+          <el-button size="small" type="primary" icon="el-icon-search" plain @click="search2()">查询</el-button>
           <div id="myChart2" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
         </el-card>
       </el-col>
@@ -20,7 +20,7 @@
       <el-col :span="12">
         <el-card v-loading="loading3" style="height: 450px">
           <span>在执行项目金额及回款</span>
-          <el-button size="small" type="success" icon="el-icon-search" @click="search3()">查询</el-button>
+          <el-button size="small" type="primary" icon="el-icon-search" plain @click="search3()">查询</el-button>
           <div id="myChart3" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
         </el-card>
       </el-col>
diff --git a/src/views/MarketingCenter/SafetyMargin/index.vue b/src/views/MarketingCenter/SafetyMargin/index.vue
index a32b2c28..74010c68 100644
--- a/src/views/MarketingCenter/SafetyMargin/index.vue
+++ b/src/views/MarketingCenter/SafetyMargin/index.vue
@@ -27,7 +27,7 @@
       <!--        size="small"-->
       <!--        type="date"-->
       <!--        placeholder="请选择结束日期"/>-->
-      <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="PageSizeProject = 30;PageCurrentProject = 1;searchTableDataProject()">查询</el-button>
+      <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSizeProject = 30;PageCurrentProject = 1;searchTableDataProject()">查询</el-button>
     </el-card>
 
     <el-card>
@@ -43,7 +43,7 @@
         @row-click="fetchTableData1">
         <el-table-column align="center" label="合同编号" prop="合同编号" width="150">
           <template slot-scope="scope">
-            <el-tag size="mini" type="primary">{{ scope.row.合同编号 }}</el-tag>
+            <span size="mini" type="primary">{{ scope.row.合同编号 }}</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="项目名称" prop="项目名称" width="160" show-overflow-tooltip>
diff --git a/src/views/MarketingCenter/ShippingInquiries/index.vue b/src/views/MarketingCenter/ShippingInquiries/index.vue
index b31b352d..1a0378d5 100644
--- a/src/views/MarketingCenter/ShippingInquiries/index.vue
+++ b/src/views/MarketingCenter/ShippingInquiries/index.vue
@@ -3,7 +3,7 @@
     <el-card>
       <el-input v-model="invoiceNumber" placeholder="发货单号和收货单位" clearable style="width: 200px;margin-right: 10px" size="small" @keyup.enter.native="openSearch"/>
       <!--<el-input v-model="receivingUnit" placeholder="请输入收货单位" clearable style="width: 150px;margin-right: 10px" size="mini"/>-->
-      <el-button type="success" icon="el-icon-menu" size="mini" style="margin-left: 10px" @click="openSearch">查询</el-button>
+      <el-button type="primary" icon="el-icon-search" size="mini" style="margin-left: 10px" plain @click="openSearch">查询</el-button>
     </el-card>
     <el-card>
       <el-col :span="10">
@@ -76,7 +76,7 @@
         <el-table v-loading="listLoading" :data="tableData" highlight-current-row style="width: 100%" height="560" border size="mini">
           <el-table-column align="center" label="货品类别" width="80">
             <template slot-scope="scope">
-              <el-tag effect="dark" size="small" type="success">{{ scope.row.货品类别 }}</el-tag>
+              <span effect="dark" size="small" type="success">{{ scope.row.货品类别 }}</span>
             </template>
           </el-table-column>
           <el-table-column align="center" label="货品编号">
diff --git a/src/views/Outsourcing/OutFactoryMaintenance/index.vue b/src/views/Outsourcing/OutFactoryMaintenance/index.vue
index 6cb5b908..449dd195 100644
--- a/src/views/Outsourcing/OutFactoryMaintenance/index.vue
+++ b/src/views/Outsourcing/OutFactoryMaintenance/index.vue
@@ -8,7 +8,7 @@
       <!--<el-input v-model="phNumber" size="small" clearable style="width:200px"/>-->
       <!--<el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=50;searchTable()">查询</el-button>-->
       <el-tooltip :open-delay="1200" effect="dark" content="新增外协厂家" placement="top">
-        <el-button type="primary" class="el-icon-circle-plus-outline" size="small" @click="editType1('form');param = 0">新增</el-button>
+        <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" @click="editType1('form');param = 0">新增</el-button>
       </el-tooltip>
     </el-card>
     <el-card>
@@ -419,3 +419,20 @@ export default {
     margin: 0px;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
index 8131551c..0fce960a 100644
--- a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue
@@ -14,8 +14,8 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button icon="el-icon-search" type="success" size="small" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
-        <el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
+        <el-button icon="el-icon-search" type="primary" size="small" plain @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
+        <el-button type="primary" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" plain @click="exportExcel">导出</el-button>
       </div>
     </el-card>
     <el-card style="width: 70%">
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index 2b8d5423..4417fbd3 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"/>
@@ -202,7 +202,7 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button type="success" class="el-icon-search" size="small" @click="pageCurrent2=1;pageSize2=20;getParts()">查询</el-button>
+        <el-button type="primary" class="el-icon-search" size="small" plain @click="pageCurrent2=1;pageSize2=20;getParts()">查询</el-button>
         <el-tooltip :open-delay="1200" effect="dark" content="记录外协付款到票信息" placement="top">
           <el-button size="small" type="primary" plain class="el-icon-check" @click="editType1('form');param = 0">到票</el-button>
         </el-tooltip>
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index ada8a541..d1eecd2b 100644
--- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
@@ -3,7 +3,7 @@
     <el-card>
       <span>零件号:</span>
       <el-input v-model="partNumber" size="small" placeholder="零件号" clearable style="width:200px"/>
-      <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="getList()">查询</el-button>
+      <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="getList()">查询</el-button>
       <el-button type="danger" plain size="mini" icon="el-icon-caret-right" style="float: right;margin-right:10px" @click="getBack()">打回车间</el-button>
       <el-table
         v-loading="loading1"
@@ -83,8 +83,8 @@
         <!--<el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:200px;margin-bottom: 10px"/>-->
         <span>厂家:</span>
         <el-input v-model="manufacturers" size="small" placeholder="外协厂家" style="width:160px" clearable @keyup.enter.native="pageSize=20;pageList=1;fetchData()" @clear="pageSize=20;pageList=1;fetchData()"/>
-        <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="pageSize=20;pageList=1;fetchData()">查询</el-button>
-        <el-button type="primary" size="mini" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
+        <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="pageSize=20;pageList=1;fetchData()">查询</el-button>
+        <el-button class="button111" size="mini" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
         <el-table v-loading="loading2" :data="List" highlight-current-row height="450" size="mini" stripe border @row-click="searchProcess" >
           <el-table-column label="表单号" prop="表单号" align="center" min-width="155px">
             <template slot-scope="scope">
@@ -96,10 +96,10 @@
               {{ scope.row.外协厂家 }}
             </template>
           </el-table-column>
-          <el-table-column label="操作" align="center" min-width="100px">
+          <el-table-column label="操作" align="center" min-width="140px">
             <template slot-scope="scope">
-              <el-button type="text" size="mini" icon="el-icon-edit" plain style="margin-left:10px" @click="handleEdit(scope.row)"/>
-              <el-button :disabled="scope.row.单据状态==='成交'" plain type="text" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)"/>
+              <el-button type="text" size="mini" icon="el-icon-edit" plain style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
+              <el-button :disabled="scope.row.单据状态==='成交'" plain type="text" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -138,16 +138,16 @@
           <!--<el-tooltip :open-delay="1200" effect="dark" content="计算选入零件的价格" placement="top">-->
           <!--<el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 15px" @click="calculatingPrice">计算价格</el-button>-->
           <!--</el-tooltip>-->
-          <el-button type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" @click="getSpareParts">选入零件</el-button>
-          <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;float: right" @click="exportTable('RWD')">导出任务单</el-button>
+          <el-button type="warning" size="mini" icon="el-icon-arrow-down" plain style="margin-left:10px" @click="getSpareParts">选入零件</el-button>
+          <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px;margin-top: 3px;float: right" plain @click="exportTable('RWD')">导出任务单</el-button>
           <el-tooltip :open-delay="1200" effect="dark" content="成交" placement="top">
-            <el-button type="success" size="mini" icon="el-icon-success" style="margin-left:10px;margin-top: 3px;float: right" @click="Deal">提交</el-button>
+            <el-button type="success" size="mini" icon="el-icon-success" style="margin-left:10px;margin-top: 3px;float: right" plain @click="Deal">提交</el-button>
           </el-tooltip>
           <el-tooltip :open-delay="1200" effect="dark" content="核对价格信息后确定" placement="top">
-            <el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 3px;float: right" @click="confirmPrice">保存</el-button>
+            <el-button type="success" size="mini" icon="el-icon-edit" style="margin-left:10px;margin-top: 3px;float: right" plain @click="confirmPrice">保存</el-button>
           </el-tooltip>
         </div>
-        <el-table v-loading="loading" :data="List3" :summary-method="getSummaries" height="488" stripe size="mini" show-summary border>
+        <el-table v-loading="loading" :data="List3" :summary-method="getSummaries" height="488" size="mini" show-summary border>
           <el-table-column label="零件图号" align="center" min-width="150px">
             <template slot-scope="scope">
               {{ 零件图号[scope.$index] }}
@@ -1545,3 +1545,20 @@ export default {
     text-align: left;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
index a4dd7a02..6e5b801c 100644
--- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
+++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue
@@ -12,7 +12,7 @@
         <!--type="date"-->
         <!--size="small"-->
         <!--placeholder="选择日期"/>-->
-        <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="pageSize=10;pageList=1;fetchData()">查询</el-button>
+        <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="pageSize=10;pageList=1;fetchData()">查询</el-button>
       </el-card>
       <el-card>
         <el-table v-loading="loading2" :data="List" :row-class-name="tableData1ClassName" highlight-current-row size="mini" height="550" border @row-click="searchProcess" >
@@ -42,8 +42,8 @@
     </el-col>
     <el-col :span="14">
       <el-card>
-        <el-button :disabled="loading=false" type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" @click="getSpareParts">收货</el-button>
-        <el-table v-loading="loading" :data="List3" border stripe size="mini" highlight-current-row height="595" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
+        <el-button :disabled="loading=false" type="warning" size="mini" icon="el-icon-arrow-down" style="margin-left:10px" plain @click="getSpareParts">收货</el-button>
+        <el-table v-loading="loading" :data="List3" border size="mini" highlight-current-row height="595" tooltip-effect="dark" style="width: 100%" @selection-change="handleSelectionChange">
           <el-table-column
             :selectable="selectable"
             type="selection"
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
index 9a67c928..f0274174 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
@@ -118,7 +118,7 @@
       <h4 style="margin: 0px;display: inline-block;width: 150px;">发票结算申请单明细</h4>
       <span>发票号：</span>
       <el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly style="margin: 5px 0 5px 0"/>
-      <el-table :data="tableData2" border stripe highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
+      <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
         <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.采购物料名称 || scope.row.离线物料名称 || scope.row.采购零件名称 }}

From 79b356d649009f3afdf3df1265ed782ee72d321b Mon Sep 17 00:00:00 2001
From: hedekun <200858424@qq.com>
Date: Sat, 8 Feb 2020 16:34:57 +0800
Subject: [PATCH 4/5] d

---
 src/views/Assembly/MakeAssemblyPlan/index.vue | 36 +++++++++---
 src/views/Assembly/MakeColdWorkPlan/index.vue | 16 ++++--
 .../Assembly/MakeElectricalAssembly/index.vue | 16 ++++--
 src/views/Assembly/MakePaintPlan/index.vue    | 18 +++---
 .../SparePartsOutStockRecord/index.vue        |  2 +-
 .../CreatePreparationBill/index.vue           | 32 ++++++++---
 .../MaterialArrival/index.vue                 |  5 +-
 .../MaterialManagement/index.vue              | 26 +++++++--
 .../PurchaseMaterielModify/index.vue          |  6 +-
 .../CreatePackingList/index.vue               | 31 +++++++---
 .../ImportChangeParts/specificationData1.vue  | 18 +++---
 .../ImportParts/UploadExcel/index.vue         |  2 +-
 .../TechnologyCenter/ImportParts/index.vue    | 20 ++++++-
 .../ImportParts/specificationData.vue         | 30 +++++-----
 .../PartDrawingMaintenance/index.vue          | 10 ++--
 .../AccountingPrice/index.vue                 |  1 +
 .../CreatingProcurementContracts/index.vue    | 26 +++++++--
 .../CreatingPurchasingMaterials/index.vue     | 56 ++++++++++++-------
 .../InvoiceSettlementApplication1/index.vue   | 46 ++++++++++++---
 .../NewArrivalList/index.vue                  | 34 ++++++++---
 .../OfflineProcurement/index.vue              | 50 +++++++++++------
 .../OutsourcingMaterialsInvoice/index.vue     | 32 ++++++++---
 .../OutsourcingMaterialsSearch/index.vue      | 10 ++--
 .../ProcurementContractEnquiry/index.vue      | 14 +++--
 .../ProjectTotalSearch/index.vue              |  5 +-
 .../PurchaseContractRequestFund1/index.vue    | 40 ++++++++++---
 .../RequestOutsourcingMaterials/index.vue     | 37 +++++++++---
 .../manufacturingPurchaseArrival/index.vue    | 21 ++++++-
 28 files changed, 464 insertions(+), 176 deletions(-)

diff --git a/src/views/Assembly/MakeAssemblyPlan/index.vue b/src/views/Assembly/MakeAssemblyPlan/index.vue
index 9a581314..b2961110 100644
--- a/src/views/Assembly/MakeAssemblyPlan/index.vue
+++ b/src/views/Assembly/MakeAssemblyPlan/index.vue
@@ -13,8 +13,8 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <el-button size="small" icon="el-icon-circle-plus" type="primary" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
-        <el-button type="danger" plain size="small" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
+        <el-button size="small" icon="el-icon-circle-plus-outline" class="button111" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
+        <el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -34,7 +34,7 @@
       </div>
     </el-card>
     <el-card style="width: 40%; float: left">
-      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
+      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
         <el-table-column label="项目名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -45,7 +45,7 @@
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" align="center">
+        <el-table-column label="机床名称" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.机床名称 }}
           </template>
@@ -97,9 +97,13 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
-            <el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-            <el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
+              <div style="display: inline-block">
+                <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
+                <el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
+                <el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -284,3 +288,21 @@ export default {
 <style scoped>
 
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/Assembly/MakeColdWorkPlan/index.vue b/src/views/Assembly/MakeColdWorkPlan/index.vue
index 100f78cb..3caf25c4 100644
--- a/src/views/Assembly/MakeColdWorkPlan/index.vue
+++ b/src/views/Assembly/MakeColdWorkPlan/index.vue
@@ -13,8 +13,8 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <el-button size="small" icon="el-icon-circle-plus" type="primary" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
-        <el-button type="danger" plain size="small" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
+        <el-button size="small" icon="el-icon-circle-plus-outline" class="button111" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
+        <el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -34,7 +34,7 @@
       </div>
     </el-card>
     <el-card style="width: 40%; float: left">
-      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
+      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
         <el-table-column label="项目名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -97,9 +97,13 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
-            <el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-            <el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
+              <div style="display: inline-block">
+                <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
+                <el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
+                <el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/Assembly/MakeElectricalAssembly/index.vue b/src/views/Assembly/MakeElectricalAssembly/index.vue
index 24ac4fe2..41da2ca9 100644
--- a/src/views/Assembly/MakeElectricalAssembly/index.vue
+++ b/src/views/Assembly/MakeElectricalAssembly/index.vue
@@ -13,8 +13,8 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <el-button size="small" icon="el-icon-circle-plus" type="primary" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
-        <el-button type="danger" plain size="small" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
+        <el-button size="small" icon="el-icon-circle-plus-outline" class="button111" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
+        <el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -34,7 +34,7 @@
       </div>
     </el-card>
     <el-card style="width: 40%; float: left">
-      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
+      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
         <el-table-column label="项目名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -97,9 +97,13 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
-            <el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-            <el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
+              <div style="display: inline-block">
+                <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
+                <el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
+                <el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/Assembly/MakePaintPlan/index.vue b/src/views/Assembly/MakePaintPlan/index.vue
index 1c0bd113..6e37b7cc 100644
--- a/src/views/Assembly/MakePaintPlan/index.vue
+++ b/src/views/Assembly/MakePaintPlan/index.vue
@@ -13,8 +13,8 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <el-button size="small" icon="el-icon-circle-plus" type="primary" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
-        <el-button type="danger" plain size="small" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
+        <el-button size="small" icon="el-icon-circle-plus-outline" class="button111" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
+        <el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -34,7 +34,7 @@
       </div>
     </el-card>
     <el-card style="width: 40%; float: left">
-      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
+      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
         <el-table-column label="项目名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -45,7 +45,7 @@
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" align="center">
+        <el-table-column label="机床名称" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.机床名称 }}
           </template>
@@ -97,9 +97,13 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
-            <el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-            <el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
+              <div style="display: inline-block">
+                <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
+                <el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
+                <el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue
index 2f7b7a27..4385f57b 100644
--- a/src/views/Assembly/SparePartsOutStockRecord/index.vue
+++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue
@@ -40,7 +40,7 @@
           type="date"
           placeholder="选择日期"/>
         <el-tooltip :open-delay="1200" effect="dark" content="查询备料出库记录" placement="top">
-          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="total=0;pageSize=40; pageCurrent=1;selecttable()">查询</el-button>
+          <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 15px" @click="total=0;pageSize=40; pageCurrent=1;selecttable()">查询</el-button>
         </el-tooltip>
       </el-row>
     </el-card>
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index ba2627e9..a0845a67 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -4,7 +4,7 @@
       <el-row>
         <span>零件图号:</span>
         <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
-        <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
+        <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
         <el-tooltip :open-delay="1200" effect="dark" content="已导出和未导出备料单" placement="top">
           <el-checkbox v-model="all" size="small">查询全部</el-checkbox>
         </el-tooltip>
@@ -13,13 +13,13 @@
           <el-button type="primary" size="small" icon="el-icon-success" plain style="margin-left:0px" @click="edit2()">分配外购备料</el-button>
         </el-tooltip>
         <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为自家备料" placement="top">
-          <el-button type="warning" size="small" icon="el-icon-success" plain style="margin-left:10px" @click="edit()">分配自家备料</el-button>
+          <el-button type="primary" size="small" icon="el-icon-success" plain style="margin-left:10px" @click="edit()">分配自家备料</el-button>
         </el-tooltip>
         <el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top">
-          <el-button type="primary" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>
+          <el-button class="button111" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>
         </el-tooltip>
         <el-tooltip :open-delay="1000" effect="dark" content="导出备料分配单" placement="top">
-          <el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 140px" @click="exportExcel">导出</el-button>
+          <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 140px" @click="exportExcel">导出</el-button>
         </el-tooltip>
       </el-row>
     </el-card>
@@ -45,9 +45,9 @@
           align="center"/>
         <el-table-column label="备料分配" prop="备料分配" align="center" width="90">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.备料打印 ==='1' && scope.row.是否外购备料==='0'" type="success" size="mini">自家</el-tag>
-            <el-tag v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='1'" type="success" size="mini">外购</el-tag>
-            <el-tag v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='0'" type="warning" size="mini">未分配</el-tag>
+            <span v-if="scope.row.备料打印 ==='1' && scope.row.是否外购备料==='0'" type="success" size="mini">自家</span>
+            <span v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='1'" type="success" size="mini">外购</span>
+            <span v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='0'" type="warning" size="mini">未分配</span>
           </template>
         </el-table-column>
         <el-table-column label="零件名称" prop="零件名称" align="center" width="250" sortable="custom" show-overflow-tooltip>
@@ -315,3 +315,21 @@ export default {
 <style scoped>
 
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/ManufacturingCenter/MaterialArrival/index.vue b/src/views/ManufacturingCenter/MaterialArrival/index.vue
index d4dafd3d..e28940e3 100644
--- a/src/views/ManufacturingCenter/MaterialArrival/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrival/index.vue
@@ -19,8 +19,8 @@
           :value="item.value"/>
       </el-select>
       <el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
-      <el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
-      <el-button :disabled="Name===1" type="baocun" class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
+      <el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
+      <el-button :disabled="Name===1" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
     </el-card>
     <el-row>
       <el-card style="width: 50%; float: left">
@@ -30,6 +30,7 @@
           class="table"
           highlight-current-row
           border
+          stripe
           height="750"
           style="width: 100%"
           @current-change="getCurrentRow">
diff --git a/src/views/PurchasingCenter/MaterialManagement/index.vue b/src/views/PurchasingCenter/MaterialManagement/index.vue
index e4b936b4..cce0a192 100644
--- a/src/views/PurchasingCenter/MaterialManagement/index.vue
+++ b/src/views/PurchasingCenter/MaterialManagement/index.vue
@@ -115,22 +115,23 @@
         </el-col>
         <el-col style="width: 600px">
           <el-button
-            type="success"
+            type="primary"
             icon="el-icon-search"
             size="small"
             style="margin-left: 10px"
+            plain
             @click="pageCurrent=1;searchMaterial()">查询
           </el-button>
-          <el-button :disabled="token !== 11 && token !== 36" type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增</el-button>
+          <el-button :disabled="token !== 11 && token !== 36" class="button111" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增</el-button>
           <el-button
             :disabled="token !== 11 && token !== 36"
-            type="warning"
+            class="button111"
             icon="el-icon-refresh"
             size="small"
             style="margin:10px 5px 3px"
             @click="CategoryMaintenance">维护物料类别
           </el-button>
-          <el-button type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="open()">新增供货商</el-button>
+          <el-button class="button111" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="open()">新增供货商</el-button>
           <el-badge :value="weishenhe" class="item">
             <el-button type="primary" plain size="small" @click="daishenhe()">采购部新增物料审核</el-button>
           </el-badge>
@@ -1024,3 +1025,20 @@ export default {
     width:190px
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue b/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
index 1afdf371..31d46ede 100644
--- a/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
+++ b/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
@@ -47,12 +47,14 @@
           <template slot-scope="scope">
             <el-button
               size="mini"
-              type="primary"
+              type="text"
               class="el-icon-edit"
+              icon="el-icon-circle-check"
               @click="handleEdit1(scope.$index, scope.row)">同意</el-button>
             <el-button
               size="mini"
-              type="danger"
+              type="text"
+              icon="el-icon-circle-close"
               class="el-icon-edit"
               @click="handleEdit2(scope.$index, scope.row)">不同意</el-button>
           </template>
diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue
index 3d0db642..f11d35ea 100644
--- a/src/views/TechnologyCenter/CreatePackingList/index.vue
+++ b/src/views/TechnologyCenter/CreatePackingList/index.vue
@@ -10,10 +10,10 @@
           :value="item.value"/>
       </el-select>
       <el-tooltip :open-delay="1000" effect="dark" content="新增项目装箱单" placement="top">
-        <el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addReceipt">新增</el-button>
+        <el-button class="button111" size="small" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addReceipt">新增</el-button>
       </el-tooltip>
       <el-tooltip :open-delay="1000" effect="dark" content="打印装箱单" placement="top">
-        <el-button type="warning" size="small" style="margin-left: 10px" icon="el-icon-download" @click="exportTable()">导出</el-button>
+        <el-button type="primary" size="small" style="margin-left: 10px" plain icon="el-icon-download" @click="exportTable()">导出</el-button>
       </el-tooltip>
       <el-table
         v-loading="loading"
@@ -85,12 +85,11 @@
     </el-card>
 
     <el-card >
-      <el-button :disabled="!disabled" plain type="primary" style="margin-top: 3px" size="small" icon="el-icon-circle-plus-outline" @click="addMachine">添加主机</el-button>
+      <el-button :disabled="!disabled" class="button111" style="margin-top: 3px" size="small" icon="el-icon-circle-plus-outline" @click="addMachine">添加主机</el-button>
       <el-table
         v-loading="loading"
         :data="machineTableData"
         border
-        stripe
         highlight-current-row
         size="mini"
         height="170px"
@@ -200,12 +199,11 @@
     </el-card>
 
     <el-card >
-      <el-button :disabled="!disabled" type="primary" style="margin-top: 3px" plain size="small" icon="el-icon-circle-plus-outline" @click="addSpare">添加备件</el-button>
+      <el-button :disabled="!disabled" class="button111" style="margin-top: 3px" size="small" icon="el-icon-circle-plus-outline" @click="addSpare">添加备件</el-button>
       <el-table
         v-loading="loading"
         :data="spareData"
         border
-        stripe
         highlight-current-row
         height="170px"
         size="mini"
@@ -269,13 +267,12 @@
     </el-card>
 
     <el-card >
-      <el-button :disabled="!disabled" plain type="primary" size="small" style="margin-top: 3px" icon="el-icon-circle-plus-outline" @click="addFile">添加文件</el-button>
+      <el-button :disabled="!disabled" class="button111" size="small" style="margin-top: 3px" icon="el-icon-circle-plus-outline" @click="addFile">添加文件</el-button>
       <el-table
         v-loading="fileLoading"
         :data="fileData"
         border
         highlight-current-row
-        stripe
         height="170px"
         size="mini"
         style="margin-top:3px;margin-bottom: 0">
@@ -1085,3 +1082,21 @@ span{
     }
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
index 7b9fc65f..369eb38a 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
@@ -49,8 +49,8 @@
           width="50"/>
         <el-table-column align="center" label="物料状态" min-width="90">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.物料流水号===null" type="warning" size="mini">不存在</el-tag>
-            <el-tag v-if="scope.row.物料流水号!==null" type="primary" size="mini">存在</el-tag>
+            <span v-if="scope.row.物料流水号===null" type="warning" size="mini">不存在</span>
+            <span v-if="scope.row.物料流水号!==null" type="primary" size="mini">存在</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="图号" min-width="120">
@@ -58,7 +58,7 @@
             {{ scope.row.图号或者型号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="名称" min-width="80">
+        <el-table-column align="center" label="名称" min-width="80" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.名称 }}
           </template>
@@ -137,8 +137,7 @@
         size="mini"
         highlight-current-row
         height="150"
-        border
-        stripe>
+        border>
         <el-table-column
           label="序号"
           align="center"
@@ -168,7 +167,8 @@
           <template slot-scope="scope">
             <el-button
               size="mini"
-              type="primary"
+              type="text"
+              icon="el-icon-sort"
               @click="handle(scope.row)">替换
             </el-button>
           </template>
@@ -784,9 +784,9 @@ export default {
   .el-table .warning-row {
     background: red;
   }
-  .rgb196{
-    background: palevioletred !important;
-  }
+  /*.rgb196{*/
+  /*  background: palevioletred !important;*/
+  /*}*/
 </style>
 
 <style scoped>
diff --git a/src/views/TechnologyCenter/ImportParts/UploadExcel/index.vue b/src/views/TechnologyCenter/ImportParts/UploadExcel/index.vue
index 49d7ce57..0f2728c5 100644
--- a/src/views/TechnologyCenter/ImportParts/UploadExcel/index.vue
+++ b/src/views/TechnologyCenter/ImportParts/UploadExcel/index.vue
@@ -3,7 +3,7 @@
     <input id="excel-upload-input" ref="excel-upload-input" type="file" multiple="multiple" accept=".xlsx, .xls" class="c-hide" @change="handkeFileChange">
     <div id="drop" @drop="handleDrop" @dragover="handleDragover" @dragenter="handleDragover">
       将Excel文件拖到这或
-      <el-button style="margin-left:16px;" size="small" icon="el-icon-search" type="success" @click="handleUpload">浏览</el-button>
+      <el-button style="margin-left:16px;" size="small" icon="el-icon-search" type="primary" plain @click="handleUpload">浏览</el-button>
     </div>
   </div>
 </template>
diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue
index dabe83fe..6f0f332a 100644
--- a/src/views/TechnologyCenter/ImportParts/index.vue
+++ b/src/views/TechnologyCenter/ImportParts/index.vue
@@ -30,7 +30,7 @@
                   :label="item.label"
                   :value="item.value"/>
               </el-select>
-              <el-button type="primary" size="small" icon="el-icon-upload2" style="margin-left: 10px" @click="opendialogVisibleMachine()">上传总图</el-button>
+              <el-button class="button111" size="small" icon="el-icon-upload2" style="margin-left: 10px" @click="opendialogVisibleMachine()">上传总图</el-button>
             </div>
             <upload-excel-component @on-selected-file="selected"/>
           </div>
@@ -490,3 +490,21 @@ a{
   color: #999;
 }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue
index 520c9ec6..bb1ce005 100644
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -52,8 +52,8 @@
               width="50"/>
             <el-table-column align="center" label="物料状态" min-width="70">
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.物料流水号===null" type="warning" size="mini" style="margin: 0px">不存在</el-tag>
-                <el-tag v-if="scope.row.物料流水号!==null" type="primary" size="mini" style="margin: 0px">存在</el-tag>
+                <span v-if="scope.row.物料流水号===null" type="warning" size="mini" style="margin: 0px">不存在</span>
+                <span v-if="scope.row.物料流水号!==null" type="primary" size="mini" style="margin: 0px">存在</span>
               </template>
             </el-table-column>
             <el-table-column align="center" label="图号" min-width="100" show-overflow-tooltip>
@@ -66,7 +66,7 @@
                 {{ scope.row.名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="材料" width="70">
+            <el-table-column align="center" label="材料" width="70" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.材料或者规格 }}
               </template>
@@ -76,32 +76,32 @@
                 {{ scope.row.规格 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="备件数量" width="70">
+            <el-table-column align="center" label="备件数量" width="70" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.备件数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="装机数量" width="70">
+            <el-table-column align="center" label="装机数量" width="70" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.装机数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="部件数量" width="70">
+            <el-table-column align="center" label="部件数量" width="70" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.部件数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="制造商" min-width="100">
+            <el-table-column align="center" label="制造商" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.制造商 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="备注" width="80">
+            <el-table-column align="center" label="备注" width="80" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="分类码" width="80">
+            <el-table-column align="center" label="分类码" width="80" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.分类码 }}
               </template>
@@ -142,8 +142,7 @@
             size="mini"
             height="530px"
             highlight-current-row
-            border
-            stripe>
+            border>
             <el-table-column align="center" label="物料名称" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.物料名称 }}
@@ -168,7 +167,8 @@
               <template slot-scope="scope">
                 <el-button
                   size="mini"
-                  type="primary"
+                  type="text"
+                  icon="el-icon-sort"
                   @click="handle(scope.row)">替换
                 </el-button>
               </template>
@@ -657,9 +657,9 @@ export default {
 </script>
 
 <style>
-  .rgb196{
-    background: palevioletred !important;
-  }
+  /*.rgb196{*/
+  /*   background: palevioletred !important;*/
+  /* }*/
 </style>
 
 <style scoped>
diff --git a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
index c84da4e1..10a0e1e4 100644
--- a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
+++ b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
@@ -33,7 +33,7 @@
           :value="item.value"/>
       </el-select>
 
-      <el-button icon="el-icon-search" type="success" size="small" @click="pageCurrentWB = 1;pageSizeWB = 10;pageCurrent = 1;pageSize = 10;getTableData()">查询</el-button>
+      <el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrentWB = 1;pageSizeWB = 10;pageCurrent = 1;pageSize = 10;getTableData()">查询</el-button>
       <el-upload
         :disabled="disabled"
         :action="action"
@@ -44,7 +44,7 @@
         style="float: right; margin: 0px 50px"
         class="upload-demo"
         multiple>
-        <el-button type="success" size="small" style="float: right; margin: 0px 50px" @click="batchImportOfDrawings">图纸批量导入</el-button>
+        <el-button type="primary" size="small" style="float: right; margin: 0px 50px" plain @click="batchImportOfDrawings">图纸批量导入</el-button>
       </el-upload>
     </el-card>
     <el-card>
@@ -87,8 +87,8 @@
         </el-table-column>
         <el-table-column label="是否导入" align="center">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否导入)===1" type="success">已导入</el-tag>
-            <el-tag v-else type="danger">未导入</el-tag>
+            <span v-if="Number(scope.row.是否导入)===1" type="success">已导入</span>
+            <span v-else type="danger">未导入</span>
           </template>
         </el-table-column>
         <el-table-column min-width="50px" label="零件图纸" align="center">
@@ -107,7 +107,7 @@
               :file-list="fileList"
               class="upload-demo"
               multiple>
-              <el-button :disabled="disabled" size="mini" type="primary" round @click="getAction(scope.row)">点击上传</el-button>
+              <el-button :disabled="disabled" size="mini" type="text" icon="el-icon-upload2" round @click="getAction(scope.row)">点击上传</el-button>
             </el-upload>
           </template>
         </el-table-column>
diff --git a/src/views/WorkshopProcurement/AccountingPrice/index.vue b/src/views/WorkshopProcurement/AccountingPrice/index.vue
index 6337f64a..1fc3c073 100644
--- a/src/views/WorkshopProcurement/AccountingPrice/index.vue
+++ b/src/views/WorkshopProcurement/AccountingPrice/index.vue
@@ -23,6 +23,7 @@
         highlight-current-row
         min-height="540px"
         height="540px"
+        stripe
         border>
         <el-table-column align="center" label="采购合同编号" width="150px">
           <template slot-scope="scope">
diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
index ee12874c..2b18f320 100644
--- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
+++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
@@ -38,8 +38,8 @@
           placeholder="规定到货时间"/>
         <el-input v-model="name" placeholder="采购员" style="width: 120px" size="small" readonly/>
         <el-input v-model="taxRate" placeholder="税率" style="width: 120px" size="small"/>
-        <el-button v-show="contractNumType===0" type="success" size="small" @click="linkGroup">成组采购</el-button>
-        <el-button v-show="contractNumType===1" type="danger" size="small" @click="unLinkGroup">取消成组采购</el-button>
+        <el-button v-show="contractNumType===0" type="primary" plain size="small" @click="linkGroup">成组采购</el-button>
+        <el-button v-show="contractNumType===1" type="danger" plain size="small" @click="unLinkGroup">取消成组采购</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -139,7 +139,7 @@
         </el-table-column>
       </el-table>
       <el-button
-        type="shengcheng"
+        class="button111"
         size="small"
         style="margin-top:10px"
         @click="calculateContractSum">计算合同总额</el-button>
@@ -158,7 +158,7 @@
           :value="item.value"/>
       </el-select>
       <el-button
-        type="shengcheng"
+        class="button111"
         size="small"
         style="margin-left: 7.5%; margin-top: 10px"
         @click="doneContract">生成采购合同</el-button>
@@ -744,3 +744,21 @@ export default {
     margin-bottom: 5px;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index b1370518..0b5da0b1 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -4,7 +4,7 @@
       <el-col>
         <el-input v-model="partDrawingNumber" placeholder="零件图号" size="small" clearable style="margin: 3px 0" @keyup.enter.native="searchTable1"/>
         <el-tooltip :open-delay="1200" effect="dark" content="查询备料零件" placement="top">
-          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
+          <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
         </el-tooltip>
         <el-tooltip :open-delay="1200" effect="dark" content="将零件打回重新分配备料计划" placement="top">
           <el-button type="danger" size="small" icon="el-icon-download" plain style="margin-left: 10px;float: right;" @click="back">打回重新分配</el-button>
@@ -82,22 +82,22 @@
         <!--<el-tooltip :open-delay="1200" effect="dark" content="查询采购计划单" placement="top">-->
         <!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>-->
         <!--</el-tooltip>-->
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable2">查询</el-button>
-        <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">新增</el-button>
+        <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable2">查询</el-button>
+        <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addPurchaseOrder">新增</el-button>
         <el-tooltip :open-delay="1200" effect="dark" content="向选择的采购计划里添加采购零件" placement="top">
-          <el-button type="success" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
+          <el-button type="primary" plain size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
         </el-tooltip>
         <el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">
-          <el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 140px" @click="saveMateriel">保存</el-button>
+          <el-button type="success" size="small" icon="el-icon-download" plain style="margin-left: 140px" @click="saveMateriel">保存</el-button>
         </el-tooltip>
       </div>
       <el-table v-loading="" :data="tableData2" border stripe style="max-height: 460px;" height="200px" size="mini" highlight-current-row @row-click="searchTable3">
         <el-table-column label="备料状态" prop="采购计划状态" align="center" width="75" fixed="left">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">编辑中</el-tag>
-            <el-tag v-if="Number(scope.row.采购计划状态)===1" type="primary" size="mini">已保存</el-tag>
-            <el-tag v-if="Number(scope.row.采购计划状态)===3" type="success" size="mini">已到货</el-tag>
-            <el-tag v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</el-tag>
+            <span v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">编辑中</span>
+            <span v-if="Number(scope.row.采购计划状态)===1" type="primary" size="mini">已保存</span>
+            <span v-if="Number(scope.row.采购计划状态)===3" type="success" size="mini">已到货</span>
+            <span v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</span>
           </template>
         </el-table-column>
         <el-table-column label="外购备料单号" prop="采购单号" align="center" width="120">
@@ -130,22 +130,22 @@
           <template slot-scope="scope">
             <el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top">
               <div style="display: inline-block">
-                <el-button size="mini" type="success" plain icon="el-icon-download" @click="exportExcel2(scope.row)">导出</el-button>
+                <el-button size="mini" style="margin-left: 10px" type="text" icon="el-icon-download" @click="exportExcel2(scope.row)">导出</el-button>
               </div>
             </el-tooltip>
-            <el-tooltip :open-delay="1200" effect="dark" content="打印" placement="top">
+            <el-tooltip :open-delay="1200" effect="text" content="打印" placement="top">
               <div style="display: inline-block">
-                <el-button size="mini" type="success" plain icon="el-icon-printer" @click="exportExcel(scope.row)">打印</el-button>
+                <el-button size="mini" type="text" style="margin-left: 10px" icon="el-icon-printer" @click="exportExcel(scope.row)">打印</el-button>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="primary" plain size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)">编辑</el-button>
+                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="text" style="margin-left: 10px" size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)"/>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
               <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="primary" plain size="mini" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)">删除</el-button>
+                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="text" style="margin-left: 10px" size="mini" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)"/>
               </div>
             </el-tooltip>
           </template>
@@ -173,12 +173,12 @@
           @size-change="handleSizeChange2"
           @current-change="handleCurrentChange2"/>
       </div>
-      <el-table v-loading="" :data="tableData3" border highlight-current-row stripe style="margin: 3px 0" height="455px" size="mini">
+      <el-table v-loading="" :data="tableData3" border highlight-current-row style="margin: 3px 0" height="455px" size="mini">
         <el-table-column label="备料状态" align="center" width="80">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</el-tag>
-            <el-tag v-if="Number(scope.row.是否到货)===1" type="success" size="mini">已到货</el-tag>
-            <el-tag v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</el-tag>
+            <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</span>
+            <span v-if="Number(scope.row.是否到货)===1" type="success" size="mini">已到货</span>
+            <span v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</span>
           </template>
         </el-table-column>
         <el-table-column label="物料编码" prop="物料零件编码" align="center" width="150" show-overflow-tooltip>
@@ -220,7 +220,7 @@
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="移出" placement="top">
               <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" type="info" size="mini" icon="el-icon-right" plain @click="deleteMateriel(scope.row)">移出</el-button>
+                <el-button :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" type="text" size="mini" icon="el-icon-right" @click="deleteMateriel(scope.row)">移出</el-button>
               </div>
             </el-tooltip>
           </template>
@@ -907,3 +907,21 @@ export default {
     top: 5px;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
index 78b9a42c..9acc2c18 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
@@ -3,13 +3,13 @@
     <el-card>
       <span>发票号:</span>
       <el-input v-model="invoiceNum" placeholder="发票号" size="small" clearable/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
-      <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">创建</el-button>
+      <el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+      <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">创建</el-button>
     </el-card>
 
     <el-card>
       <h4 style="margin-top: 5px">发票结算申请单</h4>
-      <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%;" height="350px" size="mini" @row-click="searchTable2">
+      <el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;" height="350px" size="mini" @row-click="searchTable2">
         <el-table-column label="详情" type="expand">
           <template slot-scope="scope">
             <el-form label-position="left" inline class="demo-table-expand">
@@ -99,9 +99,17 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="300" fixed="right">
           <template slot-scope="scope">
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="warning" plain icon="el-icon-edit" size="mini" style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="danger" plain icon="el-icon-delete" size="mini" style="margin-left:10px" @click="handleDelete(scope.row)">删除</el-button>
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="warning" plain size="mini" style="margin-left:10px" @click="submitApply(scope.row)">提交申请</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
+              <div style="display: inline-block">
+                <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-edit-outline" size="mini" style="margin-left:10px" @click="handleEdit(scope.row)"/>
+              </div>
+            </el-tooltip>
+            <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
+              <div style="display: inline-block">
+                <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-delete" size="mini" style="margin-left:10px" @click="handleDelete(scope.row)"/>
+              </div>
+            </el-tooltip>
+            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-circle-check" size="mini" style="margin-left:10px" @click="submitApply(scope.row)">提交申请</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -122,7 +130,7 @@
       <h4 style="margin-top: 5px;display: inline-block;width: 150px;">发票结算申请单明细</h4>
       <span>发票号：</span>
       <el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/>
-      <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
+      <el-button :disabled="disabled" class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
       <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
         <el-table-column label="名称" align="center" width="150">
           <template slot-scope="scope">
@@ -166,7 +174,11 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope">
-            <el-button :disabled="disabled" type="danger" size="mini" icon="el-icon-delete" @click="deleteTable2(scope.row)">删除</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
+              <div style="display: inline-block">
+                <el-button :disabled="disabled" type="text" size="mini" icon="el-icon-delete" @click="deleteTable2(scope.row)"/>
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -753,3 +765,21 @@ export default {
     margin: 0;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue
index 46cdd120..e0cfcb2c 100644
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue
@@ -23,8 +23,8 @@
           range-separator="～"
           start-placeholder="开始日期"
           end-placeholder="结束日期"/>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
-        <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addArrivalOrder">新增到货单</el-button>
+        <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
+        <el-button class="button111" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addArrivalOrder">新增到货单</el-button>
       </div>
     </el-card>
     <el-card style="width: 45%;float: left">
@@ -32,8 +32,8 @@
       <el-table v-loading="" :data="tableData4" border stripe style="width: 100%" height="230px" size="mini" highlight-current-row @row-click="searchTable5">
         <el-table-column label="关联情况" align="center" width="80">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否关联) === 1" type="success" size="mini">已结算</el-tag>
-            <el-tag v-else type="primary" size="mini">未结算</el-tag>
+            <span v-if="Number(scope.row.是否关联) === 1" type="success" size="mini">已结算</span>
+            <span v-else type="primary" size="mini">未结算</span>
           </template>
         </el-table-column>
         <el-table-column label="供应商" prop="供应商名称" align="center" width="260" show-overflow-tooltip>
@@ -54,7 +54,7 @@
         <el-table-column label="操作" align="center" width="170" fixed="right">
           <template slot-scope="scope">
             <el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addArrivalOrderMX(scope.row)">到货明细</el-button>
-            <el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalOrder(scope.row)">删除</el-button>
+            <el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalOrder(scope.row)"/>
           </template>
         </el-table-column>
       <!--</el-tooltip>-->
@@ -85,7 +85,7 @@
     </el-card>
     <el-card style="width: 54%;float: left;margin-left: 10px">
       <span>到货单明细</span>
-      <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>
+      <el-button type="primary" plain size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>
       <!--<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>-->
       <el-table
         v-loading=""
@@ -94,7 +94,6 @@
         border
         show-summary
         highlight-current-row
-        stripe
         style="margin: 3px 0"
         height="260px"
         size="mini"
@@ -150,7 +149,6 @@
         border
         show-summary
         highlight-current-row
-        stripe
         style="margin: 3px 0"
         height="500px"
         size="mini">
@@ -203,7 +201,7 @@
           <template slot-scope="scope">
             <el-tooltip effect="dark" content="取消关联" placement="top">
               <div style="display: inline-block">
-                <el-button :disabled="disable === '1'" type="text" size="mini" @click="deleteMateriel(scope.row)">取消关联</el-button>
+                <el-button :disabled="disable === '1'" type="text" icon="el-icon-delete" size="mini" @click="deleteMateriel(scope.row)"/>
               </div>
             </el-tooltip>
           </template>
@@ -1261,3 +1259,21 @@ function saveAs(blob, filename = '下载文件.xls') {
     color: black;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
index c81b7196..26c100cf 100644
--- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue
+++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
@@ -22,7 +22,7 @@
       </el-select>
       <span>零件号：</span>
       <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 150px"/>
-      <el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent10 = 1;pageSize10 = 10;getTableData()">查询</el-button>
+      <el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent10 = 1;pageSize10 = 10;getTableData()">查询</el-button>
     </el-card>
     <el-card style="width: 1137px">
       <el-table v-loading="" :data="tableData10" stripe highlight-current-row border style="width: 100%;max-height: 315px;margin-top: 10px" height="315px" size="mini" @sort-change="sortChange" @selection-change="handleSelectionChange">
@@ -81,20 +81,20 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable()">查询</el-button>
-      <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">创建采购计划单</el-button>
+      <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable()">查询</el-button>
+      <el-button class="button111" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">创建采购计划单</el-button>
       <!--<el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">-->
       <!--<el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存采购计划单</el-button>-->
       <!--</el-tooltip>-->
-      <el-button type="success" size="small" icon="el-icon-download" style="margin-left: 10px" @click="submitAddMaterial">选入备料</el-button>
+      <el-button type="primary" size="small" plain icon="el-icon-download" style="margin-left: 10px" @click="submitAddMaterial">选入备料</el-button>
     </el-card>
     <el-card style="width: 1137px">
       <el-table v-loading="" :data="tableData" stripe highlight-current-row border style="width: 100%;max-height: 230px;margin-top: 10px" height="230px" size="mini" @row-click="searchMX">
         <el-table-column label="采购状态" prop="采购计划状态" align="center" width="90">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">未到货</el-tag>
-            <el-tag v-if="Number(scope.row.采购计划状态)===3" type="success" size="mini">已到货</el-tag>
-            <el-tag v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</el-tag>
+            <span v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">未到货</span>
+            <span v-if="Number(scope.row.采购计划状态)===3" type="success" size="mini">已到货</span>
+            <span v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</span>
           </template>
         </el-table-column>
         <el-table-column label="离线采购计划编号" align="center" width="200">
@@ -107,7 +107,7 @@
             {{ scope.row.离线采购计划名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center" width="250">
+        <el-table-column label="供应商" align="center" width="250" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -121,17 +121,17 @@
           <template slot-scope="scope">
             <el-tooltip :open-delay="1200" effect="dark" content="打印采购计划单" placement="top">
               <div style="display: inline-block">
-                <el-button size="mini" type="success" plain icon="el-icon-printer" @click="exportExcel(scope.row)">打印单据</el-button>
+                <el-button size="mini" type="text" icon="el-icon-printer" @click="exportExcel(scope.row)">打印单据</el-button>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="primary" plain size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)">编辑</el-button>
+                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" style="margin-left: 10px" type="text" size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)"/>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
               <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="primary" plain size="mini" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)">删除</el-button>
+                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" style="margin-left: 10px" type="text" size="mini" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)"/>
               </div>
             </el-tooltip>
           </template>
@@ -150,12 +150,12 @@
       </div>
     </el-card>
     <el-card style="width: 1137px">
-      <el-table v-loading="" :data="tableData3" stripe highlight-current-row border style="width: 100%;max-height: 300px;margin-top: 10px" size="mini">
+      <el-table v-loading="" :data="tableData3" highlight-current-row border style="width: 100%;max-height: 300px;margin-top: 10px" size="mini">
         <el-table-column label="采购状态" align="center" width="90">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</el-tag>
-            <el-tag v-if="Number(scope.row.是否到货)===1" type="success" size="mini">已到货</el-tag>
-            <el-tag v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</el-tag>
+            <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</span>
+            <span v-if="Number(scope.row.是否到货)===1" type="success" size="mini">已到货</span>
+            <span v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</span>
           </template>
         </el-table-column>
         <el-table-column label="物料编码" prop="物料零件编码" align="center" width="180">
@@ -192,7 +192,7 @@
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="物料移出采购计划" placement="top">
               <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" type="info" size="mini" icon="el-icon-right" plain @click="deleteMX(scope.row)">移出</el-button>
+                <el-button :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" type="text" size="mini" icon="el-icon-right" @click="deleteMX(scope.row)">移出</el-button>
               </div>
             </el-tooltip>
           </template>
@@ -670,3 +670,21 @@ export default {
     margin: 0
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
index 8592ba4f..ca39e556 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -44,9 +44,9 @@
           type="date"
           placeholder="选择日期"/>
         <el-tooltip :open-delay="1200" effect="dark" content="查询外购备料发票信息" placement="top">
-          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
+          <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
         </el-tooltip>
-        <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addTable1()">新增到票</el-button>
+        <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addTable1()">新增到票</el-button>
       </el-row>
     </el-card>
     <el-card style="width: 58%;float: left">
@@ -61,8 +61,8 @@
         @row-click="searchTable02">
         <el-table-column align="center" label="发票状态" width="80px">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否请款) === 0" type="warning" size="mini">未请款</el-tag>
-            <el-tag v-else-if="Number(scope.row.是否请款) === 1" type="primary" size="mini">已请款</el-tag>
+            <span v-if="Number(scope.row.是否请款) === 0" type="warning" size="mini">未请款</span>
+            <span v-else-if="Number(scope.row.是否请款) === 1" type="primary" size="mini">已请款</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="发票号" width="120px">
@@ -96,14 +96,13 @@
               <div style="display: inline-block">
                 <el-button
                   :disabled="Number(scope.row.是否请款)===1"
-                  type="success"
+                  type="text"
                   size="mini"
                   icon="el-icon-share"
-                  plain
                   @click="aboutArrival(scope.row)">关联到货单</el-button>
               </div>
             </el-tooltip>
-            <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel(scope.row)">导出</el-button>
+            <el-button type="text" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel(scope.row)">导出</el-button>
             <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button
@@ -121,7 +120,7 @@
                   :disabled="Number(scope.row.是否请款)===1"
                   type="text"
                   size="mini"
-                  icon="el-icon-right"
+                  icon="el-icon-delete"
                   style="margin-left: 20px"
                   @click="deleteTable1(scope.row)"/>
               </div>
@@ -645,4 +644,21 @@ function saveAs(blob, filename = '下载文件.xls') {
     }
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
 
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
index ba585e0b..d813d0d0 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
@@ -20,8 +20,8 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button icon="el-icon-search" type="success" size="small" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
-        <el-button type="primary" icon="el-icon-download" size="small" @click="exportExcel()">导出</el-button>
+        <el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
+        <el-button type="primary" icon="el-icon-download" plain size="small" @click="exportExcel()">导出</el-button>
       </div>
     </el-card>
     <el-card style="width: 72%">
@@ -44,9 +44,9 @@
           align="center"
           width="80px">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到</el-tag>
-            <el-tag v-if="Number(scope.row.是否到货)===1" type="primary" size="mini">已到</el-tag>
-            <el-tag v-if="Number(scope.row.是否到货)===2" type="success" size="mini">已结</el-tag>
+            <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到</span>
+            <span v-if="Number(scope.row.是否到货)===1" type="primary" size="mini">已到</span>
+            <span v-if="Number(scope.row.是否到货)===2" type="success" size="mini">已结</span>
           </template>
         </el-table-column>
         <el-table-column
diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
index 22b79c48..31833647 100644
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -26,8 +26,9 @@
             :value="item.value"/>
         </el-select>
         <el-button
-          type="success"
+          type="primary"
           size="small"
+          plain
           icon="el-icon-search"
           @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
       </el-row>
@@ -40,6 +41,7 @@
         :row-class-name="tableRowClassName"
         size="mini"
         border
+        stripe
         style="width: 100%"
         height="700px"
         highlight-current-row
@@ -59,7 +61,7 @@
             {{ scope.row.规定到货时间 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center">
+        <el-table-column label="供应商" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -91,8 +93,12 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="100px">
           <template slot-scope="scope">
-            <el-button type="warning" plain size="mini" @click="exportTable()">打印</el-button>
-            <el-button type="danger" plain size="mini" @click="Disable(scope.row)">打回</el-button>
+            <el-button type="text" size="mini" icon="el-icon-printer" @click="exportTable()">打印</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="打回" placement="top">
+              <div style="display: inline-block">
+                <el-button type="text" size="mini" style="margin-left: 10px" icon="el-icon-delete" @click="Disable(scope.row)"/>
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
index a3a6022b..25bcce42 100644
--- a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
+++ b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
@@ -10,14 +10,15 @@
           :value="item.value"/>
       </el-select>
       <el-button
-        type="success"
+        type="primary"
         size="small"
+        plain
         icon="el-icon-search"
         style="margin-left:10px"
         @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
     </el-card>
     <el-card>
-      <el-table v-loading="" :data="tableData2" :summary-method="getSummaries1" show-summary border style="width: 100%;max-height: 700px;" height="700px">
+      <el-table v-loading="" :data="tableData2" :summary-method="getSummaries1" show-summary border stripe style="width: 100%;max-height: 700px;" height="700px">
         <el-table-column label="项目名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
diff --git a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
index 55a5fe76..dd81c81b 100644
--- a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
+++ b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
@@ -23,12 +23,13 @@
           :value="item.value"/>
       </el-select>
       <el-button
-        type="success"
+        type="primary"
         size="small"
+        plain
         icon="el-icon-search"
         style="margin-left: 10px"
         @click="pageCurrent1=1;pageSize1=30;total1=0;searchTable1()">查询</el-button>
-      <el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">新增请款</el-button>
+      <el-button class="button111" size="small" icon="el-icon-goods" style="" @click="requestFund">新增请款</el-button>
     </el-card>
     <el-row>
       <el-col style="width: 1200px">
@@ -57,9 +58,9 @@
             <!--        <el-table-column label="请款付款情况" align="center">-->
             <el-table-column label="审批情况内容" width="100" align="center">
               <template slot-scope="scope">
-                <el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
-                <el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag>
-                <el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag>
+                <span v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</span>
+                <span v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</span>
+                <span v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</span>
               </template>
             </el-table-column>
             <el-table-column label="未通过审批原因" width="130" align="center">
@@ -69,9 +70,9 @@
             </el-table-column>
             <el-table-column label="付款情况" width="100" align="center">
               <template slot-scope="scope">
-                <el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag>
-                <el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已同意</el-tag>
-                <el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag>
+                <span v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</span>
+                <span v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已同意</span>
+                <span v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</span>
               </template>
             </el-table-column>
             <el-table-column label="未付款原因" width="100" align="center">
@@ -82,7 +83,11 @@
             <!--        </el-table-column>-->
             <el-table-column label="操作" align="center" width="120">
               <template slot-scope="scope">
-                <el-button :disabled="Number(id)!==Number(scope.row.请款人) || (Number(scope.row.审批情况流水号)===1 && Number(scope.row.付款情况流水号)!==2)" type="danger" size="mini" icon="el-icon-delete" style="margin-left: 10px" plain @click="cancelRequestFund(scope.row)">取消请款</el-button>
+                <el-tooltip :open-delay="1000" effect="dark" content="取消请款" placement="top">
+                  <div style="display: inline-block">
+                    <el-button :disabled="Number(id)!==Number(scope.row.请款人) || (Number(scope.row.审批情况流水号)===1 && Number(scope.row.付款情况流水号)!==2)" type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)"/>
+                  </div>
+                </el-tooltip>
               </template>
             </el-table-column>
           </el-table>
@@ -437,3 +442,20 @@ export default {
     margin-bottom: 5px;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index 0790b283..89a2cc18 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -19,14 +19,15 @@
         <el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
         <el-tooltip :open-delay="1000" effect="dark" content="查询外购备料清款信息" placement="top">
           <el-button
-            type="success"
+            type="primary"
             size="small"
+            plain
             icon="el-icon-search"
             style="margin-left: 10px"
             @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
         </el-tooltip>
         <el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
-          <el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
+          <el-button class="button111" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
         </el-tooltip>
       </el-col>
     </el-card>
@@ -89,9 +90,9 @@
         </el-table-column>
         <el-table-column label="审批情况内容" width="100" align="center">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</el-tag>
-            <el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</el-tag>
-            <el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</el-tag>
+            <span v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</span>
+            <span v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</span>
+            <span v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</span>
           </template>
         </el-table-column>
         <el-table-column label="未通过审批原因" width="110" align="center">
@@ -101,9 +102,9 @@
         </el-table-column>
         <el-table-column label="付款情况" width="100" align="center">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</el-tag>
-            <el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</el-tag>
-            <el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</el-tag>
+            <span v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</span>
+            <span v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</span>
+            <span v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</span>
           </template>
         </el-table-column>
         <el-table-column label="未付款原因" width="100" align="center">
@@ -135,7 +136,7 @@
     </el-card>
     <el-card style="margin-left: 0px;width: 32%;float: left">
       <el-table-column type="expand" label="详情">
-        <el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary style="width: 100%">
+        <el-table :data="gridData" class="subTableHeader" size="mini" show-summary style="width: 100%">
           <el-table-column width="50" align="center" type="index" label="序号"/>
           <el-table-column min-width="150" align="center" label="发票号">
             <template slot-scope="scope">
@@ -423,3 +424,21 @@ export default {
     }
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/WorkshopProcurement/manufacturingPurchaseArrival/index.vue b/src/views/WorkshopProcurement/manufacturingPurchaseArrival/index.vue
index 098e6d08..cb5bdc67 100644
--- a/src/views/WorkshopProcurement/manufacturingPurchaseArrival/index.vue
+++ b/src/views/WorkshopProcurement/manufacturingPurchaseArrival/index.vue
@@ -17,8 +17,8 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button type="success" size="small" style="margin-left: 10px" @click="searchContractDetail">查询明细</el-button>
-      <el-button type="primary" style="margin: 10px" size="small" @click="submitInStorage">确认到货</el-button>
+      <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchContractDetail">查询明细</el-button>
+      <el-button class="button111" style="margin: 10px" size="small" icon="el-icon-circle-check" @click="submitInStorage">确认到货</el-button>
     </el-card>
     <el-card>
       <el-table ref="multipleTable" :data="table1" border stripe size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px" @selection-change="handleSelectionChange">
@@ -213,4 +213,21 @@ export default {
     margin-bottom: 5px;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
 

From bd56a451250e8b8d7b25526cd36b1949d96d38fa Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Sat, 8 Feb 2020 18:30:18 +0800
Subject: [PATCH 5/5] =?UTF-8?q?curd=E5=A4=96=E5=8D=8F=E4=BB=98=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OutsourcingPaymentPlanManagement.js       |  2 +
 src/utils/curd.js                             | 41 ++++++++++
 .../index.vue                                 | 79 ++++++-------------
 3 files changed, 68 insertions(+), 54 deletions(-)

diff --git a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
index b9c2393e..69d7ff29 100644
--- a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
+++ b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
@@ -1,7 +1,9 @@
 import request from '@/utils/request'
+import state from '@/store'
 
 // 查询表格数据
 export function searchtable(check1, ManufacturerAbbreviation, check2, starttime, endTime, pageCurrent, pageSize) {
+  console.log(state.state.user.id, 22222)
   return request({
     url: '',
     method: 'post',
diff --git a/src/utils/curd.js b/src/utils/curd.js
index 5bbc55eb..0fe3334c 100644
--- a/src/utils/curd.js
+++ b/src/utils/curd.js
@@ -5,6 +5,10 @@ Created by hedekun
 import { type } from './tool' // type判断传入值的类型，比typeof更详细
 export default {
   install(Vue) {
+    Vue.prototype.exportExcel_NPOI = function(url, type, name, data) {
+      console.log(url, type, name, data, 1111111111)
+      // this.download(`${url}?param=${data}`)
+    }
     Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) {
       var paramStr = ''
       var paramarray = []
@@ -268,3 +272,40 @@ export default {
     }
   }
 }
+
+// function download(url) {
+//   getBlob(url, function(blob, filename) {
+//     var filename1 = decodeURIComponent(filename)
+//     saveAs(blob, filename1)
+//   })
+// }
+//
+// function decodeUtf8(bytes) { var encoded = ""; for (var i = 0; i < bytes.length; i++) { encoded += '%' + bytes[i].toString(16); } return decodeURIComponent(encoded); }
+//
+// function getBlob(url, cb) {
+//   var xhr = new XMLHttpRequest()
+//   xhr.open('GET', url, true)
+//   xhr.responseType = 'blob'
+//   xhr.onload = function() {
+//     if (xhr.status === 200) {
+//       var name = decodeUtf8(xhr.getResponseHeader('content-disposition').split('=')[1])
+//     }
+//   }
+//   xhr.send()
+// }
+//
+// function saveAs(blob, filename = '下载文件.xls') {
+//   if (window.navigator.msSaveOrOpenBlob) {
+//     navigator.msSaveBlob(blob, filename)
+//   } else {
+//     var link = document.createElement('a')
+//     var body = document.querySelector('body')
+//     link.href = window.URL.createObjectURL(blob)
+//     link.download = filename
+//     link.style.display = 'none'
+//     body.appendChild(link)
+//     link.click()
+//     body.removeChild(link)
+//     window.URL.revokeObjectURL(link.href)
+//   }
+// }
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index dd993dd0..76cddbc7 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -7,7 +7,7 @@
           <el-input v-model="ManufacturerName" size="small" placeholder="外协厂家" clearable style="width:200px"/>
           <el-button type="success" class="el-icon-search" size="small" @click="pageCurrent=1;pageSize=20;getParts()">查询</el-button>
         </el-row>
-        <el-table v-loading="loading" :data="tableData" size="mini" stripe height="500" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
+        <el-table v-loading="loading" :data="tableData" size="mini" highlight-current-row height="500" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
           <el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px">
             <template slot-scope="scope">
               {{ scope.row.外协厂家名称 }}
@@ -20,7 +20,7 @@
           </el-table-column>
           <el-table-column label="到票金额" align="center" width="130px" prop="开票金额">
             <template slot-scope="scope">
-              {{ parseFloat(scope.row.开票金额).toFixed(2) }}
+              {{ scope.row.开票金额 }}
             </template>
           </el-table-column>
           <el-table-column label="付款金额" align="center">
@@ -53,36 +53,24 @@
         </div>
       </el-col>
       <el-col :span="8">
-        <el-table v-loading="loading2" :data="tableData2" size="mini" stripe height="500" style="width: 100%;" border element-loading-text="拼命加载中">
-          <el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px">
+        <el-row>
+          <span style="margin-top: 10px">开票明细:</span>
+          <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
+        </el-row>
+        <el-table v-loading="loading2" :data="tableData2" size="mini" stripe height="500" style="width: 100%" border element-loading-text="拼命加载中">
+          <el-table-column label="发票号" prop="外协厂家名称" align="center" width="230px">
             <template slot-scope="scope">
               {{ scope.row.外协厂家名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="外协金额" prop="总价" align="center" width="200px">
+          <el-table-column label="开票金额" prop="总价" align="center" width="200px">
             <template slot-scope="scope">
               {{ scope.row.总价 }}
             </template>
           </el-table-column>
-          <el-table-column label="到票金额" align="center" width="130px" prop="开票金额">
+          <el-table-column label="开票时间" align="center" width="130px" prop="开票金额">
             <template slot-scope="scope">
-              {{ parseFloat(scope.row.开票金额).toFixed(2) }}
-            </template>
-          </el-table-column>
-          <el-table-column label="付款金额" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.备注 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="未付金额" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.备注 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" width="200px">
-            <template slot-scope="scope">
-              <el-button size="mini" type="primary" plain class="el-icon-edit" @click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
-              <el-button size="mini" type="danger" plain class="el-icon-delete" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+              {{ scope.row.开票金额 }}
             </template>
           </el-table-column>
         </el-table>
@@ -99,38 +87,21 @@
         </div>
       </el-col>
       <el-col :span="8">
-        <el-table v-loading="loading3" :data="tableData3" size="mini" stripe height="500" style="width: 100%;" border element-loading-text="拼命加载中">
-          <el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px">
+        <el-row>
+          <span style="margin-top: 10px">付款明细:</span>
+          <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增</el-button>
+        </el-row>
+        <el-table v-loading="loading3" :data="tableData3" size="mini" stripe height="500" style="width: 100%" border element-loading-text="拼命加载中">
+          <el-table-column label="付款金额" prop="外协厂家名称" align="center" width="230px">
             <template slot-scope="scope">
               {{ scope.row.外协厂家名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="外协金额" prop="总价" align="center" width="200px">
+          <el-table-column label="付款时间" prop="总价" align="center" width="200px">
             <template slot-scope="scope">
               {{ scope.row.总价 }}
             </template>
           </el-table-column>
-          <el-table-column label="到票金额" align="center" width="130px" prop="开票金额">
-            <template slot-scope="scope">
-              {{ parseFloat(scope.row.开票金额).toFixed(2) }}
-            </template>
-          </el-table-column>
-          <el-table-column label="付款金额" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.备注 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="未付金额" align="center">
-            <template slot-scope="scope">
-              {{ scope.row.备注 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="操作" align="center" width="200px">
-            <template slot-scope="scope">
-              <el-button size="mini" type="primary" plain class="el-icon-edit" @click="handleChange1(scope.$index, scope.row, 'form');param = 1">编辑</el-button>
-              <el-button size="mini" type="danger" plain class="el-icon-delete" @click="handleDelete(scope.$index, scope.row)">删除</el-button>
-            </template>
-          </el-table-column>
         </el-table>
         <div class="block">
           <el-pagination
@@ -146,7 +117,7 @@
       </el-col>
     </el-card>
 
-    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible" center style="min-height: 300px" width="700px">
+    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible1" center style="min-height: 300px" width="700px">
       <el-form ref="form" :model="form" :rules="rules" label-position="left" label-width="90px" class="demo-ruleForm">
         <el-row v-show="title1==='到票'">
           <el-col :span="12">
@@ -205,7 +176,7 @@ export default {
       ManufacturerName: '', // 外协厂家
       外协厂家流水号: '',
       title1: '',
-      dialogFormVisible: false,
+      dialogFormVisible1: false,
       form: {
         外协厂家: '',
         发票号: '',
@@ -314,7 +285,7 @@ export default {
       this.form.接收时间 = ''
       this.form.备注 = ''
       this.form.外协厂家 = ''
-      this.dialogFormVisible = true
+      this.dialogFormVisible1 = true
     },
     // 增加确定
     editType() {
@@ -330,7 +301,7 @@ export default {
           this.$message.error('信息增加失败')
         }
       })
-      this.dialogFormVisible = false
+      this.dialogFormVisible1 = false
     },
     // 编辑打开
     handleChange1(index, row, formName) {
@@ -342,7 +313,7 @@ export default {
       this.form.接收人 = row.接收人
       this.form.接收时间 = row.接收时间
       this.form.备注 = row.备注
-      this.dialogFormVisible = true
+      this.dialogFormVisible1 = true
       this.title1 = '编辑'
       this.CoManufacturerFlowNumber1 = row.id
     },
@@ -360,7 +331,7 @@ export default {
           this.$message.error('信息修改失败')
         }
       })
-      this.dialogFormVisible = false
+      this.dialogFormVisible1 = false
     },
     // 提交添加或者修改
     submit(formName) {
@@ -378,7 +349,7 @@ export default {
     },
     // 重置表单
     callOff(formName) {
-      this.dialogFormVisible = false
+      this.dialogFormVisible1 = false
       this.$refs[formName].resetFields()
     },
     // 删除