diff --git a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
index b9c2393e..35ba5a4e 100644
--- a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
+++ b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
@@ -1,4 +1,5 @@
 import request from '@/utils/request'
+import state from '@/store'
 
 // 查询表格数据
 export function searchtable(check1, ManufacturerAbbreviation, check2, starttime, endTime, pageCurrent, pageSize) {
@@ -6,6 +7,7 @@ export function searchtable(check1, ManufacturerAbbreviation, check2, starttime,
     url: '',
     method: 'post',
     data: {
+      UserID: state.state.user.id,
       type: '1',
       name: '车间生产管理工艺_外协付款_查询',
       param: '外协厂家_check=' + check1 + '&外协厂家=' + ManufacturerAbbreviation + '&时间_check=' + check2 + '&开始时间=' + starttime + '&结束时间=' + endTime,
diff --git a/src/utils/curd.js b/src/utils/curd.js
index 5bbc55eb..d28337aa 100644
--- a/src/utils/curd.js
+++ b/src/utils/curd.js
@@ -1,10 +1,12 @@
-/**
-Created by hedekun
-20180727
- */
+import { ExcelDownLoad } from '@/utils/request'
+
 import { type } from './tool' // type判断传入值的类型，比typeof更详细
 export default {
   install(Vue) {
+    Vue.prototype.exportExcel_NPOI = function(param) {
+      console.log(ExcelDownLoad, param, 1111111111)
+      download(`${ExcelDownLoad}?param=${param}`)
+    }
     Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) {
       var paramStr = ''
       var paramarray = []
@@ -268,3 +270,39 @@ export default {
     }
   }
 }
+function download(url) {
+  getBlob(url, function(blob, filename) {
+    saveAs(blob, filename)
+  })
+}
+// 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) {
+      const name = xhr.getResponseHeader('content-disposition').split('=')[1]
+      var filename1 = decodeURIComponent(name)
+      cb(xhr.response, filename1)
+    }
+  }
+  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
+    // fix Firefox
+    link.style.display = 'none'
+    body.appendChild(link)
+    link.click()
+    body.removeChild(link)
+    window.URL.revokeObjectURL(link.href)
+  }
+}
diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue
index 602840bf..f0e65ed5 100644
--- a/src/views/Assembly/AssemblyQualityInspection/index.vue
+++ b/src/views/Assembly/AssemblyQualityInspection/index.vue
@@ -33,9 +33,9 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
+        <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 15px" @click="pageSize=10; pageCurrent= 1;selecttable()">查询</el-button>
         <el-tooltip :open-delay="1000" effect="dark" content="导出查询数据" placement="top">
-          <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
+          <el-button type="warning" size="small" icon="el-icon-download" plain style="margin-left:10px" @click="exportExcel()">导出</el-button>
         </el-tooltip>
       </el-row>
     </el-card>
