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 77f9a30e..b9199e7f 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -2,21 +2,11 @@
   <div class="app-container">
     <el-card>
       <div style="margin-top: 8px;margin-bottom: 8px">
-        <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>
+        <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="warning" style="float: right;margin-right: 10px" @click="prepareConfirm()">备料确认</el-button>-->
-        <el-button :disabled="审批未通过===true" size="small" type="warning" plain style="float: right; margin-right: 30px" @click="inputPassword()">领料确认</el-button>
+        <el-button :disabled="审批未通过===true" size="small" type="primary" style="float: right; margin-right: 30px" @click="inputPassword()">领料确认</el-button>
       </div>
     </el-card>
     <div style="width: 27%;float: left;margin-right: 16px">
@@ -274,8 +264,6 @@ export default {
       pickingListNumber: '',
       pickingListNumberShow: '',
       pickListTable1: [],
-      startTime: '',
-      pickingListPeople: '', // 制单人
       pageCurrent3: 1,
       pageSize3: 10000,
       total3: 0,
@@ -544,10 +532,9 @@ export default {
     },
     // 查询领料单列表
     searchList() {
-      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 => {
+      let check
+      this.pickingListNumber ? check = 1 : check = 0
+      searchList(this.pageCurrent3, this.pageSize3, check, this.pickingListNumber).then(response => {
         this.pickListTable1 = response.data.rows
         this.total3 = response.data.total
       })
@@ -582,7 +569,7 @@ export default {
       })
     },
     tableRowClassName({ row }) {
-      if (parseInt(row.是否审批) === 1) {
+      if (parseInt(row.是否审批) === 0) {
         return 'shenpi-row'
       } else {
         return ''
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/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 dd993dd0..b63d5a05 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.外协厂家名称 }}
@@ -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()
     },
     // 删除
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.采购零件名称 }}