@@ -177,7 +177,7 @@ export default {
       selecttable22(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.TestValue, this.check4, this.qualityInspectionValue).then(response => {
         import('@/vendor/Export2Excel').then(excel => {
           const tHeader = ['是否合格', '机床图号', '机床名称', '组号', '部件名称', '检测项', '检测项明细', '备注']
-          const filterVal = ['是否合格', '机床图号', '机床名称', '组号', '组件名称', '检测项', '检测项明细', '备注']
+          const filterVal = ['合格情况', '机床图号', '机床名称', '组号', '组件名称', '检测项', '检测项明细', '备注']
           const list = response.data
           const data = this.formatJson(filterVal, list)
           excel.export_json_to_excel({
diff --git a/src/views/Assembly/QualityBasicData/index.vue b/src/views/Assembly/QualityBasicData/index.vue
index 128da7f9..f138abeb 100644
--- a/src/views/Assembly/QualityBasicData/index.vue
+++ b/src/views/Assembly/QualityBasicData/index.vue
@@ -6,7 +6,7 @@
           <el-row>
             <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">不合格原因</div>
           </el-row>
-          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd1()">新增</el-button>
+          <el-button size="small" type="warning" icon="el-icon-circle-plus-outline" plain style="margin-left: 80%;margin-top: 15px" @click="handleAdd1()">新增</el-button>
           <el-table
             :data="tableData"
             border
@@ -29,10 +29,9 @@
               <template slot-scope="scope">
                 <el-button
                   size="mini"
-                  plain
-                  type="danger"
+                  type="text"
                   icon="el-icon-delete"
-                  @click="handleDelete(scope.row)">删除</el-button>
+                  @click="handleDelete(scope.row)"/>
               </template>
             </el-table-column>
           </el-table>
@@ -43,7 +42,7 @@
           <el-row>
             <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">不合格处理</div>
           </el-row>
-          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd2()">新增</el-button>
+          <el-button size="small" type="warning" icon="el-icon-circle-plus-outline" plain style="margin-left: 80%;margin-top: 15px" @click="handleAdd2()">新增</el-button>
           <el-table :data="tableData1" border style="width: 100%;max-height: 450px;margin-top: 10px" stripe height="350px" highlight-current-row size="mini">
             <el-table-column
               type="index"
@@ -59,10 +58,9 @@
               <template slot-scope="scope">
                 <el-button
                   size="mini"
-                  type="danger"
-                  plain
+                  type="text"
                   icon="el-icon-delete"
-                  @click="handleDelete(scope.row)">删除</el-button>
+                  @click="handleDelete(scope.row)"/>
               </template>
             </el-table-column>
           </el-table>
@@ -73,7 +71,7 @@
           <el-row>
             <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检尺寸</div>
           </el-row>
-          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left:75%;margin-top: 15px" @click="handleAdd3()">新增</el-button>
+          <el-button size="small" type="warning" icon="el-icon-circle-plus-outline" plain style="margin-left:75%;margin-top: 15px" @click="handleAdd3()">新增</el-button>
           <el-table
             :data="tableData2"
             border
@@ -96,10 +94,9 @@
               <template slot-scope="scope">
                 <el-button
                   size="mini"
-                  type="danger"
-                  plain
+                  type="text"
                   icon="el-icon-delete"
-                  @click="handleDelete(scope.row)">删除</el-button>
+                  @click="handleDelete(scope.row)"/>
               </template>
             </el-table-column>
           </el-table>
@@ -110,7 +107,7 @@
           <el-row>
             <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检形位</div>
           </el-row>
-          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left:75%;margin-top: 15px" @click="handleAdd5()">增加</el-button>
+          <el-button size="small" type="warning" icon="el-icon-circle-plus-outline" plain style="margin-left:75%;margin-top: 15px" @click="handleAdd5()">增加</el-button>
           <el-table :data="tableData4" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" stripe highlight-current-row size="mini">
             <el-table-column
               type="index"
@@ -126,10 +123,9 @@
               <template slot-scope="scope">
                 <el-button
                   size="mini"
-                  type="danger"
-                  plain
+                  type="text"
                   icon="el-icon-delete"
-                  @click="handleDelete(scope.row)">删除</el-button>
+                  @click="handleDelete(scope.row)"/>
               </template>
             </el-table-column>
           </el-table>
@@ -142,7 +138,7 @@
           <el-row>
             <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检外观</div>
           </el-row>
-          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left:75%;margin-top: 15px" @click="handleAdd4()">增加</el-button>
+          <el-button size="small" type="warning" icon="el-icon-circle-plus-outline" plain style="margin-left:75%;margin-top: 15px" @click="handleAdd4()">增加</el-button>
           <el-table :data="tableData3" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" stripe highlight-current-row size="mini">
             <el-table-column
               type="index"
@@ -158,10 +154,9 @@
               <template slot-scope="scope">
                 <el-button
                   size="mini"
-                  type="danger"
-                  plain
+                  type="text"
                   icon="el-icon-delete"
-                  @click="handleDelete(scope.row)">删除</el-button>
+                  @click="handleDelete(scope.row)"/>
               </template>
             </el-table-column>
           </el-table>
@@ -172,7 +167,7 @@
           <el-row>
             <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">检测项</div>
           </el-row>
-          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left:75%;margin-top: 15px" @click="handleAdd6()">增加</el-button>
+          <el-button size="small" type="warning" icon="el-icon-circle-plus-outline" plain style="margin-left:75%;margin-top: 15px" @click="handleAdd6()">增加</el-button>
           <el-table :data="tableData5" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" highlight-current-row stripe size="mini" @row-click="searchTesting">
             <el-table-column
               type="index"
@@ -188,10 +183,9 @@
               <template slot-scope="scope">
                 <el-button
                   size="mini"
-                  type="danger"
-                  plain
+                  type="text"
                   icon="el-icon-delete"
-                  @click="handleDelete(scope.row)">删除</el-button>
+                  @click="handleDelete(scope.row)"/>
               </template>
             </el-table-column>
           </el-table>
@@ -202,7 +196,7 @@
           <el-row>
             <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">检测项明细</div>
           </el-row>
-          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left:80%;margin-top: 15px" @click="handleAdd7()">增加</el-button>
+          <el-button size="small" type="warning" icon="el-icon-circle-plus-outline" plain style="margin-left:80%;margin-top: 15px" @click="handleAdd7()">增加</el-button>
           <el-table :data="tableData6" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" stripe highlight-current-row size="mini">
             <el-table-column
               type="index"
@@ -218,10 +212,9 @@
               <template slot-scope="scope">
                 <el-button
                   size="mini"
-                  type="danger"
-                  plain
+                  type="text"
                   icon="el-icon-delete"
-                  @click="handleDelete(scope.row)">删除</el-button>
+                  @click="handleDelete(scope.row)"/>
               </template>
             </el-table-column>
           </el-table>
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index c176ac3e..bae344a4 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -59,9 +59,9 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="pageSize=20; pageCurrent= 1;selecttable()">查询</el-button>
+        <el-button type="primary" size="small" icon="el-icon-search" style="margin-left: 15px" plain @click="pageSize=20; pageCurrent= 1;selecttable()">查询</el-button>
         <el-tooltip :open-delay="1000" effect="dark" content="导出查询数据" placement="top">
-          <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportExcel()">导出</el-button>
+          <el-button type="warning" size="small" icon="el-icon-download" plain style="margin-left:10px" @click="exportExcel()">导出</el-button>
         </el-tooltip>
       </el-row>
     </el-card>
@@ -579,7 +579,7 @@ export default {
       selecttable22(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.check7, this.qualityInspectionValue, this.check8, this.personNum).then(response => {
         import('@/vendor/Export2Excel').then(excel => {
           const tHeader = ['是否禁用', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工序名称', '质检类型', '检验数量', '不合格数量', '不合格原因', '处理结果', '质检时间', '备注']
-          const filterVal = ['是否禁用', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工艺名称', '质检类型', '数量', '不合格数量', '不合格原因文本', '不合格处理文本', '操作时间', '备注']
+          const filterVal = ['禁用情况', '机床图号', '机床名称', '组号', '零件图号', '零件名称', '零件数量', '规格或材料', '工艺名称', '质检类型', '数量', '不合格数量', '不合格原因文本', '不合格处理文本', '操作时间', '备注']
           const list = response.data
           const data = this.formatJson(filterVal, list)
           excel.export_json_to_excel({
diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue
index 92e3f4f7..6be72ee7 100644
--- a/src/views/Inventory/Inboundscanning/index.vue
+++ b/src/views/Inventory/Inboundscanning/index.vue
@@ -4,7 +4,7 @@
       <el-row>
         <span style="margin-left: 10px">零件图号</span>
         <el-input v-model="Partpaint" clearable size="small" style="width:170px;height: 29px;margin-top: 10px;margin-bottom: 10px" />
-        <el-button size="small" type="success" icon="el-icon-search" style="margin: 0 0 0 10px" @click="getCraftNumber()">查询</el-button>
+        <el-button size="small" type="primary" icon="el-icon-search" plain style="margin: 0 0 0 10px" @click="getCraftNumber()">查询</el-button>
         <el-tooltip :open-delay="1200" effect="dark" content="清除所有机床零件信息" placement="top">
           <el-button size="small" type="danger" icon="el-icon-remove-outline" style="margin: 0 0 0 10px" plain @click="Empty()">清空</el-button>
         </el-tooltip>
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index b9199e7f..303e2e83 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -4,9 +4,9 @@
       <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>
+        <el-button :disabled="审批未通过===true" size="small" type="primary" style="float: right; margin-right: 30px" class="button111" @click="inputPassword()">领料确认</el-button>
       </div>
     </el-card>
     <div style="width: 27%;float: left;margin-right: 16px">
@@ -680,3 +680,20 @@ export default {
     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/Inventory/SelfMadePartsWarehouseOut/index.vue b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
index 809cac35..2ffe89b8 100644
--- a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
+++ b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
@@ -24,8 +24,8 @@
         <!--            :value="item.value"/>-->
         <!--        </el-select>-->
         <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 180px;margin: 10px 10px 0px 10px"/>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
-        <el-button type="primary" size="small" style="margin: 15px 0 0 10px" @click="wareHousing">出库</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" plain style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
+        <el-button type="warning" size="small" style="margin: 15px 0 0 10px" plain @click="wareHousing">出库</el-button>
       </el-row>
     </el-card>
     <el-card>
diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue
index 91cda143..e44add6d 100644
--- a/src/views/Inventory/StockInquiry/index.vue
+++ b/src/views/Inventory/StockInquiry/index.vue
@@ -22,7 +22,7 @@
       </el-select>
       <span>零件图号:</span>
       <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;"/>
-      <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=500;total = 0">查询</el-button>
+      <el-button type="primary" class="el-icon-search" size="small" plain style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=500;total = 0">查询</el-button>
     </el-card>
 
     <el-card style="width: 49.5%; float: left">
diff --git a/src/views/ManufacturingCenter/AddingOrder/index.vue b/src/views/ManufacturingCenter/AddingOrder/index.vue
index d476923f..1e3a5ed4 100644
--- a/src/views/ManufacturingCenter/AddingOrder/index.vue
+++ b/src/views/ManufacturingCenter/AddingOrder/index.vue
@@ -19,9 +19,9 @@
           :value="item.value"/>
       </el-select>
       <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;margin:0px 10px;"/>
-      <el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
-      <el-button type="primary" class="el-icon-plus" size="small" style="margin: 0px 10px;" @click="addTableData()">加序</el-button>
-      <el-button type="danger" class="el-icon-delete" size="small" style="margin: 0px 10px;" @click="deleteProcess()">删除加序</el-button>
+      <el-button type="primary" class="el-icon-search" size="small" plain style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
+      <el-button type="warning" class="el-icon-plus" size="small" plain style="margin: 0px 10px;" @click="addTableData()">加序</el-button>
+      <el-button type="danger" class="el-icon-delete" size="small" plain style="margin: 0px 10px;" @click="deleteProcess()">删除加序</el-button>
     </el-card>
     <el-row>
       <el-col style="width: 550px">
diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
index dd0f8609..76c40d39 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="700">
diff --git a/src/views/ManufacturingCenter/Enter0therData/index.vue b/src/views/ManufacturingCenter/Enter0therData/index.vue
index 3ba78ae4..3e5a55df 100644
--- a/src/views/ManufacturingCenter/Enter0therData/index.vue
+++ b/src/views/ManufacturingCenter/Enter0therData/index.vue
@@ -17,9 +17,9 @@
         <el-input-number v-model="workTime" :min="0" :step="1" size="small" placeholder="单件工时" style="width: 120px" clearable/>
       </el-row>
       <el-row>
-        <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="saveDate">保存</el-button>
-        <el-button type="success" size="small" icon="el-icon-edit" style="margin-left: 10px" @click="editDate">编辑</el-button>
-        <el-button type="danger" size="small" icon="el-icon-delete" style="margin-left: 10px" @click="deleteDate">删除</el-button>
+        <el-button type="warning" size="small" icon="el-icon-plus" plain style="margin-left: 10px" @click="saveDate">保存</el-button>
+        <el-button type="primary" size="small" icon="el-icon-edit" plain style="margin-left: 10px" @click="editDate">编辑</el-button>
+        <el-button type="danger" size="small" icon="el-icon-delete" plain style="margin-left: 10px" @click="deleteDate">删除</el-button>
         <el-date-picker
           v-model="monthValue"
           type="month"
@@ -27,7 +27,7 @@
           value-format="yyyy-MM"
           style="margin-left: 400px; width: 140px"
           placeholder="选择月"/>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-top: 10px;margin-bottom: 10px" @click="fetchDate">查询</el-button>
+        <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-top: 10px;margin-bottom: 10px" @click="fetchDate">查询</el-button>
       </el-row>
     </el-card>
     <el-table v-loading="" :data="tableData" border stripe style="width: 100%" height="730px" size="mini" highlight-current-row @row-click="searchTable">
diff --git a/src/views/ManufacturingCenter/ManHourAnalysis/index.vue b/src/views/ManufacturingCenter/ManHourAnalysis/index.vue
index 94c8f275..7686671e 100644
--- a/src/views/ManufacturingCenter/ManHourAnalysis/index.vue
+++ b/src/views/ManufacturingCenter/ManHourAnalysis/index.vue
@@ -18,7 +18,7 @@
           style="width: 170px;margin:0px 10px"
           type="date"
           placeholder="选择加工完成日期"/>
-        <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 v-if="chart1" id="myChart1" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
       </el-card>
     </el-row>
@@ -34,7 +34,7 @@
               :value="item.value"/>
           </el-select>
           <el-date-picker v-model="startTime2" :clearable="false" size="small" type="year" value-format="yyyy" format="yyyy" style="width: 150px" placeholder="选择年"/>
-          <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 v-if="chart2" id="myChart2" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
         </el-card>
       </el-col>
@@ -49,7 +49,7 @@
         <el-card v-loading="loading4" style="height: 550px">
           <span>不合格数量统计</span>
           <el-date-picker v-model="startTime4" :clearable="false" size="small" type="year" value-format="yyyy" format="yyyy" style="width: 150px" placeholder="选择年"/>
-          <el-button size="small" type="success" icon="el-icon-search" @click="search4()">查询</el-button>
+          <el-button size="small" type="primary" icon="el-icon-search" plain @click="search4()">查询</el-button>
           <div v-if="chart4" id="myChart4" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
         </el-card>
       </el-col>
@@ -73,7 +73,7 @@
             style="width: 160px"
             type="date"
             placeholder="选择日期"/>
-          <el-button size="small" type="success" icon="el-icon-search" @click="search5()">查询</el-button>
+          <el-button size="small" type="primary" icon="el-icon-search" plain @click="search5()">查询</el-button>
           <div v-if="chart5" id="myChart5" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
         </el-card>
       </el-col>
@@ -90,7 +90,7 @@
               :value="item.value"/>
           </el-select>
           <el-date-picker v-model="startTime6" :clearable="false" size="small" type="year" value-format="yyyy" format="yyyy" style="width: 150px" placeholder="选择年"/>
-          <el-button size="small" type="success" icon="el-icon-search" @click="search6()">查询</el-button>
+          <el-button size="small" type="primary" icon="el-icon-search" plain @click="search6()">查询</el-button>
           <div v-if="chart6" id="myChart6" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
         </el-card>
       </el-col>
diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index da00be87..fff065c3 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -47,9 +47,9 @@
           style="width: 160px"
           type="date"
           placeholder="选择日期"/>
-        <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
+        <el-button type="primary" class="el-icon-search" size="small" plain style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
         <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 10px" @click="exportExcel">导出</el-button>
+          <el-button type="warning" class="el-icon-download" size="small" plain style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
         </el-tooltip>
       </el-row>
     </el-card>
diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
index e459cc65..8e4f13d4 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -21,8 +21,8 @@
           :value="item.value"/>
       </el-select>
       <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;margin:0px 10px;"/>
-      <el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;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 type="primary" class="el-icon-search" size="small" plain style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
+      <el-button type="warning" class="el-icon-download" size="small" plain style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
     </el-card>
     <el-row>
       <el-col style="width: 37%">
diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
index 3e89344a..a9fad44e 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagement/index.vue
@@ -28,7 +28,7 @@
         <h3 style="display: inline-block;margin: 0 0 0 20px">交货期:</h3>
         <el-date-picker v-model="time_deliveryStart" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="交货期" class="time"/> ~
         <el-date-picker v-model="time_deliveryFinish" size="small" value-format="yyyy-MM-dd" type="date" style="margin-top:10px;width: 180px" placeholder="交货期" class="time"/>
-        <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
+        <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
       </el-row>
     </el-card>
 
@@ -247,7 +247,7 @@
       <h2 v-if="code===3" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 备料</h2>
       <h2 v-if="code===4" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 制造</h2>
       <h2 v-if="code===5" style="width: 400px;float:left;display: inline-block;margin: 0 0 10px 0">子计划：{{ machineNum }} 装配</h2>
-      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加</el-button>
+      <el-button size="small" icon="el-icon-circle-plus" type="warning" style="float:left;margin: 7px 0 0 0" plain @click="addTable()">增加</el-button>
       <el-table v-loading="loading2" :data="tableData2" style="margin-top: 10px;width: 100%;" stripe border element-loading-text="拼命加载中">
         <el-table-column min-width="100px" label="组号" align="center">
           <template slot-scope="scope">
diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
index c469cd22..81782d5d 100644
--- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
+++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
@@ -16,12 +16,12 @@
         style="width: 170px;margin:0px 10px"
         type="date"
         placeholder="选择加工完成日期"/>
-      <el-button type="success" class="el-icon-search" size="small" style="margin:0px 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
+      <el-button type="primary" class="el-icon-search" size="small" plain style="margin:0px 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
     </el-card>
     <el-row>
       <el-col :span="9">
         <el-card>
-          <el-table v-loading="loading" :data="tableData" highlight-current-row size="mini" style="width: 100%;" height="700px" border element-loading-text="拼命加载中" @row-click="searchTable2">
+          <el-table v-loading="loading" :data="tableData" highlight-current-row size="mini" stripe style="width: 100%;" height="700px" border element-loading-text="拼命加载中" @row-click="searchTable2">
             <el-table-column label="操作者" align="center" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.姓名 }}
@@ -65,7 +65,7 @@
       </el-col>
       <el-col :span="15">
         <el-card>
-          <el-table v-loading="loading2" :data="tableData2" size="mini" stripe style="width: 100%;" height="700px" border element-loading-text="拼命加载中">
+          <el-table v-loading="loading2" :data="tableData2" size="mini" style="width: 100%;" height="700px" border element-loading-text="拼命加载中">
             <el-table-column label="零件图号" align="center" width="135px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
diff --git a/src/views/ManufacturingCenter/maintainInformation/index.vue b/src/views/ManufacturingCenter/maintainInformation/index.vue
index 1057ab52..2299edd2 100644
--- a/src/views/ManufacturingCenter/maintainInformation/index.vue
+++ b/src/views/ManufacturingCenter/maintainInformation/index.vue
@@ -12,11 +12,11 @@
               :value="item.value"/>
           </el-select>
           <span>选择月份：</span>
-          <el-date-picker v-model="monthssss" size="small" type="month" value-format="yyyy-MM" format="yyyy-MM" style="width: 110px" placeholder="选择月"/>
-          <el-button size="small" type="primary" style="margin-right: 50px" @click="exportOut()">导出日点检表</el-button>
+          <el-date-picker v-model="monthssss" size="small" type="month" value-format="yyyy-MM" format="yyyy-MM" style="width: 120px" placeholder="选择月"/>
+          <el-button size="small" type="warning" style="margin-right: 50px" plain @click="exportOut()">导出日点检表</el-button>
         </div>
       </div>
-      <el-table v-loading="loading1" :data="tableData1" height="200" highlight-current-row border>
+      <el-table v-loading="loading1" :data="tableData1" stripe height="200" highlight-current-row border>
         <el-table-column align="center" label="序号" type="index" width="50"/>
         <el-table-column align="center" label="工位号" width="110">
           <template slot-scope="scope">
@@ -49,7 +49,7 @@
     <el-card>
       <div>点检类型、点检内容维护</div>
       <el-col :span="6">
-        <el-table v-loading="loading2" :data="tableData2" height="300" highlight-current-row border @row-click="getTableData3">
+        <el-table v-loading="loading2" :data="tableData2" stripe height="300" highlight-current-row border @row-click="getTableData3">
           <el-table-column align="center" label="序号" type="index" width="50"/>
           <el-table-column align="center" label="点检类型名称" min-width="150">
             <template slot-scope="scope">
@@ -61,13 +61,14 @@
           </el-table-column>
           <el-table-column align="center" label="操作" width="160">
             <template slot="header" slot-scope="scope">
-              <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd1('form1')">新增</el-button>
+              <!--<el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd1('form1')">新增</el-button>-->
+              <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()" >新增</el-button>
             </template>
             <template slot-scope="scope">
               <el-button v-if="scope.row.edit" type="text" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit1(scope.row)">确定</el-button>
               <el-button v-if="scope.row.edit" class="cancel-btn" size="mini" type="text" @click="cancelEdit1(scope.$index, scope.row)">取消</el-button>
-              <el-button v-else type="text" size="mini" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-              <el-button v-if="!scope.row.edit" type="danger" size="mini" plain icon="el-icon-delete" @click="openDelete1(scope.row)">删除</el-button>
+              <el-button v-else type="text" size="mini" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit"/>
+              <el-button v-if="!scope.row.edit" type="text" size="mini" plain icon="el-icon-delete" @click="openDelete1(scope.row)"/>
             </template>
           </el-table-column>
         </el-table>
@@ -105,13 +106,14 @@
           </el-table-column>
           <el-table-column align="center" label="操作" width="160">
             <template slot="header" slot-scope="scope">
-              <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd2('form2')">新增</el-button>
+              <!--<el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd2('form2')">新增</el-button>-->
+              <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()" >新增</el-button>
             </template>
             <template slot-scope="scope">
               <el-button v-if="scope.row.edit" type="text" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit2(scope.row)">确定</el-button>
               <el-button v-if="scope.row.edit" class="cancel-btn" size="mini" type="text" @click="cancelEdit2(scope.$index, scope.row)">取消</el-button>
-              <el-button v-else type="text" size="mini" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-              <el-button v-if="!scope.row.edit" type="danger" size="mini" plain icon="el-icon-delete" @click="openDelete2(scope.row)">删除</el-button>
+              <el-button v-else type="text" size="mini" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit"/>
+              <el-button v-if="!scope.row.edit" type="text" size="mini" plain icon="el-icon-delete" @click="openDelete2(scope.row)"/>
             </template>
           </el-table-column>
         </el-table>
@@ -745,6 +747,21 @@ export default {
 </script>
 
 <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;
+    }
+  }
   #dianjianbiao {
     /*.el-table td, .el-table th.is-leaf,.el-table--border, .el-table--group{*/
       /*border-color: black !important;*/
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
index b63d5a05..d1ace90f 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -5,7 +5,7 @@
         <el-row>
           <span>外协厂家:</span>
           <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-button type="primary" class="el-icon-search" size="small" plain @click="pageCurrent=1;pageSize=20;getParts()">查询</el-button>
         </el-row>
         <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">
@@ -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">
@@ -55,7 +55,7 @@
       <el-col :span="8">
         <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-button class="button111" 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">
@@ -89,7 +89,7 @@
       <el-col :span="8">
         <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-button class="button111" 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">
@@ -218,6 +218,7 @@ export default {
       var check2 = 0
       this.ManufacturerName ? check = 1 : check = 0
       searchtable(check, this.ManufacturerName, check2, '', '', this.pageCurrent, this.pageSize).then(response => {
+        console.log(response.data)
         this.loading = false
         if (response.data.rows.length !== 0) {
           this.tableData = response.data.rows
@@ -421,3 +422,20 @@ export default {
     background: #AEF199;
   }
 </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/OutsourcingQCSearch/index.vue b/src/views/Outsourcing/OutsourcingQCSearch/index.vue
index 4372d340..942a7e79 100644
--- a/src/views/Outsourcing/OutsourcingQCSearch/index.vue
+++ b/src/views/Outsourcing/OutsourcingQCSearch/index.vue
@@ -4,7 +4,7 @@
       <el-input v-model="orderNumber" clearable style="width: 210px;margin:0px 10px" placeholder="输入外协到货单或外协厂家" size="small"/>
       <!--      <span style="margin-left: 10px">外协厂家:</span>-->
       <!--      <el-input v-model="outsourcingSupplier" clearable style="width: 200px;margin:0px 10px" placeholder="请输入外协厂家" size="small"/>-->
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+      <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
       <el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 600px;" height="400px" size="mini" @row-click="searchTable2">
         <el-table-column label="序号" align="center" width="55" type="index"/>
         <el-table-column label="外协到货单号" prop="外协到货单编号" align="center" min-width="100">
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index 2bfd12e4..e19386cd 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,7 +83,7 @@
         <!--<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-search" style="margin-left:10px" plain @click="pageSize=20;pageList=1;fetchData()">查询</el-button>
         <el-checkbox v-model="isChecked" size="small" label="编辑已提交"/>
         <el-button type="primary" 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" >
@@ -139,16 +139,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" style="margin-left:10px" plain @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] }}
@@ -275,7 +275,7 @@
     <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="外协厂家" center width="500px" height="600px">
       <div align="center">
         <el-input v-model="input" size="small" clearable style="width:200px"/>
-        <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="searchData()">查询</el-button>
+        <el-button type="primary" size="mini" icon="el-icon-search" style="margin-left:10px" plain @click="searchData()">查询</el-button>
       </div>
       <el-table :data="List2" max-height="370" stripe size="mini" highlight-current-row @row-click="handleCurrentChange3">
         <el-table-column label="外协厂家" align="center" >
diff --git a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
index 2fb0105d..418b4dfb 100644
--- a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
+++ b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
@@ -9,11 +9,11 @@
           <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=10;total1=0;searchTable1();pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
+          <el-button size="small" type="primary" icon="el-icon-search" plain style="margin: 0 0 0 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1();pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>
         </el-row>
       </div>
       <h4 style="margin-top: 0">采购件列表</h4>
-      <el-table :data="tableData1" size="mini" border style="width: 100%;" height="440">
+      <el-table :data="tableData1" size="mini" border stripe style="width: 100%;" height="440">
         <el-table-column label="名称" prop="物料名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
@@ -66,7 +66,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope" align="center">
-            <el-button size="mini" type="primary" @click="turnToBacklogGoods(scope.row)">转为滞货</el-button>
+            <el-button size="mini" type="text" @click="turnToBacklogGoods(scope.row)">转为滞货</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -82,7 +82,7 @@
           @current-change="handleCurrentChange1"/>
       </div>
       <h4>滞货件列表</h4>
-      <el-table :data="tableData2" size="mini" border style="width: 100%;" height="440">
+      <el-table :data="tableData2" size="mini" stripe border style="width: 100%;" height="440">
         <el-table-column label="名称" prop="物料名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 1373d7bd..2295db18 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -64,8 +64,8 @@
               <!--</el-select>-->
               <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>-->
               <!--<el-input v-model="materialSpec" placeholder="物料规格" size="small" style="width:120px" clearable/>-->
-              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable11()">查询</el-button>
-              <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价单</el-button>
+              <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable11()">查询</el-button>
+              <el-button type="warning" size="small" icon="el-icon-download" plain style="margin-left: 10px" @click="exportUninquirySheet">导出未询价单</el-button>
               <el-tooltip :open-delay="1000" effect="dark" content="开启物料变更" placement="top">
                 <el-switch v-model="switchValue" active-color="#13ce66" inactive-color="#ff4949" style="margin-left: 30px"/>
               </el-tooltip>
@@ -91,7 +91,7 @@
                   </el-select>
                   <el-button type="primary" size="mini" @click="visible1 = false;tiaozheng1()">确定</el-button>
                 </div>
-                <el-button slot="reference" type="success" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
+                <el-button slot="reference" type="primary" size="small" plain style="float: right;margin-right: 20px">调整采购任务</el-button>
               </el-popover>
               <!--<el-popover v-model="visible" title="调整采购任务" placement="top" width="180">-->
               <!--<div style="text-align: right; margin: 0">-->
@@ -251,6 +251,7 @@
                   <el-button
                     type="warning"
                     size="small"
+                    plain
                     style="margin: 0px 20px; display: inline-block;"
                     @click="addInquirySheet">选入物料</el-button>
                 </el-tooltip>
@@ -283,8 +284,8 @@
               <!--:value="item.value"/>-->
               <!--</el-select>-->
               <!--<el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" style="width: 100px" size="small"/>-->
-              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable12()">查询</el-button>
-              <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 10px" @click="exportUninquirySheet">导出未询价单</el-button>
+              <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable12()">查询</el-button>
+              <el-button type="warning" size="small" icon="el-icon-download" plain style="margin-left: 10px" @click="exportUninquirySheet">导出未询价单</el-button>
               <el-date-picker
                 v-model="endTime"
                 size="small"
@@ -296,7 +297,7 @@
                 style="width:250px"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"/>
-              <el-button type="success" size="small" style="float: right" @click="visible2 = false;tiaozheng2()">调整采购任务</el-button>
+              <el-button type="primary" size="small" plain style="float: right" @click="visible2 = false;tiaozheng2()">调整采购任务</el-button>
               <el-select v-model="PersonValue" style="width:100px;float: right" placeholder="人员" size="small" filterable clearable>
                 <el-option
                   v-for="item in Person"
@@ -427,6 +428,7 @@
                 <el-button
                   type="warning"
                   size="small"
+                  plain
                   style="margin: 0px 20px"
                   @click="addInquirySheet">选入物料</el-button>
               </el-tooltip>
@@ -620,21 +622,23 @@
         <el-row>
           <el-input v-model="inquirySheetNum" placeholder="询价单号或供应商" size="small" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()"/>
           <el-button
-            type="success"
+            type="primary"
             size="mini"
             icon="el-icon-search"
+            plain
             style="margin:0px 10px"
             @click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询</el-button>
           <el-button
-            type="primary"
+            type="warning"
             icon="el-icon-circle-plus-outline"
             size="mini"
+            plain
             style="margin-left: 10px"
             @click="createInquirySheet">创建</el-button>
           <el-button type="warning" size="mini" plain icon="el-icon-edit" style="margin-left: 10px" @click="editInquirySheet()">编辑</el-button>
           <el-button type="danger" size="mini" plain icon="el-icon-delete" style="margin-left: 10px" @click="deleteInquirySheet()">删除</el-button>
           <el-button :disabled="tableData3.length===0" type="primary" size="small" plain style="float: right" @click="printInquirySheet()">打印</el-button>
-          <el-button :disabled="tableData3.length===0" type="warning" size="small" style="margin-left:10px;float: right" @click="exportInquirySheet()">导出</el-button>
+          <el-button :disabled="tableData3.length===0" type="warning" size="small" plain style="margin-left:10px;float: right" @click="exportInquirySheet()">导出</el-button>
         </el-row>
       </el-card>
       <el-row>
diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
index 06eefe6a..582c3b0c 100644
--- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
+++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue
@@ -38,12 +38,12 @@
             active-value="含税"
             inactive-value="未税"/>
         </el-tooltip>
-        <el-button v-if="quickChangePrice" size="mini" style="margin: 0px 0 0 10px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>
+        <el-button v-if="quickChangePrice" size="mini" type="primary" plain style="margin: 0px 0 0 10px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>
         <el-button v-else size="mini" style="margin: 10px 0 0 10px" @click="quickChangePrice=!quickChangePrice">还原</el-button>
         <el-button v-show="isShowN" type="text" style="margin: 10px 0 0 10px" @click="isShowN=false">折叠</el-button>
         <el-button v-show="!isShowN" type="text" style="margin: 10px 0 0 10px" @click="isShowN=true">展开其他说明</el-button>
         <el-tooltip v-show="true" :open-delay="300" content="一键删除交货期" placement="right">
-          <el-button type="danger" icon="el-icon-date" size="small" @click="deleteAllDate()"/>
+          <el-button type="danger" icon="el-icon-date" plain size="small" @click="deleteAllDate()"/>
         </el-tooltip>
       </el-row>
       <el-row v-show="isShowN" style="margin-top: 10px">
@@ -145,7 +145,7 @@
       <el-button type="primary" plain size="small" style="margin-left:10px;" @click="editContract()">预览合同</el-button>
       <span>递交审批：</span>
       <el-tooltip :open-delay="1000" effect="dark" content="生成合同并提交审批" placement="top">
-        <el-button type="success" size="small" @click="generateContract()">递交</el-button>
+        <el-button type="primary" plain size="small" @click="generateContract()">递交</el-button>
       </el-tooltip>
       <hr>
       <!--html代码-->
diff --git a/src/views/PurchasingCenter/FundApproval1/index.vue b/src/views/PurchasingCenter/FundApproval1/index.vue
index bdc96f37..153849db 100644
--- a/src/views/PurchasingCenter/FundApproval1/index.vue
+++ b/src/views/PurchasingCenter/FundApproval1/index.vue
@@ -25,8 +25,8 @@
         </el-table-column>
         <el-table-column label="审核" align="center" width="200">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" icon="el-icon-check" plain @click="yesApproval(scope.row)">通过</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-close" plain @click="noApproval(scope.row)">不通过</el-button>
+            <el-button type="text" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
+            <el-button type="text" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
index e5ab3fcd..5575cb25 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
@@ -6,12 +6,12 @@
         <el-input v-model="supperiler" placeholder="供应商" size="small" clearable/>
         <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=100000;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 :disabled="disabled" type="warning" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
+        <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=100000;searchTable1()">查询</el-button>
+        <el-button type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px" @click="createOrder()">创建</el-button>
+        <el-button :disabled="disabled" type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
       </div>
       <h4 style="margin-top: 5px;margin-bottom: 0px">发票结算申请单</h4>
-      <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%;max-height: 350px" size="mini" @row-click="searchTable2">
+      <el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;max-height: 350px" size="mini" @row-click="searchTable2">
         <el-table-column type="expand">
           <template slot-scope="scope">
             <el-form label-position="left" inline class="demo-table-expand">
@@ -102,8 +102,8 @@
         <el-table-column label="操作" align="center" width="200" fixed="right">
           <template slot-scope="scope">
             <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" size="mini" style="margin-left:10px" @click="submitApply(scope.row)">提交申请</el-button>
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-edit" size="mini" style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-delete" size="mini" style="margin-left:10px" @click="handleDelete(scope.row)">删除</el-button>
+            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-edit" size="mini" style="margin-left:10px" @click="handleEdit(scope.row)"/>
+            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-delete" size="mini" style="margin-left:10px" @click="handleDelete(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/PurchasingCenter/MaterialMProcure/index.vue b/src/views/PurchasingCenter/MaterialMProcure/index.vue
index 0b86ba3f..3274e045 100644
--- a/src/views/PurchasingCenter/MaterialMProcure/index.vue
+++ b/src/views/PurchasingCenter/MaterialMProcure/index.vue
@@ -89,8 +89,8 @@
         <el-input v-model="MaterialName" placeholder="物料名称" size="small" clearable/>
         <el-input v-model="MaterialSpecification" placeholder="物料规格" size="small" clearable/>
         <el-input v-model="MaterialModel" placeholder="物料型号" size="small" clearable/>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;searchMaterial()">查询</el-button>
-        <el-button type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增采购物料申请</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="pageCurrent=1;searchMaterial()">查询</el-button>
+        <el-button type="warning" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" plain size="small" @click="handleAdd()">新增采购物料申请</el-button>
       </el-row>
     </el-card>
 
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 020ab011..ddcd3312 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -24,7 +24,7 @@
                 style="width:250px;margin-left: 5px"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"/>
-              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 5px" @click="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 5px" @click="pageCurrent11=1;pageSize11=20;total11=0;searchTable11()">查询</el-button>
               <el-popover v-model="visible1" placement="top" width="140">
                 <div style="text-align: right; margin: 0">
                   <el-select v-model="PersonValue" style="width:100px" placeholder="人员" size="small" filterable clearable>
@@ -160,13 +160,14 @@
           <el-tab-pane label="仓库" name="仓库">
             <el-row>
               <el-input v-model="materialName" style="width: 150px;margin-left: 10px" placeholder="名称规格型号" size="small" clearable @keyup.enter.native="pageCurrent22=1;pageSize22=20;total22=0;searchTable22()"/>
-              <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable22()">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable22()">查询</el-button>
             </el-row>
             <el-table
               v-loading=""
               :data="tableData22"
               :row-class-name="tableRowClassName2"
               border
+              stripe
               style="width: 100%;max-height: 500px;"
               height="500px"
               size="mini"
@@ -214,9 +215,9 @@
       <div slot="header">
         <el-input v-model="offlineContract" placeholder="离线合同号" size="small" style="width: 140px" clearable/>
         <el-input v-model="supplierName0" placeholder="供应商" size="small" style="width: 140px" clearable/>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询</el-button>
+        <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10000;total2=0;searchTable2()">查询</el-button>
         <el-tooltip :open-delay="1000" effect="dark" content="将勾选的物料库中物料选入到选中的离线合同" placement="top">
-          <el-button type="warning" size="small" style="margin-left: 40px" @click="addMateriel">选入物料</el-button>
+          <el-button type="warning" size="small" plain style="margin-left: 40px" @click="addMateriel">选入物料</el-button>
         </el-tooltip>
 
         <!--<el-button :disabled="disable" type="info" size="mini" style="float:right" @click="saveContract">保存</el-button>-->
@@ -226,13 +227,13 @@
         <el-input v-model="taxRate" style="float:right;width:100px;" placeholder="税率" size="mini"/>
         <h4 style="float:right;width: 40px;margin: 5px">税率:</h4>
         <el-tooltip :open-delay="1000" effect="dark" content="生成合同" placement="top">
-          <el-button :disabled="disable" type="success" size="small" style="float:right;margin-left:10px;margin-right: 10px" @click="doneOfflineContact">生成离线合同</el-button>
+          <el-button :disabled="disable" type="success" size="small" plain style="float:right;margin-left:10px;margin-right: 10px" @click="doneOfflineContact">生成离线合同</el-button>
         </el-tooltip>
-        <el-button type="primary" size="small" style="float:right;margin-left:10px;" @click="addOfflineContract">创建离线合同</el-button>
+        <el-button type="warning" size="small" plain style="float:right;margin-left:10px;" @click="addOfflineContract">创建离线合同</el-button>
         <!--<el-button v-if="quickChangePrice" size="mini" style="float:right; width: 100px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>-->
         <!--<el-button v-else size="mini" style="float:right;" @click="quickChangePrice=!quickChangePrice">还原</el-button>-->
       </div>
-      <el-table v-loading="" :data="tableData2" border style="max-height: 460px;" size="mini" highlight-current-row @row-click="searchTable3">
+      <el-table v-loading="" :data="tableData2" border stripe style="max-height: 460px;" size="mini" highlight-current-row @row-click="searchTable3">
         <el-table-column label="详情" type="expand" fixed="left">
           <template slot-scope="scope">
             <el-form label-position="left" inline class="demo-table-expand">
diff --git a/src/views/PurchasingCenter/OfflineContractSearch/index.vue b/src/views/PurchasingCenter/OfflineContractSearch/index.vue
index 3d08a313..a90feb5d 100644
--- a/src/views/PurchasingCenter/OfflineContractSearch/index.vue
+++ b/src/views/PurchasingCenter/OfflineContractSearch/index.vue
@@ -6,15 +6,17 @@
           <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px;margin: 0px 10px"/>
           <el-input v-model="contractNumber" placeholder="合同编号" size="small" clearable style="width:180px;margin: 0px 10px"/>
           <el-button
-            type="success"
+            type="primary"
             size="small"
             icon="el-icon-search"
+            plain
             style="margin-left:10px"
             @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
           <el-button
             type="danger"
             size="small"
             icon="el-icon-back"
+            plain
             style="margin-left:10px"
             @click="back">打回</el-button>
         </el-row>
@@ -28,6 +30,7 @@
           :data="tableData1"
           size="mini"
           border
+          stripe
           style="width: 100%"
           height="700px"
           highlight-current-row
diff --git a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
index e2cd96d5..2fe6b1f6 100644
--- a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
+++ b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
@@ -27,9 +27,10 @@
         <!--            :value="item.value"/>-->
         <!--        </el-select>-->
         <el-button
-          type="success"
+          type="primary"
           size="small"
           icon="el-icon-search"
+          plain
           style="margin-left:10px"
           @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
       </div>
diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
index 6368a00c..2c4f68d6 100644
--- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
@@ -11,8 +11,8 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <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-goods" style="" @click="requestFund">请款</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-button type="warning" size="small" icon="el-icon-goods" plain style="" @click="requestFund">请款</el-button>
       </div>
       <h3>请款表</h3>
       <el-table v-loading="" :data="tableData1" border size="mini" stripe highlight-current-row @row-click="searchTable02">
@@ -74,7 +74,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope">
-            <el-button :disabled="Number(id)!==Number(scope.row.请款人) || !((Number(scope.row.审核情况流水号) !== 1) || (Number(scope.row.审批情况流水号)===2) || (Number(scope.row.付款情况流水号)===2))" type="text" plain size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)">删除</el-button>
+            <el-button :disabled="Number(id)!==Number(scope.row.请款人) || !((Number(scope.row.审核情况流水号) !== 1) || (Number(scope.row.审批情况流水号)===2) || (Number(scope.row.付款情况流水号)===2))" type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/PurchasingCenter/PurchaseContractReview/index.vue b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
index 82e9f7af..570d2897 100644
--- a/src/views/PurchasingCenter/PurchaseContractReview/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractReview/index.vue
@@ -43,6 +43,7 @@
         :data="tableData1"
         size="mini"
         border
+        stripe
         style="width: 60%; max-height: 500px"
         highlight-current-row
         @row-click="searchTable2">
@@ -104,7 +105,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="100" fixed="right">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" icon="el-icon-edit-outline" @click="Open(scope.row)">审核</el-button>
+            <el-button type="text" size="mini" icon="el-icon-edit-outline" @click="Open(scope.row)">审核</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
index ac561361..834e774c 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -52,9 +52,10 @@
               :value="item.value"/>
           </el-select>
           <el-button
-            type="success"
+            type="primary"
             size="small"
             icon="el-icon-search"
+            plain
             style="margin-left:10px"
             @click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
           <el-tooltip :open-delay="1000" effect="dark" content="打印采购合同" placement="top">
@@ -62,6 +63,7 @@
               type="warning"
               size="small"
               icon="el-icon-download"
+              plain
               @click="download()">导出</el-button>
           </el-tooltip>
         </el-row>
@@ -72,6 +74,7 @@
         :data="tableData1"
         size="mini"
         border
+        stripe
         style="width: 100%"
         height="300px"
         highlight-current-row
@@ -200,7 +203,7 @@
         <!--        </el-table-column>-->
         <el-table-column label="操作" align="center" width="70">
           <template slot-scope="scope">
-            <el-button :disabled="false" type="text" size="mini" icon="el-icon-delete" @click="deleteContract(scope.row)">删除</el-button>
+            <el-button :disabled="false" type="text" size="mini" icon="el-icon-delete" @click="deleteContract(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index 0e8861e8..96ec344c 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -33,9 +33,9 @@
           style="width:250px;margin-left: 5px"
           start-placeholder="开始日期"
           end-placeholder="结束日期"/>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>
+        <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 15px" @click="searchTable()">查询</el-button>
         <el-tooltip :open-delay="1000" effect="dark" content="将全部采购件导出到表格" placement="top">
-          <el-button type="warning" size="small" icon="el-icon-download" style="margin-left: 15px" @click="exportDetail()">导出</el-button>
+          <el-button type="warning" size="small" icon="el-icon-download" plain style="margin-left: 15px" @click="exportDetail()">导出</el-button>
         </el-tooltip>
       </el-row>
     </el-card>
@@ -45,10 +45,14 @@
         <el-table :data="tableData0" size="mini" height="700px" border stripe>
           <el-table-column align="center" prop="询价状态编号" label="采购状态" width="100px">
             <template slot-scope="scope">
-              <el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
-              <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
-              <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
-              <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
+              <!--<el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>-->
+              <!--<el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>-->
+              <!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>-->
+              <!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>-->
+              <span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
+              <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
+              <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</span>
+              <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span>
             </template>
           </el-table-column>
           <el-table-column align="center" label="机床图号" prop="机床图号" width="100px" show-overflow-tooltip>
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index ff1732ee..5e600a2e 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -84,7 +84,7 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">查询</el-button>
+          <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px;" @click="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">查询</el-button>
           <el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">未分配</el-radio>
           <el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">已分配</el-radio>
           <div style="float:right;">
@@ -98,9 +98,10 @@
             </el-select>
             <el-tooltip :open-delay="1000" effect="dark" content="选择采购员后，将物料分配给所选的采购员" placement="top">
               <el-button
-                type="primary"
+                type="warning"
                 size="small"
                 icon="el-icon-menu"
+                plain
                 style="margin-left: 10px"
                 @click="allocateTask1">分配</el-button>
             </el-tooltip>
@@ -109,6 +110,7 @@
                 type="danger"
                 size="small"
                 icon="el-icon-back"
+                plain
                 style="margin-left: 10px"
                 @click="executeReturn1">退回</el-button>
             </el-tooltip>
@@ -119,10 +121,10 @@
             <el-table-column :selectable="selectable" align="center" type="selection"/>
             <el-table-column align="center" label="采购情况" prop="询价状态编号" min-width="100px">
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.人员编号===''" type="primary" size="small">未分配</el-tag>
-                <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
-                <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
-                <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
+                <span v-if="scope.row.人员编号===''" type="primary" size="small">未分配</span>
+                <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
+                <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</span>
+                <span v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="物料名称" label="名称" min-width="180px">
@@ -210,6 +212,7 @@
                 <el-tooltip :open-delay="1200" effect="dark" content="撤回已分配的采购任务" placement="top">
                   <el-button
                     :disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
+                    type="danger"
                     plain
                     size="mini"
                     icon="el-icon-back"
diff --git a/src/views/PurchasingCenter/ReceiveCheck/index.vue b/src/views/PurchasingCenter/ReceiveCheck/index.vue
index d32345c2..74a31777 100644
--- a/src/views/PurchasingCenter/ReceiveCheck/index.vue
+++ b/src/views/PurchasingCenter/ReceiveCheck/index.vue
@@ -36,7 +36,7 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="searchProject()">查询</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="searchProject()">查询</el-button>
       </div>
       <el-table
         :data="tableData1"
diff --git a/src/views/PurchasingCenter/SupplierManagement/index.vue b/src/views/PurchasingCenter/SupplierManagement/index.vue
index b70f5f5f..932dece6 100644
--- a/src/views/PurchasingCenter/SupplierManagement/index.vue
+++ b/src/views/PurchasingCenter/SupplierManagement/index.vue
@@ -64,8 +64,8 @@
           <!--            </el-form-item>-->
           <!--          </el-col>-->
           <el-col style="width: 250px;margin:2px 0 0 15px">
-            <el-button type="success" size="small" icon="el-icon-search" @click="pageCurrent = 1;fetchData()">查询</el-button>
-            <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd()">新增供应商</el-button>
+            <el-button type="primary" size="small" icon="el-icon-search" plain @click="pageCurrent = 1;fetchData()">查询</el-button>
+            <el-button type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px" @click="handleAdd()">新增供应商</el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -136,8 +136,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" fixed="right" width="190">
           <template slot-scope="scope">
-            <el-button type="warning" size="mini" plain icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button type="danger" size="mini" plain icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+            <el-button type="text" size="mini" plain icon="el-icon-edit" @click="handleEdit(scope.row)"/>
+            <el-button type="text" size="mini" plain icon="el-icon-delete" @click="handleDelete(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>
@@ -154,7 +154,7 @@
     </el-card>
     <el-card>
       <div style="display: inline-block;margin-bottom: 20px;width:90%">供应商联系人列表</div>
-      <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-bottom:10px;float:right" @click="handleAdd2()">新增联系人</el-button>
+      <el-button type="warning" size="small" icon="el-icon-circle-plus-outline" plain style="margin-bottom:10px;float:right" @click="handleAdd2()">新增联系人</el-button>
       <el-table :data="List1" border stripe size="mini">
         <el-table-column label="姓名" align="center">
           <template slot-scope="scope">
diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
index 3504765a..708412eb 100644
--- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue
+++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
@@ -81,13 +81,8 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-<<<<<<< HEAD
-      <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-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable()">查询</el-button>
       <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">创建采购计划单</el-button>
->>>>>>> 6d4033c92a46c968832636b84ef2c64c7b192fe4
       <!--<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>-->
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
index 63e707fc..a34a21bd 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
@@ -20,10 +20,6 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-<<<<<<< HEAD
-        <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>
-=======
         <span>备料时间段:</span>
         <el-date-picker
           v-model="dateRange"
@@ -39,7 +35,6 @@
           end-placeholder="结束日期"/>
         <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>
->>>>>>> 6d4033c92a46c968832636b84ef2c64c7b192fe4
       </div>
     </el-card>
     <el-card style="width: 76%">