diff --git a/src/api/Inventory/MaterialOut.js b/src/api/Inventory/MaterialOut.js
index 797881b9..81fd68f8 100644
--- a/src/api/Inventory/MaterialOut.js
+++ b/src/api/Inventory/MaterialOut.js
@@ -35,14 +35,14 @@ export function searchgroup(num) {
   })
 }
 // 领料单查询
-export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) {
+export function searchList(pageCurrent, pageSize, listPeople_check, listPeople, check1, time1, time2) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间装配管理_领料单_查询数据',
-      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber + '&是否审批=1',
+      param: '制单人_check=' + listPeople_check + '&制单人=' + listPeople + '&时间段_check=' + check1 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&是否审批=1',
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/api/ManufacturingCenter/SparePartsForScrap.js b/src/api/ManufacturingCenter/SparePartsForScrap.js
index 693bac5d..81245431 100644
--- a/src/api/ManufacturingCenter/SparePartsForScrap.js
+++ b/src/api/ManufacturingCenter/SparePartsForScrap.js
@@ -54,14 +54,14 @@ export function editTime(CutCode, StartTime, FinishTime) {
     }
   })
 }
-export function editStop(CutCode, temp) {
+export function editSpare(CutCode, number, reason, time) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
-      name: '车间生产管理工艺_零件工艺计划_修改停产',
-      param: '工艺计划流水号=' + CutCode + '=string&批次零件状态=' + temp + '=string'
+      name: '车间生产管理工艺_零件工艺计划_报废零件_增加数据',
+      param: '工艺计划流水号=' + CutCode + '&报废数量=' + number + '&报废原因=' + reason + '&报废时间=' + time
     }
   })
 }
@@ -77,14 +77,14 @@ export function TableDta2Select(CutCode, currentPage2, pageSize2) {
     }
   })
 }
-export function editA(CutCodebefore, Number, startCut) {
+export function editA(CutCodebefore, Number) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
-      name: '车间生产管理工艺_零件工艺计划_增加数据_补投',
-      param: '工艺计划流水号_补投前=' + CutCodebefore + '=string&批次数量=' + Number + '=string&开始工序=' + startCut + '=string'
+      name: '车间生产管理工艺_零件工艺计划_报废零件_补投',
+      param: '工艺计划流水号=' + CutCodebefore + '&补投数量=' + Number
     }
   })
 }
diff --git a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
index 26bacdb0..1e02d379 100644
--- a/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
+++ b/src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
@@ -1,87 +1,53 @@
 import request from '@/utils/request'
+import state from '@/store'
 
-// 初始化 外协厂商
-export function initOutHelp() {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '车间生产管理工艺_基础表_外协厂家_查询数据'
-    }
-  })
-}
 // 查询表格数据
-export function searchtable(num2, ManufacturerName, num10, ManufacturerAbbreviation, num3, address, num4, roleName, phNumber, Fax, pageCurrent, pageSize) {
+export function searchtable(check1, ManufacturerAbbreviation, check2, starttime, endTime, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
+      UserID: state.state.user.id,
       type: '1',
-      name: '车间生产管理_外协加工任务单_查询数据_付款计划',
-      param: '外协加工任务单_check=0&外协加工任务单流水号=0&表单号_check=' + num2 + '&表单号=' + ManufacturerName + '&外协厂家_check=' + num10 + '&外协厂家=' + ManufacturerAbbreviation + '&任务下达日期时间_check=' + num3 + '&开始时间=' + address + '&结束时间=' + num4 + '&实际付款时间段_check=' + roleName + '&实际付款开始时间=' + phNumber + '&实际付款结束时间=' + Fax + '&外协计划员编号_check=0&外协计划员编号=0',
+      name: '车间生产管理工艺_外协付款_查询',
+      param: '外协厂家_check=' + check1 + '&外协厂家=' + ManufacturerAbbreviation + '&时间_check=' + check2 + '&开始时间=' + starttime + '&结束时间=' + endTime,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
-// 修改实际付款日期
-export function payTime(num, time) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理_外协加工任务单_修改数据_实际付款时间',
-      param: '外协加工任务单流水号=' + num + '&实际付款时间=' + time
-    }
-  })
-}
-// 修改扣款数据、扣款说明
-export function WithdrawingEdit(num, quality, Explain) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理_外协扣款_编辑数据',
-      param: '外协加工任务单流水号=' + num + '&扣款_质量=' + quality + '&扣款说明=' + Explain
-    }
-  })
-}
-// 单据状态： 1 未成交 2 成交 3 作废
-export function payment(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '2',
-      name: '车间生产管理_外协加工任务单_修改数据_作废',
-      param: '外协加工任务单流水号=' + num + '&单据状态=3'
-    }
-  })
-}
-// 查询零件信息
-export function getParts(check, Number, pageCurrent, pageSize) {
+export function getInvoice(Number, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间生产管理工艺_外协发票管理_查询数据',
-      param: '外协厂家流水号_check=' + check + '&外协厂家流水号=' + Number + '=int',
+      param: '外协厂家流水号_check=1&外协厂家流水号=' + Number,
+      Pagination: pageCurrent + '&' + pageSize
+    }
+  })
+}
+export function getPayment(Number, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_外协付款记录_查询数据',
+      param: '外协厂家流水号=' + Number,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
 // 增加
-export function edittype(num1, num2, num3, num4, num5, num6, num7, num8) {
+export function AddType1(num1, num2, num3, num4) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '2',
-      name: '车间生产管理工艺_外协发票管理_增加数据',
-      param: '外协厂家流水号=' + num1 + '&发票号=' + num2 + '&开户行=' + num3 + '&开票时间=' + num4 + '&开票金额=' + num5 + '&接收人=' + num6 + '&接收时间=' + num7 + '&备注=' + num8
+      name: '车间生产管理工艺_外协付款_新增发票',
+      param: '外协厂家流水号=' + num1 + '&发票号=' + num2 + '&开票时间=' + num3 + '&开票金额=' + num4
     }
   })
 }
diff --git a/src/api/Outsourcing/OutsourcingTaskExecution.js b/src/api/Outsourcing/OutsourcingTaskExecution.js
index c267573e..39b5918c 100644
--- a/src/api/Outsourcing/OutsourcingTaskExecution.js
+++ b/src/api/Outsourcing/OutsourcingTaskExecution.js
@@ -12,14 +12,14 @@ export function initOutHelp() {
   })
 }
 // 初始化获取已生成的外协加工任务单
-export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize, documentStatus, num3) {
+export function getTable(checked, contractNumber, checked1, manufacturers, checked2, time1, time2, num, pageCurrent, pageSize, documentStatus, num3, check) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理_外协加工任务单_查询数据',
-      param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=' + num3 + '&单据状态=' + documentStatus + '&外协员编号_check=0&外协员编号=' + num,
+      name: '车间生产管理_外协加工任务单_查询数据_2020',
+      param: '外协加工任务单_check=0&外协加工任务单流水号=null&表单号_check=' + checked + '&表单号=' + contractNumber + '&外协厂家_check=' + checked1 + '&外协厂家=' + manufacturers + '&任务下达日期_时间段=' + checked2 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&单据状态_check=' + num3 + '&单据状态=' + documentStatus + '&外协员编号_check=0&外协员编号=' + num + '&查询历史_check=' + check,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/api/WorkshopProcurement/ProcurementContractEnquiry.js b/src/api/WorkshopProcurement/ProcurementContractEnquiry.js
index fe13ab38..b4bda0fd 100644
--- a/src/api/WorkshopProcurement/ProcurementContractEnquiry.js
+++ b/src/api/WorkshopProcurement/ProcurementContractEnquiry.js
@@ -24,14 +24,14 @@ export function initBuyer() {
   })
 }
 // 采购合同查询
-export function searchTable1(pageCurrent, pageSize, check1, start, end, check2, contract, check3, name, check4, supplier, check5, approval) {
+export function searchTable1(pageCurrent, pageSize, check1, start, end, check2, contract, check4, supplier, check5, approval) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '采购管理_合同_查询数据',
-      param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier + '&审批情况流水号_check=' + check5 + '&审批情况流水号=' + approval,
+      param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier + '&审批情况流水号_check=' + check5 + '&审批情况流水号=' + approval,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
diff --git a/src/assets/img/设备监控.psd b/src/assets/img/设备监控.psd
new file mode 100644
index 00000000..4b0d797b
Binary files /dev/null and b/src/assets/img/设备监控.psd differ
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/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue
index e39c5c70..f02d95fc 100644
--- a/src/views/Assembly/AssemblyExecution/index.vue
+++ b/src/views/Assembly/AssemblyExecution/index.vue
@@ -26,7 +26,7 @@
     </el-card>
     <el-card>
       <h3 style="text-align: center">总装调试</h3>
-      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
+      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
         <el-table-column label="项目名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -69,23 +69,23 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="430px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.装配状态===null || scope.row.装配状态===0" type="success" plain size="small" @click="handlestart_1(scope.row)">开始装配</el-button>
-            <el-button v-if="scope.row.装配状态===1" type="danger" plain size="small" @click="handleend_1(scope.row)">结束装配</el-button>
-            <el-button v-if="scope.row.装配状态===2" type="info" plain size="small" >装配完成</el-button>
-            <el-button v-if="scope.row.装配状态===1" plain size="small" @click="handleCancelStart_1(scope.row)">取消开始装配</el-button>
-            <el-button v-if="scope.row.装配状态===2" plain size="small" @click="handleCancelEnd_1(scope.row)">取消结束装配</el-button>
-            <el-button v-if="scope.row.调试状态===null || scope.row.调试状态===0" type="success" plain size="small" @click="handlestart_2(scope.row)">开始调试</el-button>
-            <el-button v-if="scope.row.调试状态===1" type="danger" plain size="small" @click="handleend_2(scope.row)">结束调试</el-button>
-            <el-button v-if="scope.row.调试状态===2" type="info plain" size="small" >调试完成</el-button>
-            <el-button v-if="scope.row.调试状态===1" plain size="small" @click="handleCancelStart_2(scope.row)">取消开始调试</el-button>
-            <el-button v-if="scope.row.调试状态===2" plain size="small" @click="handleCancelEnd_2(scope.row)">取消结束调试</el-button>
+            <el-button v-if="scope.row.装配状态===null || scope.row.装配状态===0" type="text" size="small" @click="handlestart_1(scope.row)">开始装配</el-button>
+            <el-button v-if="scope.row.装配状态===1" type="text" size="small" @click="handleend_1(scope.row)">结束装配</el-button>
+            <el-button v-if="scope.row.装配状态===2" type="text" size="small" >装配完成</el-button>
+            <el-button v-if="scope.row.装配状态===1" size="small" type="text" @click="handleCancelStart_1(scope.row)">取消开始装配</el-button>
+            <el-button v-if="scope.row.装配状态===2" size="small" type="text" @click="handleCancelEnd_1(scope.row)">取消结束装配</el-button>
+            <el-button v-if="scope.row.调试状态===null || scope.row.调试状态===0" type="text" size="small" @click="handlestart_2(scope.row)">开始调试</el-button>
+            <el-button v-if="scope.row.调试状态===1" type="text" size="small" @click="handleend_2(scope.row)">结束调试</el-button>
+            <el-button v-if="scope.row.调试状态===2" type="text" size="small" >调试完成</el-button>
+            <el-button v-if="scope.row.调试状态===1" size="small" type="text" @click="handleCancelStart_2(scope.row)">取消开始调试</el-button>
+            <el-button v-if="scope.row.调试状态===2" size="small" type="text" @click="handleCancelEnd_2(scope.row)">取消结束调试</el-button>
           </template>
         </el-table-column>
       </el-table>
     </el-card>
     <el-card>
       <h3 style="text-align: center">部装</h3>
-      <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
+      <el-table :data="tableData2" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
         <el-table-column label="组号" align="center">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
@@ -132,15 +132,15 @@
         <el-table-column label="操作" align="center" width="300px" fixed="right">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1200" effect="dark" content="编辑部装工时" placement="top">
-              <el-button v-if="!scope.row.isEditing" type="primary" plain size="small" @click="editTable2(scope.row)">编辑</el-button>
+              <el-button v-if="!scope.row.isEditing" type="text" icon="el-icon-edit-outline" size="small" @click="editTable2(scope.row)"/>
             </el-tooltip>
-            <el-button v-if="scope.row.isEditing" type="primary" plain size="small" @click="submitTable2(scope.row)">确定</el-button>
-            <el-button v-if="scope.row.isEditing" size="small" plain @click="cancelTable2(scope.row)">取消</el-button>
-            <el-button v-if="scope.row.buttonStatus === 1" type="success" plain size="small" @click="handlestart_3(scope.row)">开始装配部件</el-button>
-            <el-button v-if="scope.row.buttonStatus === 2" type="danger" plain size="small" @click="handleend_3(scope.row)">结束装配</el-button>
-            <el-button v-if="scope.row.buttonStatus === 3" type="info" plain size="small" >装配完成</el-button>
-            <el-button v-if="scope.row.buttonStatus === 2" plain size="small" @click="handleCancelStart_3(scope.row)">取消开始装配</el-button>
-            <el-button v-if="scope.row.buttonStatus === 3" plain size="small" @click="handleCancelEnd_3(scope.row)">取消结束装配</el-button>
+            <el-button v-if="scope.row.isEditing" type="text" size="small" @click="submitTable2(scope.row)">确定</el-button>
+            <el-button v-if="scope.row.isEditing" size="small" type="text" @click="cancelTable2(scope.row)">取消</el-button>
+            <el-button v-if="scope.row.buttonStatus === 1" type="text" size="small" @click="handlestart_3(scope.row)">开始装配部件</el-button>
+            <el-button v-if="scope.row.buttonStatus === 2" type="text" size="small" @click="handleend_3(scope.row)">结束装配</el-button>
+            <el-button v-if="scope.row.buttonStatus === 3" type="text" size="small" >装配完成</el-button>
+            <el-button v-if="scope.row.buttonStatus === 2" type="text" size="small" @click="handleCancelStart_3(scope.row)">取消开始装配</el-button>
+            <el-button v-if="scope.row.buttonStatus === 3" type="text" size="small" @click="handleCancelEnd_3(scope.row)">取消结束装配</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue
index 50c4c7f8..f0e65ed5 100644
--- a/src/views/Assembly/AssemblyQualityInspection/index.vue
+++ b/src/views/Assembly/AssemblyQualityInspection/index.vue
@@ -12,30 +12,30 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin:0px 10px" size="small" clearable>
+        <el-select v-model="groupNumberValue" filterable placeholder="组号" style="margin:0px 10px;width: 100px" size="small" clearable>
           <el-option
             v-for="item in groupNumber"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-select v-model="TestValue" filterable placeholder="组号" style="margin:0px 10px" size="small" clearable>
+        <el-select v-model="TestValue" filterable placeholder="组件名称" style="margin:0px 10px;width: 150px;" size="small" clearable>
           <el-option
             v-for="item in Test"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" style="margin:0px 10px" size="small" clearable>
+        <el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" style="margin:0px 10px;width: 100px;" size="small" clearable>
           <el-option
             v-for="item in qualityInspection"
             :key="item.value"
             :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>
@@ -63,7 +63,7 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="部件名称" prop="组件名称" align="center" width="100px">
+        <el-table-column label="部件名称" prop="组件名称" align="center" width="150px">
           <template slot-scope="scope">
             {{ scope.row.组件名称 }}
           </template>
@@ -78,6 +78,16 @@
             {{ scope.row.检测项明细 }}
           </template>
         </el-table-column>
+        <el-table-column label="质检时间" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.质检时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="质检员" align="center" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
             {{ scope.row.备注 }}
@@ -109,7 +119,7 @@ export default {
       groupNumber: [],
       TestValue: '',
       Test: [],
-      qualityInspectionValue: '',
+      qualityInspectionValue: 2,
       qualityInspection: [
         {
           value: 1,
@@ -167,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/ColdWorkPlanExecution/index.vue b/src/views/Assembly/ColdWorkPlanExecution/index.vue
index 8d65c76c..aa6cc977 100644
--- a/src/views/Assembly/ColdWorkPlanExecution/index.vue
+++ b/src/views/Assembly/ColdWorkPlanExecution/index.vue
@@ -14,7 +14,7 @@
           </el-option>
         </el-select>
       </div>
-      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
+      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
         <el-table-column label="项目名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -39,7 +39,7 @@
     </el-card>
     <el-card>
       <h3 style="margin: 0;text-align: center;">工作计划</h3>
-      <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
+      <el-table :data="tableData2" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
         <el-table-column label="组号" align="center">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
@@ -85,14 +85,18 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="300px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="!scope.row.isEditing" type="primary" size="small" @click="editTable2(scope.row)">编辑</el-button>
-            <el-button v-if="scope.row.isEditing" type="primary" size="small" @click="submitTable2(scope.row)">确定</el-button>
-            <el-button v-if="scope.row.isEditing" size="small" @click="cancelTable2(scope.row)">取消</el-button>
-            <el-button v-if="scope.row.buttonStatus === 1" type="success" size="small" @click="handlestart_3(scope.row)">开始工作</el-button>
-            <el-button v-if="scope.row.buttonStatus === 2" type="danger" size="small" @click="handleend_3(scope.row)">结束工作</el-button>
-            <el-button v-if="scope.row.buttonStatus === 3" type="info" size="small" >工作完成</el-button>
-            <el-button v-if="scope.row.buttonStatus === 2" plain size="small" @click="handleCancelStart_3(scope.row)">取消开始工作</el-button>
-            <el-button v-if="scope.row.buttonStatus === 3" plain size="small" @click="handleCancelEnd_3(scope.row)">取消结束工作</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
+              <div style="display: inline-block">
+                <el-button v-if="!scope.row.isEditing" type="text" size="small" @click="editTable2(scope.row)"/>
+                <el-button v-if="scope.row.isEditing" type="primary" size="small" @click="submitTable2(scope.row)">确定</el-button>
+                <el-button v-if="scope.row.isEditing" size="small" @click="cancelTable2(scope.row)">取消</el-button>
+              </div>
+            </el-tooltip>
+            <el-button v-if="scope.row.buttonStatus === 1" type="text" size="small" @click="handlestart_3(scope.row)">开始工作</el-button>
+            <el-button v-if="scope.row.buttonStatus === 2" type="text" size="small" @click="handleend_3(scope.row)">结束工作</el-button>
+            <el-button v-if="scope.row.buttonStatus === 3" type="text" size="small" >工作完成</el-button>
+            <el-button v-if="scope.row.buttonStatus === 2" type="text" size="small" @click="handleCancelStart_3(scope.row)">取消开始工作</el-button>
+            <el-button v-if="scope.row.buttonStatus === 3" type="text" size="small" @click="handleCancelEnd_3(scope.row)">取消结束工作</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/Assembly/DeliveryConfirmation/index.vue b/src/views/Assembly/DeliveryConfirmation/index.vue
index 760ba1bd..dbcc5c3b 100644
--- a/src/views/Assembly/DeliveryConfirmation/index.vue
+++ b/src/views/Assembly/DeliveryConfirmation/index.vue
@@ -132,8 +132,8 @@
             size="small"
             type="datetime"
             placeholder="结束日期"/>
-          <el-button type="success" icon="el-icon-menu" size="mini" style="margin-left: 74px" @click="search">查询</el-button>
-          <el-button type="warning" icon="el-icon-delete" size="mini" @click="clearSearch">清空</el-button>
+          <el-button type="primary" plain icon="el-icon-search" size="mini" style="margin-left: 74px" @click="search">查询</el-button>
+          <el-button class="button111" icon="el-icon-delete" size="mini" @click="clearSearch">清空</el-button>
         </el-row>
       </div>
       <el-divider/>
@@ -144,12 +144,13 @@
           style="width: 100%"
           height="500"
           border
+          stripe
           size="mini"
           @row-click="openDialogFormVisible">
           <el-table-column align="center" label="状态" min-width="80">
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.是否发出.toString() === '1'" type="success" size="small">已发出</el-tag>
-              <el-tag v-else type="danger" size="small">未发出</el-tag>
+              <span v-if="scope.row.是否发出.toString() === '1'" type="success" size="small">已发出</span>
+              <span v-else type="danger" size="small">未发出</span>
               <!--{{ scope.row.是否发出.toString() === '1' ? '已发出' : '未发出' }}-->
             </template>
           </el-table-column>
@@ -168,7 +169,7 @@
               {{ scope.row.收货单位 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="收货地址" min-width="250">
+          <el-table-column align="center" label="收货地址" min-width="250" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.收货地址 }}
             </template>
@@ -183,7 +184,7 @@
               {{ scope.row.联系电话 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="车辆牌号" min-width="110">
+          <el-table-column align="center" label="车辆牌号" min-width="110" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.车辆牌号 }}
             </template>
@@ -198,12 +199,12 @@
               {{ scope.row.司机电话 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="制单人" min-width="80">
+          <el-table-column align="center" label="制单人" min-width="80" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.制单人 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="审核人" min-width="80">
+          <el-table-column align="center" label="审核人" min-width="80" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.审核人 }}
             </template>
diff --git a/src/views/Assembly/MakeAssemblyPlan/index.vue b/src/views/Assembly/MakeAssemblyPlan/index.vue
index 9a581314..b2961110 100644
--- a/src/views/Assembly/MakeAssemblyPlan/index.vue
+++ b/src/views/Assembly/MakeAssemblyPlan/index.vue
@@ -13,8 +13,8 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <el-button size="small" icon="el-icon-circle-plus" type="primary" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
-        <el-button type="danger" plain size="small" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
+        <el-button size="small" icon="el-icon-circle-plus-outline" class="button111" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
+        <el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -34,7 +34,7 @@
       </div>
     </el-card>
     <el-card style="width: 40%; float: left">
-      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
+      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
         <el-table-column label="项目名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -45,7 +45,7 @@
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" align="center">
+        <el-table-column label="机床名称" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.机床名称 }}
           </template>
@@ -97,9 +97,13 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
-            <el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-            <el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
+              <div style="display: inline-block">
+                <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
+                <el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
+                <el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -284,3 +288,21 @@ export default {
 <style scoped>
 
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/Assembly/MakeColdWorkPlan/index.vue b/src/views/Assembly/MakeColdWorkPlan/index.vue
index 100f78cb..3caf25c4 100644
--- a/src/views/Assembly/MakeColdWorkPlan/index.vue
+++ b/src/views/Assembly/MakeColdWorkPlan/index.vue
@@ -13,8 +13,8 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <el-button size="small" icon="el-icon-circle-plus" type="primary" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
-        <el-button type="danger" plain size="small" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
+        <el-button size="small" icon="el-icon-circle-plus-outline" class="button111" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
+        <el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -34,7 +34,7 @@
       </div>
     </el-card>
     <el-card style="width: 40%; float: left">
-      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
+      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
         <el-table-column label="项目名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -97,9 +97,13 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
-            <el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-            <el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
+              <div style="display: inline-block">
+                <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
+                <el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
+                <el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/Assembly/MakeElectricalAssembly/index.vue b/src/views/Assembly/MakeElectricalAssembly/index.vue
index 24ac4fe2..41da2ca9 100644
--- a/src/views/Assembly/MakeElectricalAssembly/index.vue
+++ b/src/views/Assembly/MakeElectricalAssembly/index.vue
@@ -13,8 +13,8 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <el-button size="small" icon="el-icon-circle-plus" type="primary" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
-        <el-button type="danger" plain size="small" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
+        <el-button size="small" icon="el-icon-circle-plus-outline" class="button111" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
+        <el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -34,7 +34,7 @@
       </div>
     </el-card>
     <el-card style="width: 40%; float: left">
-      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
+      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
         <el-table-column label="项目名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -97,9 +97,13 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
-            <el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-            <el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
+              <div style="display: inline-block">
+                <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
+                <el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
+                <el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/Assembly/MakePaintPlan/index.vue b/src/views/Assembly/MakePaintPlan/index.vue
index 1c0bd113..6e37b7cc 100644
--- a/src/views/Assembly/MakePaintPlan/index.vue
+++ b/src/views/Assembly/MakePaintPlan/index.vue
@@ -13,8 +13,8 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <el-button size="small" icon="el-icon-circle-plus" type="primary" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
-        <el-button type="danger" plain size="small" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
+        <el-button size="small" icon="el-icon-circle-plus-outline" class="button111" style="margin-left: 25%" @click="addTable()">增加装配计划</el-button>
+        <el-button type="danger" plain size="small" icon="el-icon-delete" style="float: right;margin-right: 20px" @click="deleteData()">删除</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -34,7 +34,7 @@
       </div>
     </el-card>
     <el-card style="width: 40%; float: left">
-      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
+      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px" @row-click="searchTable2">
         <el-table-column label="项目名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -45,7 +45,7 @@
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" align="center">
+        <el-table-column label="机床名称" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.机床名称 }}
           </template>
@@ -97,9 +97,13 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="250px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
-            <el-button v-else type="primary" size="small" plain @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-            <el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
+              <div style="display: inline-block">
+                <el-button v-if="scope.row.edit" type="success" plain size="small" @click="confirmEdit(scope.row)">确定</el-button>
+                <el-button v-else type="text" size="small" icon="el-icon-edit-outline" @click="scope.row.edit=!scope.row.edit"/>
+                <el-button v-if="scope.row.edit" type="warning" plain size="small" @click="cancel(scope.row)">取消</el-button>
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/Assembly/PaintPlanExecution/index.vue b/src/views/Assembly/PaintPlanExecution/index.vue
index 3472b71c..5466eb08 100644
--- a/src/views/Assembly/PaintPlanExecution/index.vue
+++ b/src/views/Assembly/PaintPlanExecution/index.vue
@@ -14,7 +14,7 @@
           </el-option>
         </el-select>
       </div>
-      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
+      <el-table :data="tableData1" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
         <el-table-column label="项目名称" align="center">
           <template slot-scope="scope">
             {{ scope.row.项目名称 }}
@@ -39,7 +39,7 @@
     </el-card>
     <el-card>
       <h3 style="margin: 0;text-align: center;">工作计划</h3>
-      <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
+      <el-table :data="tableData2" border stripe size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
         <el-table-column label="组号" align="center">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
@@ -85,14 +85,18 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="300px" fixed="right">
           <template slot-scope="scope">
-            <el-button v-if="!scope.row.isEditing" type="primary" size="small" @click="editTable2(scope.row)">编辑</el-button>
-            <el-button v-if="scope.row.isEditing" type="primary" size="small" @click="submitTable2(scope.row)">确定</el-button>
-            <el-button v-if="scope.row.isEditing" size="small" @click="cancelTable2(scope.row)">取消</el-button>
-            <el-button v-if="scope.row.buttonStatus === 1" type="success" size="small" @click="handlestart_3(scope.row)">开始工作</el-button>
-            <el-button v-if="scope.row.buttonStatus === 2" type="danger" size="small" @click="handleend_3(scope.row)">结束工作</el-button>
-            <el-button v-if="scope.row.buttonStatus === 3" type="info" size="small" >工作完成</el-button>
-            <el-button v-if="scope.row.buttonStatus === 2" plain size="small" @click="handleCancelStart_3(scope.row)">取消开始工作</el-button>
-            <el-button v-if="scope.row.buttonStatus === 3" plain size="small" @click="handleCancelEnd_3(scope.row)">取消结束工作</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
+              <div style="display: inline-block">
+                <el-button v-if="!scope.row.isEditing" type="text" size="small" @click="editTable2(scope.row)"/>
+                <el-button v-if="scope.row.isEditing" type="primary" size="small" @click="submitTable2(scope.row)">确定</el-button>
+                <el-button v-if="scope.row.isEditing" size="small" @click="cancelTable2(scope.row)">取消</el-button>
+              </div>
+            </el-tooltip>
+            <el-button v-if="scope.row.buttonStatus === 1" type="text" size="small" @click="handlestart_3(scope.row)">开始工作</el-button>
+            <el-button v-if="scope.row.buttonStatus === 2" type="text" size="small" @click="handleend_3(scope.row)">结束工作</el-button>
+            <el-button v-if="scope.row.buttonStatus === 3" type="text" size="small" >工作完成</el-button>
+            <el-button v-if="scope.row.buttonStatus === 2" type="text" size="small" @click="handleCancelStart_3(scope.row)">取消开始工作</el-button>
+            <el-button v-if="scope.row.buttonStatus === 3" type="text" size="small" @click="handleCancelEnd_3(scope.row)">取消结束工作</el-button>
           </template>
         </el-table-column>
       </el-table>
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 382e5867..bae344a4 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -19,7 +19,7 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 200px;margin-left: 10px" size="small" clearable/>
+        <el-input v-model="SpareParts" filterable placeholder="请输入零件名称" style="width: 150px;margin-left: 10px" size="small" clearable/>
         <el-select v-model="QualityTypeValue" filterable placeholder="质检类型" style="margin-left: 10px;width:150px" size="small" clearable>
           <el-option
             v-for="item in QualityTypeNumber"
@@ -27,8 +27,6 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-      </el-row>
-      <el-row style="margin-top: 10px">
         <!--<span class="demonstration">时间区间:</span>-->
         <el-date-picker
           v-model="startTime"
@@ -46,7 +44,7 @@
           type="date"
           placeholder="选择结束日期"/>
         <!--<span>质检情况:</span>-->
-        <el-select v-model="qualityInspectionValue" filterable placeholder="选择质检情况" size="small" style="width: 100px;margin-left: 50px" clearable>
+        <el-select v-model="qualityInspectionValue" filterable placeholder="选择质检情况" size="small" style="width: 100px;margin-left: 10px" clearable>
           <el-option
             v-for="item in qualityInspection"
             :key="item.value"
@@ -61,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>
@@ -75,7 +73,7 @@
             <el-tag v-if="parseInt(scope.row.是否禁用)===1" type="error" size="small">已禁用</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="机床图号" align="center">
+        <el-table-column label="机床图号" align="center" width="110px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
@@ -90,7 +88,7 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件型号" align="center" min-width="120px">
+        <el-table-column label="零件图号" align="center" min-width="130px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
@@ -100,12 +98,12 @@
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件数量" align="center">
+        <el-table-column label="加工数" align="center">
           <template slot-scope="scope">
             {{ scope.row.零件数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格或材料" align="center" width="100px">
+        <el-table-column label="规格或材料" align="center" width="120px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.规格或材料 }}
           </template>
@@ -115,22 +113,22 @@
             {{ 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">-->
+        <!--          <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">
+        <el-table-column label="质检数量" align="center">
           <template slot-scope="scope">
             {{ scope.row.数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="不合格数量" align="center" width="90px">
+        <el-table-column label="不合格数" align="center" width="90px">
           <template slot-scope="scope">
             {{ scope.row.不合格数量 }}
           </template>
@@ -155,7 +153,7 @@
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="形位" fixed="right" align="center" width="100">
+        <el-table-column label="形位" fixed="right" align="center" width="70">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
               <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
@@ -176,11 +174,11 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(1, scope.row.质检流水号)">形位</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(1, scope.row.质检流水号)">形位</el-button>
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="尺寸" fixed="right" align="center" width="100">
+        <el-table-column label="尺寸" fixed="right" align="center" width="70">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
               <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
@@ -201,11 +199,11 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(2, scope.row.质检流水号)">尺寸</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(2, scope.row.质检流水号)">尺寸</el-button>
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="外观" fixed="right" align="center" width="100">
+        <el-table-column label="外观" fixed="right" align="center" width="70">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
               <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
@@ -226,15 +224,15 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(3, scope.row.质检流水号)">外观</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(3, scope.row.质检流水号)">外观</el-button>
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" min-width="120">
+        <el-table-column label="操作" fixed="right" align="center" min-width="90">
           <template slot-scope="scope">
             <el-button
               size="mini"
-              type="primary"
+              type="text"
               plain
               icon="el-icon-search"
               @click="viewPicture(scope.row)">查看图片</el-button>
@@ -256,7 +254,7 @@
     <el-card>
       <span style="margin-left: 45%;font-size: 20px;">正在加工零件列表</span>
       <el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%" stripe height="475px">
-        <el-table-column label="机床图号" prop="机床图号" align="center">
+        <el-table-column label="机床图号" prop="机床图号" align="center" width="110px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
@@ -471,7 +469,7 @@ export default {
       gridData: [],
       QualityTypeNumber: [],
       QualityTypeValue: '',
-      qualityInspectionValue: '',
+      qualityInspectionValue: 1,
       qualityInspection: [
         {
           value: 1,
@@ -581,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/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue
index 2f7b7a27..4385f57b 100644
--- a/src/views/Assembly/SparePartsOutStockRecord/index.vue
+++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue
@@ -40,7 +40,7 @@
           type="date"
           placeholder="选择日期"/>
         <el-tooltip :open-delay="1200" effect="dark" content="查询备料出库记录" placement="top">
-          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="total=0;pageSize=40; pageCurrent=1;selecttable()">查询</el-button>
+          <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 15px" @click="total=0;pageSize=40; pageCurrent=1;selecttable()">查询</el-button>
         </el-tooltip>
       </el-row>
     </el-card>
diff --git a/src/views/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..e4be7325 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>
@@ -525,17 +525,22 @@ export default {
       this.temp = 5
     },
     submitTechnologicalRequirements() {
-      addTechnologicalRequirements(this.ProcessNum, this.form3.TechnologicalRequirements).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('增加成功')
-          this.loading3 = true
-          searchTechnologicalRequirementsOfProcessNum(this.ProcessNum).then(response => {
-            this.loading3 = false
-            this.tableData3 = response.data
-          })
-          this.dialogFormVisible5 = false
-        } else { this.$message.error('增加失败') }
-      })
+      if (this.form3.TechnologicalRequirements !== '') {
+        addTechnologicalRequirements(this.ProcessNum, this.form3.TechnologicalRequirements).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('增加成功')
+            this.loading3 = true
+            searchTechnologicalRequirementsOfProcessNum(this.ProcessNum).then(response => {
+              this.loading3 = false
+              this.tableData3 = response.data
+            })
+            this.dialogFormVisible5 = false
+          } else { this.$message.error('增加失败') }
+        })
+      } else {
+        this.$message.error('请输入工艺要求')
+        this.dialogFormVisible5 = false
+      }
     },
     editTechnologicalRequirements(row) {
       this.temp = 6
@@ -606,3 +611,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/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue
index 6c60e90a..76601d4a 100644
--- a/src/views/Inventory/CreatePickingList/index.vue
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card style="width: 57%">
+    <el-card style="width: 58%">
       <div slot="header">
         <el-row>
           <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable style="width: 120px" @change="machineChange">
@@ -264,7 +264,7 @@
             end-placeholder="结束日期"/>
           <el-input v-model="pickingListPeople" clearable size="small" placeholder="制单人" style="width:120px;margin-left: 10px" />
           <el-button size="small" type="primary" plain icon="el-icon-search" style="margin: 0 0 0 10px" @click="searchList()">查询</el-button>
-          <el-button size="small" type="warning" plain icon="el-icon-plus" style="margin: 0 0 0 10px" @click="createList()">创建领料单</el-button>
+          <el-button size="small" class="button111" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="createList()">创建领料单</el-button>
           <el-tooltip :open-delay="1200" effect="dark" content="为所选领料单增加物料明细" placement="top">
             <el-button size="small" type="success" plain icon="el-icon-bottom" style="margin: 0 0 5px 10px" @click="selectInto()">选入物料</el-button>
           </el-tooltip>
@@ -275,7 +275,7 @@
     </div>
     <div style="width: 26%;float: left;margin-right: 16px">
       <el-card>
-        <el-table :data="pickListTable1" :row-class-name="tableRowClassName" class="shenpi" highlight-current-row border size="mini" width="100%" height="400px" @row-click="clickList">
+        <el-table :data="pickListTable1" :row-class-name="tableRowClassName" class="shenpi" stripe highlight-current-row border size="mini" width="100%" height="400px" @row-click="clickList">
           <el-table-column prop="领料单编号" label="领料单编号" align="center" min-width="100px">
             <template slot-scope="scope">
               {{ scope.row.领料单编号 }}
@@ -356,9 +356,9 @@
           <!--</el-table-column>-->
           <el-table-column v-if="true" label="领料确认" align="center" prop="是否领料确认" width="75px">
             <template slot-scope="scope">
-              <el-tag v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领完</el-tag>
-              <el-tag v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">部分领用</el-tag>
-              <el-tag v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</el-tag>
+              <span v-if="(Number(scope.row.总数量) <= Number(scope.row.出库数量1)) || Number(scope.row.是否领料确认) === 1" type="success" size="mini">已领完</span>
+              <span v-else-if="Number(scope.row.总数量) > Number(scope.row.出库数量1) && Number(scope.row.出库数量1) > 0" type="primary" size="mini">部分领用</span>
+              <span v-else-if="Number(scope.row.出库数量1) === 0" type="warning" size="mini">未领料</span>
             </template>
           </el-table-column>
           <el-table-column label="操作" align="center" min-width="120px">
@@ -382,7 +382,7 @@
                     </template>
                   </el-table-column>
                 </el-table>
-                <el-button slot="reference" type="primary" size="mini" icon="el-icon-search" plain @click="searchTable02(scope.row)">领料详情</el-button>
+                <el-button slot="reference" type="text" size="mini" icon="el-icon-search" @click="searchTable02(scope.row)">领料详情</el-button>
               </el-popover>
             </template>
           </el-table-column>
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/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue
index 31d5b1d0..72c1130a 100644
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -20,8 +20,8 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=20;searchMaterial()">查询</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>
+          <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="pageCurrent=1;pageSize=20;searchMaterial()">查询</el-button>
+          <el-button class="button111" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>
         </el-row>
       </div>
       <el-table :data="tableData1" stripe highlight-current-row border height="550px" style="width: 850px" size="mini">
@@ -384,3 +384,20 @@ export default {
     width:165px
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue
index 79c95e6f..cf46232e 100644
--- a/src/views/Inventory/InventoryManagement/index.vue
+++ b/src/views/Inventory/InventoryManagement/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <div slot="header" class="clearfix">
-        <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADD()">新建仓库</el-button>
+        <el-button size="small" class="button111" icon="el-icon-circle-plus-outline" style="margin: 0 0 0 10px" @click="ADD()">新建仓库</el-button>
       </div>
       <el-table :data="tableData" border stripe highlight-current-row size="mini" style="width: 100%;max-height: 300px" height="300" @row-click="getWarehouse">
         <el-table-column label="仓库编号" align="center" width="90" show-overflow-tooltip>
@@ -41,7 +41,7 @@
               size="mini"
               icon="el-icon-edit"
               plain
-              type="warning"
+              type="primary"
               @click="handleEdit(scope.$index, scope.row, 'form')">修改</el-button>
             <el-button
               size="mini"
@@ -49,7 +49,7 @@
               plain
               icon="el-icon-delete"
               @click="handleDelete(scope.row)">删除</el-button>
-            <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" plain style="margin: 0 0 0 10px" @click="ADDLocate()">增加货位</el-button>
+            <el-button size="mini" class="button111" icon="el-icon-circle-plus-outline" plain style="margin: 0 0 0 10px" @click="ADDLocate()">增加货位</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -605,3 +605,20 @@ export default {
     margin: 10px 0 10px 10px;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index b9199e7f..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/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/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/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/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/AntonMonitoring/index.vue b/src/views/ManufacturingCenter/AntonMonitoring/index.vue
index df4a1f51..a755e425 100644
--- a/src/views/ManufacturingCenter/AntonMonitoring/index.vue
+++ b/src/views/ManufacturingCenter/AntonMonitoring/index.vue
@@ -10,7 +10,8 @@
         size="mini"
         height="800"
         highlight-current-row
-        border>
+        border
+        stripe>
         <el-table-column align="center" label="照片" width="50">
           <template slot-scope="scope">
             <el-popover
@@ -40,8 +41,8 @@
         </el-table-column>
         <el-table-column align="center" label="登陆人">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.姓名===''||scope.row.姓名===null" slot="reference" size="small" style="width: 80px" type="warning">未登录</el-tag>
-            <el-tag v-else slot="reference" type="success" size="small" style="width: 80px"> {{ scope.row.姓名 }} </el-tag>
+            <span v-if="scope.row.姓名===''||scope.row.姓名===null" slot="reference" size="small" style="width: 80px" type="warning">未登录</span>
+            <span v-else slot="reference" type="success" size="small" style="width: 80px"> {{ scope.row.姓名 }} </span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="呼叫类型">
@@ -55,7 +56,7 @@
             <el-button
               :disabled="scope.row.文件标识 && scope.row.文件标识 !== 'null'"
               size="mini"
-              type="primary"
+              type="text"
               icon="el-icon-picture"
               @click="handlePicture(scope.row)">上传图片</el-button>
           </template>
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/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index d6db393e..0162d6c9 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -4,7 +4,7 @@
       <el-row>
         <span>零件图号:</span>
         <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px;margin: 3px 0"/>
-        <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
+        <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
         <el-tooltip :open-delay="1200" effect="dark" content="已导出和未导出备料单" placement="top">
           <el-checkbox v-model="all" size="small">查询全部</el-checkbox>
         </el-tooltip>
@@ -13,13 +13,13 @@
           <el-button type="primary" size="small" icon="el-icon-success" plain style="margin-left:0px" @click="edit2()">分配外购备料</el-button>
         </el-tooltip>
         <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为自家备料" placement="top">
-          <el-button type="warning" size="small" icon="el-icon-success" plain style="margin-left:10px" @click="edit()">分配自家备料</el-button>
+          <el-button type="primary" size="small" icon="el-icon-success" plain style="margin-left:10px" @click="edit()">分配自家备料</el-button>
         </el-tooltip>
         <el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top">
-          <el-button type="primary" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>
+          <el-button class="button111" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>
         </el-tooltip>
         <el-tooltip :open-delay="1000" effect="dark" content="导出备料分配单" placement="top">
-          <el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 140px" @click="exportExcel">导出</el-button>
+          <el-button type="primary" plain class="el-icon-download" size="small" style="margin: 10px 0 0 140px" @click="exportExcel">导出</el-button>
         </el-tooltip>
       </el-row>
     </el-card>
@@ -45,9 +45,9 @@
           align="center"/>
         <el-table-column label="备料分配" prop="备料分配" align="center" width="90">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.备料打印 ==='1' && scope.row.是否外购备料==='0'" type="success" size="mini">自家</el-tag>
-            <el-tag v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='1'" type="success" size="mini">外购</el-tag>
-            <el-tag v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='0'" type="warning" size="mini">未分配</el-tag>
+            <span v-if="scope.row.备料打印 ==='1' && scope.row.是否外购备料==='0'" type="success" size="mini">自家</span>
+            <span v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='1'" type="success" size="mini">外购</span>
+            <span v-if="scope.row.备料打印 ==='0' && scope.row.是否外购备料==='0'" type="warning" size="mini">未分配</span>
           </template>
         </el-table-column>
         <el-table-column label="零件名称" prop="零件名称" align="center" width="250" sortable="custom" show-overflow-tooltip>
@@ -327,3 +327,21 @@ export default {
 <style scoped>
 
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
index de58c121..b5fec225 100644
--- a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
+++ b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue
@@ -21,203 +21,89 @@
         <!--:value="item.value"/>-->
         <!--</el-select>-->
         <span>机床图号:</span>
-        <el-select v-model="machineNameValue" placeholder="机床号" style="margin-right: 10px; width: 150px" size="small" filterable clearable @change="machineChange">
+        <el-select v-model="machineNameValue" placeholder="机床图号" style="margin-right: 10px; width: 150px" size="small" filterable clearable @change="machineChange">
           <el-option
             v-for="item in machineName"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="total1=0;pageSize1 = 10000;pageCurrent1 = 1;searchData1()">查询</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 15px" @click="total=0;pageSize = 20;pageCurrent = 1;searchData1()">查询</el-button>
       </el-row>
     </el-card>
-    <el-card style="margin-top: 15px">
+    <el-card style="margin-top: 15px;width: 960px">
       <el-table
-        v-loading="listLoading2"
-        :data="tableData2"
-        style="width: 100%;max-height: 400px;"
+        v-loading="listLoading"
+        :data="tableData"
+        style="width: 100%"
         stripe
-        size="mini"
+        size="small"
+        height="660"
         highlight-current-row
-        border
-        @row-click="searchSpareParts">
-        <el-table-column align="center" label="机床流水号">
-          <template slot-scope="scope">
-            {{ scope.row.机床流水号 }}
-          </template>
-        </el-table-column>
-        <el-table-column align="center" label="机床图号">
+        border>
+        <el-table-column align="center" label="机床图号" width="150px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="停产零件种类">
+        <el-table-column align="center" label="组号" width="80px">
           <template slot-scope="scope">
-            {{ scope.row.停产零件种类 }}
+            {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="停产零件数量">
+        <el-table-column align="center" label="零件图号" width="140px">
           <template slot-scope="scope">
-            {{ scope.row.停产零件数量 }}
+            {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="已加工工时">
+        <el-table-column align="center" label="零件名称" width="120px">
           <template slot-scope="scope">
-            {{ scope.row.已加工工时 }}
+            {{ scope.row.零件名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="报废数量" width="70px">
+          <template slot-scope="scope">
+            {{ scope.row.报废数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="报废时间" width="100px">
+          <template slot-scope="scope">
+            {{ scope.row.报废时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="报废原因" width="180px">
+          <template slot-scope="scope">
+            {{ scope.row.报废原因 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="报废工时" width="90px">
+          <template slot-scope="scope">
+            {{ scope.row.报废工时 }}
           </template>
         </el-table-column>
       </el-table>
-      <!--      <div class="block" style="margin-top: 10px">-->
-      <!--        <el-pagination-->
-      <!--          :current-page="pageCurrent1"-->
-      <!--          :page-sizes="[10, 20, 30, 40]"-->
-      <!--          :page-size="pageSize1"-->
-      <!--          :total="total1"-->
-      <!--          layout="total, sizes, prev, pager, next, jumper"-->
-      <!--          @size-change="handleSizeChange1"-->
-      <!--          @current-change="handleCurrentChange1"/>-->
-      <!--      </div>-->
+      <div class="block" style="margin-top: 10px">
+        <el-pagination
+          :current-page="pageCurrent"
+          :page-sizes="[10, 20, 30, 40]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
     </el-card>
-    <!--    <el-card style="margin-top: 15px">-->
-    <!--      <el-row>-->
-    <!--        <span>组号:</span>-->
-    <!--        <el-select v-model="GroupNumValue" placeholder="组号" style="margin-right: 10px;width: 150px" size="small" clearable>-->
-    <!--          <el-option-->
-    <!--            v-for="item in GroupNum"-->
-    <!--            :key="item.value"-->
-    <!--            :label="item.label"-->
-    <!--            :value="item.value"/>-->
-    <!--        </el-select>-->
-    <!--        <span>零件图号:</span>-->
-    <!--        <el-input v-model="PartDrawingNumber" placeholder="零件图号" size="small" clearable style="width:150px"/>-->
-    <!--        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 15px" @click="total=0;pageSize = 10;pageCurrent = 1;searchData()">查询</el-button>-->
-    <!--      </el-row>-->
-    <!--    </el-card>-->
-    <el-row>
-      <el-col style="width: 60%">
-        <el-card style="margin-top: 15px">
-          <el-table
-            v-loading="listLoading"
-            :data="tableData"
-            style="width: 100%"
-            stripe
-            size="mini"
-            height="460"
-            highlight-current-row
-            border
-            @row-click="searchProcedure">
-            <el-table-column align="center" label="组号" width="50px">
-              <template slot-scope="scope">
-                {{ scope.row.组号 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="零件图号" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.零件图号 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="零件名称" min-width="70px">
-              <template slot-scope="scope">
-                {{ scope.row.零件名称 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="零件数量">
-              <template slot-scope="scope">
-                {{ scope.row.投产数量 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="停产时间">
-              <template slot-scope="scope">
-                {{ scope.row.停产时间 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="停产原因">
-              <template slot-scope="scope">
-                {{ scope.row.停产原因 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="已完成工时">
-              <template slot-scope="scope">
-                {{ scope.row.加工工时 }}
-              </template>
-            </el-table-column>
-          </el-table>
-          <div class="block" style="margin-top: 10px">
-            <el-pagination
-              :current-page="pageCurrent"
-              :page-sizes="[10, 20, 30, 40]"
-              :page-size="pageSize"
-              :total="total"
-              layout="total, sizes, prev, pager, next, jumper"
-              @size-change="handleSizeChange"
-              @current-change="handleCurrentChange"/>
-          </div>
-        </el-card>
-      </el-col>
-      <el-col style="width: 40%">
-        <el-card style="margin-top: 15px">
-          <el-table
-            v-loading="listLoading1"
-            :data="tableData1"
-            style="width: 100%;"
-            stripe
-            size="mini"
-            height="500px"
-            highlight-current-row
-            border>
-            <el-table-column align="center" label="工序" width="50">
-              <template slot-scope="scope">
-                {{ scope.row.工序顺序 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="工艺名称" min-width="70">
-              <template slot-scope="scope">
-                {{ scope.row.工艺名称 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="工艺要求" width="70">
-              <template slot-scope="scope">
-                {{ scope.row.工艺要求 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="单件定额" width="70">
-              <template slot-scope="scope">
-                {{ scope.row.单件定额工时 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="准结定额" width="70">
-              <template slot-scope="scope">
-                {{ scope.row.准结定额工时 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="工序进度" width="70">
-              <template slot-scope="scope">
-                {{ scope.row.工序状态 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" label="完成工时" width="70">
-              <template slot-scope="scope">
-                {{ scope.row.工序工时 }}
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-card>
-      </el-col>
-    </el-row>
   </div>
 </template>
 
 <script>
-import { searchMachine, searchGroupNum, searchTable, searchTable1, searchTable2 } from '@/api/ManufacturingCenter/DiscardedPartsInquiry'
+import { searchMachine, searchTable1, searchTable2 } from '@/api/ManufacturingCenter/DiscardedPartsInquiry'
 export default {
   data() {
     return {
       pageCurrent: 1,
-      pageSize: 10,
+      pageSize: 20,
       total: 0,
-      pageCurrent1: 1,
-      pageSize1: 1000000,
-      total1: 0,
       list: [],
       check3: '',
       PartDrawingNumber: '',
@@ -260,73 +146,17 @@ export default {
       })
     },
     machineChange() {
-      this.GroupNum = []
-      this.GroupNumValue = ''
-      searchGroupNum(this.machineNameValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.GroupNum.push({
-            label: response.data[i].组号,
-            value: response.data[i].组件流水号
-          })
-        }
-      })
+      this.searchData1()
     },
     searchData1() {
-      this.listLoading2 = true
+      this.listLoading = true
       if (this.machineNameValue !== '' && this.machineNameValue !== null) {
         this.check1 = 1
       } else {
         this.check1 = 0
       }
-      searchTable2(this.check1, this.machineNameValue, this.pageCurrent1, this.pageSize1).then(response => {
+      searchTable2(this.check1, this.machineNameValue, this.pageCurrent, this.pageSize).then(response => {
         console.log(response)
-        this.tableData2 = response.data.rows
-        this.total1 = response.data.total
-        this.listLoading2 = false
-      })
-    },
-    handleSizeChange1(val) {
-      this.pageSize1 = val
-      this.pageCurrent1 = 1
-      this.searchData1()
-    },
-    handleCurrentChange1(val) {
-      this.pageCurrent1 = val
-      this.searchData1()
-    },
-    searchSpareParts(row) {
-      this.tableData1 = []
-      this.machineValue = row.机床流水号
-      this.initGroup()
-    },
-    initGroup() {
-      this.GroupNum = []
-      this.GroupNumValue = ''
-      searchGroupNum(this.machineValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.GroupNum.push({
-            label: response.data[i].组号,
-            value: response.data[i].组件流水号
-          })
-        }
-      })
-      this.searchData()
-    },
-    searchData() {
-      this.listLoading = true
-      this.tableData1 = []
-      if (this.GroupNumValue !== '' && this.GroupNumValue !== null) {
-        this.check2 = 1
-      } else {
-        this.check2 = 0
-      }
-      if (this.PartDrawingNumber !== '' && this.PartDrawingNumber !== null) {
-        this.check3 = 1
-      } else {
-        this.check3 = 0
-      }
-      searchTable(this.entryNameValue, this.machineValue, this.check2, this.GroupNumValue, this.check3, this.PartDrawingNumber, this.pageCurrent, this.pageSize).then(response => {
-        console.log(response.data)
         this.tableData = response.data.rows
         this.total = response.data.total
         this.listLoading = false
@@ -335,11 +165,11 @@ export default {
     handleSizeChange(val) {
       this.pageSize = val
       this.pageCurrent = 1
-      this.searchData()
+      this.searchData1()
     },
     handleCurrentChange(val) {
       this.pageCurrent = val
-      this.searchData()
+      this.searchData1()
     },
     searchProcedure(row) {
       this.listLoading1 = true
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/EquipmentConditionAnalysis/index.vue b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
index e7ef503c..5de98a3c 100644
--- a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
+++ b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
@@ -20,7 +20,7 @@
         style="width: 160px"
         type="date"
         placeholder="选择日期"/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin:0px 10px" @click="pageSize=10; pageCurrent= 1;searchData()">查询</el-button>
+      <el-button type="primary" plain size="small" icon="el-icon-search" style="margin:0px 10px" @click="pageSize=10; pageCurrent= 1;searchData()">查询</el-button>
     </el-card>
     <el-card>
       <el-table
@@ -118,7 +118,7 @@
         value-format="yyyy-MM-dd"
         format="yyyy-MM-dd"
         placeholder="选择日期"/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchData1()">查询</el-button>
+      <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchData1()">查询</el-button>
     </el-card>
     <el-card>
       <div id="myChart" style="width: 1000px; height: 570px; margin: auto"/>
@@ -153,7 +153,7 @@
         value-format="yyyy-MM-dd"
         format="yyyy-MM-dd"
         placeholder="选择日期"/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchData2()">查询</el-button>
+      <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchData2()">查询</el-button>
     </el-card>
     <el-card>
       <div id="myChart3" style="width: 100%; height: 520px; margin: auto"/>
diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
index 2973c522..633cbdc3 100644
--- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
+++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue
@@ -668,7 +668,7 @@ export default {
     this.connect()
     // this.getwork_state()
     this.getOP_state()
-    this.timer = setInterval(this.getwork_state, 60 * 1000) // 工位状态 60秒 一刷新
+    // this.timer = setInterval(this.getwork_state, 60 * 1000) // 工位状态 60秒 一刷新
   },
   beforeDestroy() {
     // 页面结束之前关闭所有timer，防止资源占用
diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index 579ef378..28f36a16 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -21,7 +21,7 @@
           <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
         </el-option>
       </el-select>
-      <el-button type="success" icon="el-icon-search" size="small" style="margin-top: 15px;margin-left: 10px" @click="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">查询</el-button>
+      <el-button type="primary" plain icon="el-icon-search" size="small" style="margin-top: 15px;margin-left: 10px" @click="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">查询</el-button>
     </el-card>
     <el-card>
       <h3 style="text-align: center;">车间生产</h3>
@@ -73,7 +73,7 @@
         </el-table-column>
         <el-table-column align="center" label="操作" fixed="right">
           <template slot-scope="scope">
-            <el-button type="primary" plain size="mini" @click="processingStatus(scope.row)">查看加工进度</el-button>
+            <el-button type="text" size="mini" @click="processingStatus(scope.row)">查看加工进度</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue
index f7a8ec02..33790659 100644
--- a/src/views/ManufacturingCenter/InventoryQuery/index.vue
+++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue
@@ -6,7 +6,7 @@
           <el-input v-model="materialName" placeholder="名称规格型号" size="small" clearable style="margin-bottom: 10px; width: 180px;"/>
           <!--          <el-input v-model="materialSpec" placeholder="物料规格" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
           <!--          <el-input v-model="materialModel" placeholder="物料型号" size="small" style="margin-bottom: 10px; width: 120px;" clearable/>-->
-          <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
+          <el-button type="primary" icon="el-icon-search" size="small" plain style="margin-left: 10px" @click="pageCurrent=1;pageSize=30;searchMaterial()">查询</el-button>
           <!--          <el-button type="primary" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>-->
         </el-row>
       </div>
diff --git a/src/views/ManufacturingCenter/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/MaterialArrival/index.vue b/src/views/ManufacturingCenter/MaterialArrival/index.vue
index d4dafd3d..e28940e3 100644
--- a/src/views/ManufacturingCenter/MaterialArrival/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrival/index.vue
@@ -19,8 +19,8 @@
           :value="item.value"/>
       </el-select>
       <el-input v-model="Partpaint" placeholder="零件号" clearable size="small" style="width: 180px;margin:0px 10px;"/>
-      <el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
-      <el-button :disabled="Name===1" type="baocun" class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
+      <el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 50;getTableData()">查询</el-button>
+      <el-button :disabled="Name===1" type="success" plain class="el-icon-finished" size="small" style="margin-left: 220px" @click="submit">完成</el-button>
     </el-card>
     <el-row>
       <el-card style="width: 50%; float: left">
@@ -30,6 +30,7 @@
           class="table"
           highlight-current-row
           border
+          stripe
           height="750"
           style="width: 100%"
           @current-change="getCurrentRow">
diff --git a/src/views/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..cce14df4 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: 300px" plain @click="currency">通用件保存</el-button>
     </el-card>
     <el-card>
       <el-table
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/ProjectPlanningQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
index df5c59f9..ca1e26ad 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue
@@ -32,7 +32,7 @@
           <span>提前</span>
           <el-input-number v-model="warningValue" :min="1" controls-position="right" size="small" style="width: 90px"/>
           <span>天预警</span>
-          <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable1();searchAll()">查询</el-button>
+          <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable1();searchAll()">查询</el-button>
         </el-row>
       </div>
       <h1 class="word" style="margin: 0">总计划:</h1>
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/SparePartsForScrap/index.vue b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
index f56a6752..3a01874c 100644
--- a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
+++ b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue
@@ -25,12 +25,12 @@
             :value="item.value"/>
         </el-select>
         <el-input v-model="PartDrawing" placeholder="请输入零件图号" size="small" style="width: 150px; margin: 0px 10px" clearable/>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px" @click="currentPage1=1; fetchTableData()">查询</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="currentPage1=1; fetchTableData()">查询</el-button>
       </el-row>
     </el-card>
     <el-row>
-      <el-col style="width: 690px">
-        <el-card style="width: 690px">
+      <el-col style="width: 850px">
+        <el-card style="width: 850px">
           <el-table
             v-loading="loading"
             :data="tableData"
@@ -41,7 +41,7 @@
             highlight-current-row
             border
             stripe
-            style="width: 810px; text-align: center"
+            style="width: 850px; text-align: center"
             @current-change="fetchTableData2">
             <el-table-column
               align="center"
@@ -70,6 +70,24 @@
             >
               <template slot-scope="scope">{{ scope.row.批次数量 }}</template>
             </el-table-column>
+            <el-table-column
+              align="center"
+              prop="province4"
+              label="报废数量"
+              width="80px"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">{{ scope.row.报废数量 }}</template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="province4"
+              label="补投数量"
+              width="80px"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">{{ scope.row.补投数量 }}</template>
+            </el-table-column>
             <el-table-column
               align="center"
               prop="province5"
@@ -131,7 +149,6 @@
             element-loading-background="rgba(226,223,223,1)"
             height="600"
             border
-            stripe
             style="width: 510px">
             <el-table-column
               width="50px"
@@ -199,21 +216,21 @@
       </el-col>
     </el-row>
     <el-card>
-      <div style="margin-top: 10px">报废后,将重新补投两种零件，一种是接着加工(执行原来的加工计划)，另一种是从第一序重新加工(重新制定零件的加工计划)，补投的零件号后加B</div>
-      <div style="margin-top: 10px; display: block">
-        <span>补投接着加工零件数量</span>
-        <el-input v-model="inputA" auto-complete="off" style="width: 100px" size="small"/>
-        <span>开始工序</span>
-        <el-input v-model="inputB" :disabled="true" auto-complete="off" style="width: 100px" size="small"/>
-        <el-button type="primary" plain size="small" @click="editA">补投接着生产零件</el-button>
-      </div>
+      <div style="margin-top: 10px">报废后,补投的零件号后加B+报废次数</div>
+      <!--<div style="margin-top: 10px; display: block">-->
+      <!--<span>补投接着加工零件数量</span>-->
+      <!--<el-input v-model="inputA" auto-complete="off" style="width: 100px" size="small"/>-->
+      <!--<span>开始工序</span>-->
+      <!--<el-input v-model="inputB" :disabled="true" auto-complete="off" style="width: 100px" size="small"/>-->
+      <!--<el-button type="primary" plain size="small" @click="editA">补投接着生产零件</el-button>-->
+      <!--</div>-->
       <!--<div style="margin-left: 800px; display: block">>>>><el-button type="success" size="small" style="margin-left: 40px" @click="goToCapacityBalance()">制定计划</el-button></div>-->
       <div style="margin-top: 10px; display: block">
         <span>补投重新加工零件数量</span>
-        <el-input v-model="inputC" auto-complete="off" style="width: 100px" size="small" />
+        <el-input-number v-model="inputC" :step="1" :min="0" :max="spareNumber-SupplementationNumber" style="width: 100px" size="small" />
         <span>开始工序</span>
         <el-input v-model="inputD" :disabled="true" auto-complete="off" style="width: 100px" size="small"/>
-        <el-button type="success" size="small" @click="editB">补投重新生产零件</el-button>
+        <el-button :disabled="spareNumber-SupplementationNumber===0" type="primary" size="small" plain @click="editB">补投重新生产零件</el-button>
       </div>
     </el-card>
     <el-card v-show="false">
@@ -250,59 +267,41 @@
         </el-table-column>
       </el-table>
     </el-card>
-    <el-dialog v-el-drag-dialog :visible.sync="dialogeditVisible" :title="title" width="400px" center >
-      <el-form ref="form" :model="form" label-position="left">
-        <el-form-item label="零件号" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
-          <el-input v-model="form.input1" :disabled="true" auto-complete="off" style="margin-left: 20px"/>
+    <el-dialog v-el-drag-dialog :visible.sync="dialogeditVisible" :title="title" :close-on-click-modal="false" width="400px" center >
+      <el-form ref="form2" :model="form2" :rules="rules" label-position="left">
+        <el-form-item label="零件号" label-width="80px" style="width: 299px ; display: inline-block; text-align: left;margin-left: 20px" size="small">
+          <el-input v-model="form.input1" :disabled="true" auto-complete="off" style="width: 200px"/>
         </el-form-item>
-        <el-form-item label="停产原因" label-width="100px" prop="reason" style="width: 299px ; display: inline-block; text-align: left" size="small">
-          <el-input v-model="form2.reason" auto-complete="off" style="margin-left: 20px"/>
+        <el-form-item label="报废数量" prop="报废数量" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
+          <el-input-number v-model="form2.报废数量" :step="1" :min="0" :max="PCNumber" style="width: 200px"/>
         </el-form-item>
-        <el-form-item label="停产时间" label-width="120px" prop="time" style="width: 299px ; display: inline-block; text-align: left" size="small">
+        <el-form-item label="报废原因" prop="报废原因" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
+          <el-input v-model="form2.报废原因" auto-complete="off" style="width: 200px"/>
+        </el-form-item>
+        <el-form-item label="报废时间" prop="报废时间" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
           <el-date-picker
-            v-model="form2.time"
-            value-format="yyyy-MM-dd"
-            size="small"
-            type="date"
-            placeholder="选择日期"/>
-        </el-form-item>
-        <el-form-item v-show="false" label="零件状态" label-width="123px" style="margin-bottom: 18px; display: inline-block" prop="input2">
-          <el-radio-group v-model="radio" fill="#B2DFEE" boolean @change="remark()">
-            <el-radio-button label="正常生产"/>
-            <el-radio-button label="停止生产"/>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item v-show="false" label="开始时间" label-width="120px" style="margin-bottom: 18px; display: inline-block">
-          <el-date-picker
-            v-model="input3"
-            value-format="yyyy-MM-dd"
-            size="small"
-            type="date"
-            placeholder="选择日期"/>
-        </el-form-item>
-        <el-form-item v-show="false" label="结束时间" label-width="120px" style="margin-bottom: 18px; display: inline-block">
-          <el-date-picker
-            v-model="input4"
+            v-model="form2.报废时间"
             value-format="yyyy-MM-dd"
             size="small"
             type="date"
+            style="width: 200px"
             placeholder="选择日期"/>
         </el-form-item>
       </el-form>
       <div style="margin-right: 60px;margin-top: 10px">
-        <el-button style="margin-left: 35%" @click="callOff('form')">取消</el-button>
-        <el-button type="primary" @click="submit('form')">确定</el-button>
+        <el-button style="margin-left: 35%" @click="callOff('form2')">取消</el-button>
+        <el-button type="primary" @click="submit('form2')">确定</el-button>
       </div>
     </el-dialog>
 
     <el-dialog v-el-drag-dialog :visible.sync="dialogeditVisible1" title="停产记录" width="400px" center>
       <el-form ref="form2" :model="form2" label-position="left">
-        <el-form-item label="停产原因" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
-          <el-input v-model="form2.reason" auto-complete="off"/>
+        <el-form-item label="报废原因" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
+          <el-input v-model="form2.报废原因" auto-complete="off"/>
         </el-form-item>
-        <el-form-item label="停产时间" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
+        <el-form-item label="报废时间" label-width="100px" style="width: 299px ; display: inline-block; text-align: left" size="small">
           <el-date-picker
-            v-model="form2.time"
+            v-model="form2.报废时间"
             value-format="yyyy-MM-dd"
             size="small"
             type="date"
@@ -318,7 +317,7 @@
 </template>
 
 <script>
-import { MachineDrawingSelect, TeamSelect, TableDataSelect, editTime, editStop, TableDta2Select, editA, editchar } from '@/api/ManufacturingCenter/SparePartsForScrap'
+import { MachineDrawingSelect, TeamSelect, TableDataSelect, editSpare, TableDta2Select, editA } from '@/api/ManufacturingCenter/SparePartsForScrap'
 export default {
   data() {
     return {
@@ -332,6 +331,9 @@ export default {
       TeamValue: '', // 组号
       Team: [], // 组号下拉框
       title: '',
+      PCNumber: '', // 批次数量
+      spareNumber: '', // 报废数量
+      SupplementationNumber: '', // 补投数量
       currentPage1: 1,
       pageSize1: 40,
       total1: null,
@@ -365,8 +367,14 @@ export default {
         input2: ''
       },
       form2: {
-        reason: '',
-        time: ''
+        报废数量: '',
+        报废原因: '',
+        报废时间: ''
+      },
+      rules: {
+        报废时间: [{ required: true, message: '请选择报废时间', trigger: 'change' }],
+        报废数量: [{ required: true, message: '请输入报废数量', trigger: 'blur' }],
+        报废原因: [{ required: true, message: '请输入报废原因', trigger: 'blur' }]
       },
       radio: '',
       input3: '', // 开始时间
@@ -408,7 +416,11 @@ export default {
       if (row) {
         this.disabled = false
         this.judge = row.批次零件状态
+        this.spareNumber = row.报废数量
+        this.inputC = 0
+        this.SupplementationNumber = row.补投数量
         this.CutCodeBefore = row.工艺计划流水号
+        console.log(this.CutCodeBefore, 222)
         TableDta2Select(row.工艺计划流水号, this.currentPage2, this.pageSize2).then(response => {
           this.tableData2 = response.data.rows
           this.total2 = response.data.total
@@ -452,46 +464,36 @@ export default {
       this.pageSize2 = 10
     },
     handleEdit(row) {
+      if (this.$refs['form2'] !== undefined) {
+        this.$refs['form2'].resetFields()
+      }
       this.remark1 = ''
       this.remark2 = ''
-      this.form2.reason = ''
+      this.PCNumber = parseInt(row.批次数量)
+      console.log(this.Number, 111)
       this.title = row.零件名称
-      this.form2.time = new Date()
       this.dialogeditVisible = true
       this.form.input1 = row.零件图号
-      if (row.批次零件状态 === '2') {
-        this.radio = '停止生产'
-      } else if (row.批次零件状态 === '1') {
-        this.radio = '正常生产'
-      }
-      this.input3 = row.机加工开始时间
-      this.input4 = row.机加工结束时间
       this.code = row.工艺计划流水号
     },
-    async chaEdit() {
-      this.radio === '正常生产' ? this.temp = '1' : this.temp = '2'
-      const Time = await editTime(this.code, this.input3, this.input4)
-      const Char = await editchar(this.remark1, this.remark2, this.code)
-      const Stop = await editStop(this.code, 2)
-      if (Time.data[0].result === '1' && Char.data[0].result === '1' && Stop.data[0].result === '1') {
-        this.dialogeditVisible = false
-        this.$message.success('信息更新成功')
-        this.fetchTableData()
-      } else {
-        this.$message.error('信息更新失败')
-      }
-    },
     // 提交添加或者修改
     submit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
-          this.chaEdit()
+          editSpare(this.code, this.form2.报废数量, this.form2.报废原因, this.form2.报废时间).then(response => {
+            if (response.data[0].result === '1') {
+              this.$message.success('报废成功')
+              this.dialogeditVisible = false
+              this.fetchTableData()
+            } else {
+              this.$message.success('报废失败')
+            }
+          })
         }
       })
     },
     // 重置表单
     callOff(formName) {
-      this.form = {}
       this.dialogeditVisible = false
       this.$refs[formName].resetFields()
     },
@@ -508,8 +510,8 @@ export default {
       } else { this.$message.warning('请选择停产零件') }
     },
     editB() {
-      if (this.judge === '2') {
-        editA(this.CutCodeBefore, this.inputC, this.inputD).then(response => {
+      if (this.spareNumber - this.SupplementationNumber > 0) {
+        editA(this.CutCodeBefore, this.inputC).then(response => {
           if (response.data[0].result === '1') {
             this.$message.success('补投成功')
             this.fetchTableData()
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index 04876a52..b49b41b7 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -24,7 +24,7 @@
             :value="item.value"/>
         </el-select>
         <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 150px;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" plain icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
       </el-row>
     </el-card>
     <el-card>
diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
index ebb621c9..8f194d1d 100644
--- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
+++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue
@@ -3,9 +3,11 @@
     <el-card>
       <span>设备名称:</span>
       <el-input v-model="equipmentName" placeholder="设备名称" size="small" clearable style="width:200px;margin-left: 10px"/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="pageCurrent = 1;fetchData()">查询</el-button>
+      <!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left:30px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="pageCurrent = 1;fetchData()">查询</el-button>-->
+      <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 10;PageCurrent = 1;fetchData()">查询</el-button>
       <el-tooltip effect="dark" content="添加新设备" placement="top">
-        <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="handleAdd()">新增</el-button>
+        <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
+        <!--<el-button type="primary" size="small" icon="el-icon-circle-plus-outline" plain style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="handleAdd()">新增</el-button>-->
       </el-tooltip>
       <span style="margin-left: 40px">有效时间：</span>
       <el-date-picker
@@ -15,10 +17,12 @@
         value-format="yyyy-MM-dd"
         placeholder="选择日期"/>
       <el-tooltip :open-delay="1200" effect="dark" content="设定设备参数有效时间" placement="top">
-        <el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="setUp">设定</el-button>
+        <!--<el-button type="primary" size="small" icon="el-icon-setting" style="margin-left:10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="setUp">设定</el-button>-->
+        <el-button type="warning" size="small" icon="el-icon-setting" plain style="margin-left:10px" @click="setUp">设定</el-button>
       </el-tooltip>
       <el-tooltip effect="dark" content="生成有效时间内设备加工能力" placement="top">
-        <el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="generate">生成设备加工能力</el-button>
+        <!--<el-button type="success" size="small" icon="el-icon-edit-outline" style="margin-left:10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="generate">生成设备加工能力</el-button>-->
+        <el-button type="primary" size="small" icon="el-icon-edit-outline" plain style="margin-left:10px" @click="generate">生成设备加工能力</el-button>
       </el-tooltip>
     </el-card>
 
@@ -74,10 +78,10 @@
             {{ scope.row.设备预留工时系数 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200px" fixed="right" >
+        <el-table-column label="操作" align="center" width="100px" fixed="right" >
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" icon="el-icon-edit" plain style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-delete" plain @click="handleDelete(scope.row)">删除</el-button>
+            <el-button type="text" size="mini" icon="el-icon-edit" style="margin-left:10px" @click="handleEdit(scope.row)"/>
+            <el-button type="text" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>
@@ -194,6 +198,7 @@
 
 <script>
 import { getData, initProcessing, addTable, editTable, deleteTable, setUp, generate } from '@/api/ManufacturingCenter/WorkshopEquipmentManagement'
+import { getNowTime } from '@/utils/tool'
 export default {
   data() {
     return {
@@ -336,6 +341,13 @@ export default {
         }
       })
     },
+    ADD() {
+      this.addForm('form')
+      this.dialogFormVisible1 = true
+      this.form.contractSigningDate = getNowTime()// new Date()
+      this.temp = 1
+      this.title = '新增项目'
+    },
     submitEdit() {
       editTable(this.equipmentSerialNumber, this.form.设备名称, this.form.设备型号, this.form.设备性能指标, this.form.设备加工能力, this.form.设备工时系数, this.form.班次类型, this.form.设备加工工艺, this.form.整改工时系数, this.form.设备编号, this.form.预留工时系数).then(response => {
         if (response.data[0].result === '1') {
@@ -423,3 +435,20 @@ export default {
   /*  color: #ff9759;*/
   /*}*/
 </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/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
index 72225ecb..bae05b93 100644
--- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
+++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue
@@ -19,9 +19,9 @@
           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" plain class="el-icon-search" size="small" style="margin:0px 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
         <el-tooltip :open-delay="1000" content="导出人员工时统计表" placement="right">
-          <el-button type="primary" size="small" icon="el-icon-download" style="margin:0px 10px" @click="exportUninquirySheet1()">导出</el-button>
+          <el-button type="primary" plain size="small" icon="el-icon-download" style="margin:0px 10px" @click="exportUninquirySheet1()">导出</el-button>
         </el-tooltip>
       </el-row>
     </el-card>
@@ -66,7 +66,7 @@
         </div>
       </el-col>
       <el-col :span="17" style="margin-left: 30px;">
-        <el-table v-loading="loading2" :data="tableData2" height="380" size="mini" stripe highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
+        <el-table v-loading="loading2" :data="tableData2" height="380" size="mini" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
           <el-table-column label="零件图号" align="center" width="150px">
             <template slot-scope="scope">
               {{ scope.row.零件图号 }}
@@ -128,7 +128,7 @@
         </el-option>
       </el-select>
       <el-tooltip :open-delay="1000" content="导出机床工时统计明细表" placement="top">
-        <el-button type="warning" size="mini" icon="el-icon-download" plain style="margin-left:10px" @click="exportUninquirySheet2()">机床导出</el-button>
+        <el-button type="primary" size="mini" icon="el-icon-download" plain style="margin-left:10px" @click="exportUninquirySheet2()">机床导出</el-button>
       </el-tooltip>
       <el-tooltip :open-delay="1000" content="导出组件工时统计明细表" placement="top">
         <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" plain @click="exportUninquirySheet3()">组件导出</el-button>
@@ -165,7 +165,7 @@
         <!--        </div>-->
       </el-col>
       <el-col :span="17" style="margin-left: 30px;">
-        <el-table v-loading="loading4" :data="tableData4" size="mini" height="380" stripe highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
+        <el-table v-loading="loading4" :data="tableData4" size="mini" height="380" highlight-current-row style="width: 100%;" border element-loading-text="拼命加载中">
           <el-table-column label="机床编号" align="center">
             <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/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..493fa2b5 100644
--- a/src/views/MarketingCenter/CRM/index.vue
+++ b/src/views/MarketingCenter/CRM/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <span>客户名称：</span>
-      <el-select v-model="CustomerNameValue" filterable placeholder="请输入客户名称" style="margin: 3px" size="small" clearable>
+      <el-select v-model="CustomerNameValue" filterable placeholder="请输入客户名称" style="margin: 3px;width: 230px" size="small" clearable>
         <el-option
           v-for="item in CustomerName"
           :key="item.value"
@@ -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..c2fe528f 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -8,14 +8,14 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-select v-model="customerName" filterable placeholder="客户名称" style="margin: 3px;width: 140px " size="small" clearable>
+      <el-select v-model="customerName" filterable placeholder="客户名称" style="margin: 3px;width: 220px " size="small" clearable>
         <el-option
           v-for="item in customerNames"
           :key="item.value"
           :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..d7360bd9 100644
--- a/src/views/MarketingCenter/ContractInformationManagement/index.vue
+++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue
@@ -3,7 +3,7 @@
     <el-card>
       <!--      style="background: rgb(233,240,250)"-->
       <div>
-        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:150px;margin: 3px 10px;">
+        <el-select v-model="entryNameValue" clearable filterable placeholder="项目名称" size="small" style="width:180px;margin: 3px 10px;">
           <el-option
             v-for="item in entryName"
             :key="item.value"
@@ -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/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue
index 4a7bafc3..259c9ab2 100644
--- a/src/views/MarketingCenter/CreateProject/index.vue
+++ b/src/views/MarketingCenter/CreateProject/index.vue
@@ -39,9 +39,11 @@
         <!--          size="small"-->
         <!--          type="date"-->
         <!--          placeholder="请选择结束日期"/>-->
-        <el-button type="success" icon="el-icon-search" size="small" style="margin-left: 10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
+        <!--<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px;background: #ecf5ff;border-color: #2d72d5;color: #2d72d5;" @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>-->
+        <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" plain @click="PageSize = 10;PageCurrent = 1;fetchTableData1()">查询</el-button>
         <el-tooltip :open-delay="1200" effect="dark" content="新增项目" placement="top">
-          <el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="ADD()">新增</el-button>
+          <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()">新增</el-button>
+          <!--<el-button type="primary" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px;background: #fdf6ec;border-color: #ff9759;color: #ff9759;" @click="ADD()">新增</el-button>-->
         </el-tooltip>
       </div>
     </el-card>
@@ -83,14 +85,11 @@
             </el-table-column>
             <el-table-column label="操作" align="center" width="160">
               <template slot-scope="scope">
-                <el-tooltip :open-delay="1200" effect="dark" content="增加机床" placement="top">
-                  <el-button
-                    size="mini"
-                    type="warning"
-                    plain
-                    icon="el-icon-plus"
-                    @click.stop="addMachine(scope.row);flag = 1">机床</el-button>
-                </el-tooltip>
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-circle-plus-outline"
+                  @click.stop="addMachine(scope.row);flag = 1">增加机床</el-button>
                 <el-button
                   size="mini"
                   type="text"
@@ -118,7 +117,8 @@
       </el-col>
       <el-col style="width: 43%">
         <el-card>
-          <el-table :data="tableData2" class="subTableHeader" border stripe style="width: 100%; text-align: center" size="mini">
+          <!--<el-table :data="tableData2" class="subTableHeader" border stripe style="width: 100%; text-align: center" size="mini">-->
+          <el-table :data="tableData2" border stripe style="width: 100%; text-align: center" size="mini">
             <el-table-column label="设备型号" align="center" width="120">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
@@ -472,6 +472,21 @@ export default {
   /*}*/
 </style>
 <style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
   .subTableHeader {
     th {
       background: #8ff4ea !important;
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 3a1bc41c..d4115478 100644
--- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
+++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
@@ -1,636 +1,261 @@
 <template>
   <div class="app-container">
-    <!--<el-card>-->
-    <!--<span>表单号:</span>-->
-    <!--<el-input v-model="FormNumber" placeholder="表单号" clearable size="small" style="width:190px;margin:10px;"/>-->
-    <!--<span>任务下达时间段:</span>-->
-    <!--<el-date-picker-->
-    <!--v-model="date1"-->
-    <!--style="width:190px;margin:10px;"-->
-    <!--size="small"-->
-    <!--type="date"-->
-    <!--value-format="yyyy-MM-dd"-->
-    <!--format="yyyy-MM-dd"-->
-    <!--placeholder="选择日期"/>-->
-    <!--<span>~</span>-->
-    <!--<el-date-picker-->
-    <!--v-model="date2"-->
-    <!--style="width:190px;margin:10px;"-->
-    <!--size="small"-->
-    <!--type="date"-->
-    <!--value-format="yyyy-MM-dd"-->
-    <!--format="yyyy-MM-dd"-->
-    <!--placeholder="选择日期"/>-->
-    <!--<span>实际付款时间段:</span>-->
-    <!--<el-date-picker-->
-    <!--v-model="date3"-->
-    <!--style="width:190px;margin:10px;"-->
-    <!--size="small"-->
-    <!--type="date"-->
-    <!--value-format="yyyy-MM-dd"-->
-    <!--format="yyyy-MM-dd"-->
-    <!--placeholder="选择日期"/>-->
-    <!--<span>~</span>-->
-    <!--<el-date-picker-->
-    <!--v-model="date4"-->
-    <!--style="width:190px;margin:10px;"-->
-    <!--size="small"-->
-    <!--type="date"-->
-    <!--value-format="yyyy-MM-dd"-->
-    <!--format="yyyy-MM-dd"-->
-    <!--placeholder="选择日期"/>-->
-    <!--</el-card>-->
     <el-card>
-      <el-row>
-        <span>厂家:</span>
-        <el-select v-model="ManufacturerNameValue" placeholder="选择外协厂家" filterable clearable size="small" style="width:190px;margin:10px;">
-          <el-option
-            v-for="item in ManufacturerName"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <el-button type="primary" class="el-icon-search" size="small" plain @click="pageCurrent=1;pageSize=20;searchTable()">查询</el-button>
-      </el-row>
-      <el-table v-loading="loading" :data="tableData" height="500" size="mini" stripe style="width: 100%;" border highlight-current-row element-loading-text="拼命加载中">
-        <el-table-column label="序号" type="index" align="center" fixed="left" width="50"/>
-        <el-table-column label="付款" prop="实际付款时间" width="65" align="center" fixed="left">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.实际付款时间!==''" type="success" size="small">已付</el-tag>
-            <el-tag v-else type="info" size="small">未付</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="到货" prop="单据状态" width="65" align="center" fixed="left">
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.单据状态==='3'" type="success" size="small">已到</el-tag>
-            <el-tag v-else type="info" size="small">未到</el-tag>
-          </template>
-        </el-table-column>
-        <el-table-column label="单据号" prop="表单号" align="center" width="180px" fixed="left">
-          <template slot-scope="scope">
-            {{ scope.row.表单号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="外协厂家" prop="外协厂家名称" align="center" min-width="190px" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.外协厂家名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="总价" align="center" min-width="100px">
-          <template slot-scope="scope">
-            {{ parseFloat(scope.row.总价).toFixed(2) }}
-          </template>
-        </el-table-column>
-        <el-table-column label="扣款金额" align="center" min-width="100px">
-          <template slot-scope="scope">
-            {{ parseFloat(scope.row.扣款_质量).toFixed(2) }}
-          </template>
-        </el-table-column>
-        <!--<el-table-column label="计划扣款" align="center" min-width="70px">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.扣款_计划 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="其他扣款" align="center" min-width="70px">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.扣款_其他 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <el-table-column label="应付金额" align="center" min-width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.实际付款时间 === '' ? parseFloat(scope.row.应付总额).toFixed(2) : '-' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="扣款说明" align="center" min-width="120px">
-          <template slot-scope="scope">
-            {{ scope.row.扣款说明 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="任务下达日期" prop="任务下达日期" align="center" min-width="125px">
-          <template slot-scope="scope">
-            {{ scope.row.任务下达日期 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="外协员" prop="外协员姓名" align="center" width="90px">
-          <template slot-scope="scope">
-            {{ scope.row.外协员姓名 }}
-          </template>
-        </el-table-column>
-        <!--<el-table-column label="加工价格" align="center">-->
-        <!--<el-table-column label="预算总价" align="center" width="85px">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.加工价格_预算_总价 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="成交总价" align="center" width="85px">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.加工价格_成交_总价 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="材料费" align="center" min-width="70px">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.材料价格_价格_总价 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="运费" align="center" min-width="70px">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.运费 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="其他费用" align="center" min-width="70px">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.其他价格_总价 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="总价" align="center" min-width="70px">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.总价 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="付款日期" align="center" width="240px">-->
-        <!--<el-table-column label="入库" align="center" min-width="70px">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.入库时间 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="计划" align="center" min-width="70px">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.计划付款时间 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="实际" align="center" min-width="70px">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.实际付款时间 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--</el-table-column>-->
-        <el-table-column label="操作" align="center" width="200px" fixed="right">
-          <template slot-scope="scope">
-            <!--<el-tooltip :open-delay="1200" effect="dark" content="记录外协付款到票信息" placement="top">-->
-            <!--<el-button :disabled="scope.row.实际付款时间!==''" size="mini" type="primary" plain class="el-icon-check" @click="editType1(scope.row, 'form');param = 0">到票</el-button>-->
-            <!--</el-tooltip>-->
-            <el-tooltip :open-delay="1200" effect="dark" content="记录外协扣款信息" placement="top">
-              <el-button :disabled="scope.row.实际付款时间!==''" size="mini" type="primary" plain class="el-icon-edit" @click="Withdrawing(scope.$index, scope.row, 'form2')">扣款</el-button>
-            </el-tooltip>
-            <el-tooltip :open-delay="1200" effect="dark" content="付款信息" placement="top">
-              <el-button :disabled="scope.row.实际付款时间!==''||scope.row.单据状态!=='3'" size="mini" type="success" class="el-icon-check" @click="payment(scope.$index, scope.row)">付款</el-button>
-            </el-tooltip>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div class="block">
-        <el-pagination
-          v-if="!loading"
-          :current-page="pageCurrent"
-          :page-sizes="[20, 30, 40]"
-          :page-size="pageSize"
-          :total="total"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"/>
-      </div>
+      <el-col :span="8">
+        <el-row>
+          <span>外协厂家:</span>
+          <el-input v-model="ManufacturerName" size="small" placeholder="外协厂家" clearable style="width:200px"/>
+          <el-button type="primary" class="el-icon-search" size="small" plain @click="pageCurrent=1;pageSize=50;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">
+            <template slot-scope="scope">
+              {{ scope.row.外协厂家名称 }}
+            </template>
+          </el-table-column>
+          <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">
+              {{ 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">
+            <template slot-scope="scope">
+              {{ scope.row.备注 }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block">
+          <el-pagination
+            v-if="!loading"
+            :current-page="pageCurrent"
+            :page-sizes="[50, 100]"
+            :page-size="pageSize"
+            :total="total"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"/>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <el-row>
+          <span style="margin-top: 10px">开票明细:</span>
+          <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd1()">新增</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">
+            <template slot-scope="scope">
+              {{ scope.row.总价 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="开票时间" align="center" width="130px" prop="开票金额">
+            <template slot-scope="scope">
+              {{ scope.row.开票金额 }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block">
+          <el-pagination
+            v-if="!loading2"
+            :current-page="pageCurrent2"
+            :page-sizes="[50, 100]"
+            :page-size="pageSize2"
+            :total="total2"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange2"
+            @current-change="handleCurrentChange2"/>
+        </div>
+      </el-col>
+      <el-col :span="8">
+        <el-row>
+          <span style="margin-top: 10px">付款明细:</span>
+          <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="handleAdd2()">新增</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">
+            <template slot-scope="scope">
+              {{ scope.row.总价 }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block">
+          <el-pagination
+            v-if="!loading3"
+            :current-page="pageCurrent3"
+            :page-sizes="[50, 100]"
+            :page-size="pageSize3"
+            :total="total3"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange3"
+            @current-change="handleCurrentChange3"/>
+        </div>
+      </el-col>
     </el-card>
 
-    <el-card>
-      <el-row>
-        <span>厂家:</span>
-        <el-select v-model="ManufacturerNameValue2" placeholder="选择外协厂家" filterable clearable size="small" style="width:190px;margin:10px;">
-          <el-option
-            v-for="item in ManufacturerName2"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"/>
-        </el-select>
-        <el-button type="success" class="el-icon-search" size="small" @click="pageCurrent2=1;pageSize2=20;getParts()">查询</el-button>
-        <el-tooltip :open-delay="1200" effect="dark" content="记录外协付款到票信息" placement="top">
-          <el-button size="small" type="primary" plain class="el-icon-check" @click="editType1('form');param = 0">到票</el-button>
-        </el-tooltip>
-      </el-row>
-      <el-table v-loading="loading2" :data="tableData2" :summary-method="getSummaries" size="mini" stripe height="370" show-summary 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">
-          <template slot-scope="scope">
-            {{ scope.row.发票号 }}
-          </template>
-        </el-table-column>
-        <!--<el-table-column label="接收人" prop="接收人" align="center" width="100px">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.接收人 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <!--<el-table-column label="开户行" align="center" width="150px" show-overflow-tooltip="">-->
-        <!--<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" width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.开票时间 === '1900/1/1' ? '-' : scope.row.开票时间 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="接收日期" align="center" width="100px">
-          <template slot-scope="scope">
-            {{ scope.row.接收时间 === '1900/1/1' ? '-' : 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
-          v-if="!loading2"
-          :current-page="pageCurrent2"
-          :page-sizes="[20, 30, 40]"
-          :page-size="pageSize2"
-          :total="total2"
-          layout="total, sizes, prev, pager, next, jumper"
-          @size-change="handleSizeChange2"
-          @current-change="handleCurrentChange2"/>
-      </div>
-    </el-card>
-
-    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible2" title="扣款" center style="min-height: 300px" width="500px">
-      <el-form ref="form2" :model="form2" :rules="rules" label-position="left" label-width="110px" class="demo-ruleForm">
-        <el-form-item label="扣款金额" prop="质量" style="margin-left: 70px">
-          <el-input v-model="form2.质量" placeholder="扣款金额" size="small" style="width:200px"/>
-        </el-form-item>
-        <el-form-item label="扣款说明" prop="扣款说明" style="margin-left: 70px">
-          <el-input v-model="form2.扣款说明" placeholder="扣款说明" size="small" style="width:200px"/>
-        </el-form-item>
-        <!--<el-form-item label="计划" style="margin-left: 200px">-->
-        <!--<el-input v-model="form2.计划" placeholder="计划" size="small" style="width:200px"/>-->
-        <!--</el-form-item>-->
-        <!--<el-form-item label="其他" style="margin-left: 200px">-->
-        <!--<el-input v-model="form2.其他" placeholder="其他" size="small" style="width:200px"/>-->
-        <!--</el-form-item>-->
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff2('form2')">取消</el-button>
-        <el-button type="primary" @click="submit2('form2')">确定</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogFormVisible" 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">
-            <el-form-item label="外协厂家" prop="外协厂家" >
-              <el-select v-model="form.外协厂家" placeholder="外协厂家" filterable clearable size="small">
-                <el-option
-                  v-for="item in 外协厂家"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"/>
-              </el-select>
-            </el-form-item>
-          </el-col>
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible1" title="新增发票" center style="min-height: 300px" width="400px">
+      <el-form ref="form1" :model="form1" :rules="rules" label-position="left" label-width="100px" class="demo-ruleForm">
+        <el-row>
+          <el-form-item label="发票号" prop="发票号" >
+            <el-input v-model="form1.发票号" placeholder="发票号" style="width:200px" clearable size="small"/>
+          </el-form-item>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="发票号" prop="发票号" >
-              <el-input v-model="form.发票号" placeholder="发票号" style="width:200px" clearable size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="开票金额" prop="开票金额">
-              <el-input v-model="form.开票金额" placeholder="开票金额" style="width:200px" clearable size="small"/>
-            </el-form-item>
-          </el-col>
+          <el-form-item label="开票金额" prop="开票金额">
+            <el-input v-model="form1.开票金额" placeholder="开票金额" style="width:200px" clearable size="small"/>
+          </el-form-item>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="开票时间" prop="开票时间">
-              <el-date-picker
-                v-model="form.开票时间"
-                style="width:200px"
-                size="small"
-                type="date"
-                value-format="yyyy-MM-dd"
-                format="yyyy-MM-dd"
-                clearable
-                placeholder="开票时间"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="开户行" prop="开户行">
-              <el-input v-model="form.开户行" placeholder="开户行" style="width:200px" clearable size="small" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="接收人" prop="接收人">
-              <el-input v-model="form.接收人" placeholder="接收人" style="width:200px" clearable size="small"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="接收时间" prop="接收时间">
-              <el-date-picker
-                v-model="form.接收时间"
-                style="width:200px"
-                size="small"
-                type="date"
-                value-format="yyyy-MM-dd"
-                format="yyyy-MM-dd"
-                clearable
-                placeholder="接收时间"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注" prop="备注">
-              <el-input v-model="form.备注" :rows="2" placeholder="备注" type="textarea" style="width:527px" clearable size="small"/>
-            </el-form-item>
-          </el-col>
+          <el-form-item label="开票时间" prop="开票时间">
+            <el-date-picker
+              v-model="form1.开票时间"
+              style="width:200px"
+              size="small"
+              type="date"
+              value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd"
+              clearable
+              placeholder="开票时间"/>
+          </el-form-item>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button @click="callOff('form')">取消</el-button>
-        <el-button type="primary" @click="submit('form')" >确定</el-button>
+        <el-button @click="callOff1('form1')">取消</el-button>
+        <el-button type="primary" @click="submit1('form1')" >确定</el-button>
       </div>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { initOutHelp, searchtable, payTime, WithdrawingEdit, getParts, edittype, handlechange, handledelete } from '@/api/Outsourcing/OutsourcingPaymentPlanManagement'
+import { searchtable, getInvoice, getPayment, AddType1, handlechange, handledelete } from '@/api/Outsourcing/OutsourcingPaymentPlanManagement'
 export default {
   data() {
     return {
-      fukuanshijian: '',
-      title1: '',
-      dialogFormVisible: false,
-      renwudan: '',
-      count1: 0,
-      count2: 0,
-      form: {
-        外协厂家: '',
-        发票号: '',
-        开户行: '',
-        开票时间: '',
-        开票金额: '',
-        接收人: '',
-        接收时间: '',
-        备注: ''
-      },
-      外协厂家: [],
-      实际付款时间: '',
+      ManufacturerName: '', // 外协厂家
+      外协厂家流水号: '',
       loading: false,
-      loading2: false,
-      zhongjianbianliang: '',
-      dialogFormVisible2: false,
-      form2: {
-        质量: '',
-        计划: '',
-        其他: '',
-        扣款说明: ''
-      },
-      rules: {
-        外协厂家: [{ required: true, message: '请选择外协厂家', trigger: 'change' }],
-        发票号: [{ required: true, message: '请输入发票号', trigger: 'blur' }],
-        开票金额: [{ required: true, message: '请输入开票金额', trigger: 'blur' }],
-        质量: [{ required: true, message: '请输入扣款金额', trigger: 'blur' }],
-        扣款说明: [{ required: true, message: '请输入扣款说明', trigger: 'blur' }]
-      },
-      date1: '',
-      date2: '',
-      date3: '',
-      date4: '',
-      FormNumber: '',
-      ManufacturerNameValue: '',
-      ManufacturerName: [], // 厂家名称
-      ManufacturerNameValue2: '',
-      ManufacturerName2: [], // 厂家名称
-      FormNumber_check: false,
-      ManufacturerNameValue_check: false,
-      date1_check: false,
-      date3_check: false,
       tableData: [], // 表格数据
       total: null, // 总条数
-      pageSize: 20, // 每页显示条数
+      pageSize: 50, // 每页显示条数
       pageCurrent: 1, // 后台获取页
+      loading2: false,
       tableData2: [], // 表格数据
       total2: null, // 总条数
-      pageSize2: 20, // 每页显示条数
-      pageCurrent2: 1 // 后台获取页
+      pageSize2: 50, // 每页显示条数
+      pageCurrent2: 1, // 后台获取页
+      loading3: false,
+      tableData3: [], // 表格数据
+      total3: null, // 总条数
+      pageSize3: 50, // 每页显示条数
+      pageCurrent3: 1, // 后台获取页
+      dialogFormVisible1: false,
+      form1: {
+        发票号: '',
+        开票时间: '',
+        开票金额: ''
+      },
+      rules: {}
     }
   },
   created() {
-    this.fetchData()
-    this.searchTable()
     this.getParts()
   },
   methods: {
-    getSummaries(param) {
-      const { data } = param
-      const sums = ['', '', 0, '', '', '', '']
-      sums[0] = '合计'
-      for (let i = 0; i < data.length; i++) {
-        sums[2] += parseInt(data[i].开票金额)
-      }
-      // sums[2] = Math.round(sums[2] * 100) / 100 + ' 元'
-      sums[2] = parseFloat(sums[2]).toFixed(2) + ' 元'
-      return sums
-    },
-    // 初始化外协厂家
-    fetchData() {
-      this.ManufacturerName = []
-      this.ManufacturerName2 = []
-      this.外协厂家 = []
-      initOutHelp().then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.ManufacturerName.push({
-            label: response.data[i].外协厂家名称,
-            value: response.data[i].外协厂家流水号
-          })
-          this.ManufacturerName2.push({
-            label: response.data[i].外协厂家名称,
-            value: response.data[i].外协厂家流水号
-          })
-          this.外协厂家.push({
-            label: response.data[i].外协厂家名称,
-            value: response.data[i].外协厂家流水号
-          })
-        }
-      })
-    },
-    // 查询表格数据
-    searchTable() {
-      this.loading = true
-      if (this.FormNumber === '' || this.FormNumber === null) {
-        this.FormNumber_check = false
-      } else {
-        this.FormNumber_check = true
-      }
-      if (this.ManufacturerNameValue === '' || this.ManufacturerNameValue === null) {
-        this.ManufacturerNameValue_check = false
-      } else {
-        this.ManufacturerNameValue_check = true
-      }
-      if (this.date1 === '' || this.date1 === null) {
-        this.date1_check = false
-      } else {
-        this.date1_check = true
-      }
-      if (this.date3 === '' || this.date3 === null) {
-        this.date3_check = false
-      } else {
-        this.date3_check = true
-      }
-      this.tableData = []
-      searchtable(this.FormNumber_check, this.FormNumber, this.ManufacturerNameValue_check, this.ManufacturerNameValue, this.date1_check, this.date1, this.date2, this.date3_check, this.date3, this.date4, this.pageCurrent, this.pageSize).then(response => {
-        for (let i = 0; i < response.data.rows.length; i++) {
-          response.data.rows[i].任务下达日期 = response.data.rows[i].任务下达日期.substring(0, response.data.rows[i].任务下达日期.indexOf(' '))
-          response.data.rows[i].实际付款时间 = response.data.rows[i].实际付款时间.substring(0, response.data.rows[i].实际付款时间.indexOf(' '))
-        }
-        this.tableData = response.data.rows
-        this.total = response.data.total
-      }).then(() => {
-        this.loading = false
-      })
-    },
-    // 付款
-    payment(index, row) {
-      this.$confirm('请仔细核对信息，确定后不可更改, 是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'success'
-      }).then(() => {
-        var time = new Date()
-        var month = time.getMonth() + 1
-        var day = time.getDate()
-        if (month >= 1 && month <= 9) {
-          month = '0' + month
-        }
-        if (day >= 1 && day <= 9) {
-          day = '0' + day
-        }
-        this.实际付款时间 = time.getFullYear() + '/' + month + '/' + day
-        payTime(row.外协加工任务单流水号, this.实际付款时间).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('付款成功')
-            this.searchTable()
-          } else {
-            this.$message.error('付款失败')
-          }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消付款'
-        })
-      })
-    },
-    // 打开扣款编辑
-    Withdrawing(index, row) {
-      if (this.$refs['form2'] !== undefined) {
-        this.$refs['form2'].resetFields()
-      }
-      this.form2.质量 = row.扣款_质量
-      this.form2.计划 = row.扣款_计划
-      this.form2.其他 = row.扣款_其他
-      this.form2.扣款说明 = row.扣款说明
-      this.liushuihao = row.外协加工任务单流水号
-      this.dialogFormVisible2 = true
-    },
-    // 扣款编辑确定
-    submit2(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          this.WithdrawingEdit()
-        }
-      })
-    },
-    // 扣款编辑
-    WithdrawingEdit() {
-      WithdrawingEdit(this.liushuihao, this.form2.质量, this.form2.扣款说明).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('修改成功')
-          this.searchTable()
-        } else {
-          this.$message.error('修改失败')
-        }
-        this.dialogFormVisible2 = false
-      })
-    },
-    // 关闭扣款编辑
-    callOff2(formName) {
-      this.dialogFormVisible2 = false
-      this.$refs[formName].resetFields()
-    },
-    // 获取表格2数据
+    // 获取表格1数据
     getParts() {
+      this.loading = true
+      this.tableData = []
+      var check
+      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
+          this.total = response.data.total
+        }
+      })
+    },
+    rowClick(row) {
+      this.外协厂家流水号 = row.外协厂家流水号
       this.loading2 = true
       this.tableData2 = []
-      let check
-      this.ManufacturerNameValue2 ? check = 1 : check = 0
-      getParts(check, this.ManufacturerNameValue2, this.pageCurrent2, this.pageSize2).then(response => {
+      this.loading3 = true
+      this.tableData3 = []
+      getInvoice(row.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
+        console.log(response.data, 2)
+        this.loading2 = false
+        if (response.data.rows.length !== 0) {
+          this.tableData2 = response.data.rows
+          this.total2 = response.data.total
+        }
+      })
+      getPayment(this.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
+        console.log(response.data, 3)
+        this.loading3 = false
+        if (response.data.rows.length !== 0) {
+          this.tableData3 = response.data.rows
+          this.total3 = response.data.total
+        }
+      })
+    },
+    // 发票
+    getInvoice(row) {
+      this.loading2 = true
+      this.tableData2 = []
+      getInvoice(this.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
+        console.log(response.data, 2)
         this.loading2 = false
         if (response.data.rows.length !== 0) {
-          for (let i = 0; i < response.data.rows.length; i++) {
-            response.data.rows[i].开票时间 = response.data.rows[i].开票时间.substring(0, response.data.rows[i].开票时间.indexOf(' '))
-            response.data.rows[i].接收时间 = response.data.rows[i].接收时间.substring(0, response.data.rows[i].接收时间.indexOf(' '))
-          }
           this.tableData2 = response.data.rows
           this.total2 = response.data.total
         }
       })
     },
-    getParts2() {
-      this.loading2 = true
-      this.tableData2 = []
-      getParts(this.zhongjianbianliang, this.pageCurrent2, this.pageSize2).then(response => {
-        for (let i = 0; i < response.data.rows.length; i++) {
-          response.data.rows[i].开票时间 = response.data.rows[i].开票时间.substring(0, response.data.rows[i].开票时间.indexOf(' '))
-          response.data.rows[i].接收时间 = response.data.rows[i].接收时间.substring(0, response.data.rows[i].接收时间.indexOf(' '))
+    // 付款
+    getPayment(row) {
+      this.loading3 = true
+      this.tableData3 = []
+      getPayment(this.外协厂家流水号, this.pageCurrent2, this.pageSize2).then(response => {
+        console.log(response.data, 3)
+        this.loading3 = false
+        if (response.data.rows.length !== 0) {
+          this.tableData3 = response.data.rows
+          this.total3 = response.data.total
         }
-        this.tableData2 = response.data.rows
-        this.total2 = response.data.total
-      }).then(() => {
-        this.loading2 = false
       })
     },
     // 点击增加
-    editType1(formName) {
-      this.count1 = this.count1 + 1
-      if (this.count1 !== 1) {
-        this.$refs[formName].resetFields()
-      }
-      this.title1 = '到票'
-      // this.renwudan = row.外协加工任务单流水号
-      this.form.发票号 = ''
-      this.form.开户行 = ''
-      this.form.开票时间 = ''
-      this.form.开票金额 = ''
-      this.form.接收人 = ''
-      this.form.接收时间 = ''
-      this.form.备注 = ''
-      this.form.外协厂家 = ''
-      this.dialogFormVisible = true
+    handleAdd1(formName) {
+      this.form1.发票号 = ''
+      this.form1.开票时间 = ''
+      this.form1.开票金额 = ''
+      this.form1.外协厂家 = ''
+      this.dialogFormVisible1 = true
     },
     // 增加确定
-    editType() {
-      edittype(this.form.外协厂家, this.form.发票号, this.form.开户行, this.form.开票时间, this.form.开票金额, this.form.接收人, this.form.接收时间, this.form.备注).then(response => {
+    AddType1() {
+      AddType1(this.外协厂家流水号, this.form.发票号, this.form.开票时间, this.form.开票金额, this.form.外协厂家).then(response => {
         if (response.data[0].result === '1') {
           this.$notify({
             title: '成功',
@@ -642,31 +267,19 @@ export default {
           this.$message.error('信息增加失败')
         }
       })
-      this.dialogFormVisible = false
+      this.dialogFormVisible1 = false
     },
     // 编辑打开
     handleChange1(index, row, formName) {
-      this.count2 = this.count2 + 1
-      if (this.count2 !== 1) {
-        this.$refs[formName].resetFields()
-      }
-      if (row.开票时间 === '1900/1/1') {
-        row.开票时间 = ''
-      }
-      if (row.接收时间 === '1900/1/1') {
-        row.接收时间 = ''
-      }
-      this.form.外协厂家 = row.外协厂家流水号
-      this.form.发票号 = row.发票号
-      this.form.开户行 = row.开户行
-      this.form.开票时间 = row.开票时间
-      this.form.开票金额 = row.开票金额
-      this.form.接收人 = row.接收人
-      this.form.接收时间 = row.接收时间
-      this.form.备注 = row.备注
-      this.dialogFormVisible = true
-      this.title1 = '编辑'
-      this.CoManufacturerFlowNumber1 = row.id
+      this.form1.外协厂家 = row.外协厂家流水号
+      this.form1.发票号 = row.发票号
+      this.form1.开户行 = row.开户行
+      this.form1.开票时间 = row.开票时间
+      this.form1.开票金额 = row.开票金额
+      this.form1.接收人 = row.接收人
+      this.form1.接收时间 = row.接收时间
+      this.form1.备注 = row.备注
+      this.dialogFormVisible1 = true
     },
     // 编辑确定
     handleChange() {
@@ -682,7 +295,7 @@ export default {
           this.$message.error('信息修改失败')
         }
       })
-      this.dialogFormVisible = false
+      this.dialogFormVisible1 = false
     },
     // 提交添加或者修改
     submit(formName) {
@@ -700,7 +313,7 @@ export default {
     },
     // 重置表单
     callOff(formName) {
-      this.dialogFormVisible = false
+      this.dialogFormVisible1 = false
       this.$refs[formName].resetFields()
     },
     // 删除
@@ -711,8 +324,8 @@ export default {
         type: 'warning'
       }).then(() => {
         handledelete(row.id).then(response => {
-          if (this.tableData2 && this.tableData2.length === 1 && this.pageCurrent2 > 1) {
-            this.pageCurrent2--
+          if (this.tableData && this.tableData.length === 1 && this.pageCurrent > 1) {
+            this.pageCurrent--
           }
           if (response.data[0].result === '1') {
             this.$notify({
@@ -736,21 +349,29 @@ export default {
     handleSizeChange(val) {
       this.pageCurrent = 1
       this.pageSize = val
-      this.searchTable()
+      this.getParts()
     },
     handleCurrentChange(val) {
       this.pageCurrent = val
-      this.searchTable()
+      this.getParts()
     },
     handleSizeChange2(val) {
       this.pageCurrent2 = 1
       this.pageSize2 = val
-      this.getParts()
+      this.getInvoice()
     },
     handleCurrentChange2(val) {
       this.pageCurrent2 = val
-      this.tableData2 = []
-      this.getParts()
+      this.getInvoice()
+    },
+    handleSizeChange3(val) {
+      this.pageCurrent3 = 1
+      this.pageSize3 = val
+      this.getPayment()
+    },
+    handleCurrentChange3(val) {
+      this.pageCurrent3 = val
+      this.getPayment()
     }
   }
 }
@@ -764,4 +385,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 e6caf6e8..942a7e79 100644
--- a/src/views/Outsourcing/OutsourcingQCSearch/index.vue
+++ b/src/views/Outsourcing/OutsourcingQCSearch/index.vue
@@ -1,11 +1,10 @@
 <template>
   <div class="app-container">
     <el-card>
-
-      <el-input v-model="orderNumber" clearable style="width: 200px;margin:0px 10px" placeholder="请输入外协到货单" size="small"/>
+      <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-input v-model="outsourcingSupplier" clearable style="width: 200px;margin:0px 10px" placeholder="请输入外协厂家" size="small"/>-->
+      <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">
@@ -20,7 +19,7 @@
         </el-table-column>
         <el-table-column label="创建日期" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.操作日期 }}
+            {{ scope.row.操作日期.split(' ')[0] }}
           </template>
         </el-table-column>
       </el-table>
@@ -47,7 +46,7 @@
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件数量" align="center" width="70px">
+        <el-table-column label="零件数" align="center" width="70px">
           <template slot-scope="scope">
             {{ scope.row.批次数量 }}
           </template>
@@ -57,12 +56,12 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="检验数量" align="center" width="70px">
+        <el-table-column label="检验数" align="center" width="70px">
           <template slot-scope="scope">
             {{ scope.row.数量 || 0 }}
           </template>
         </el-table-column>
-        <el-table-column label="不合格数量" align="center" min-width="140px">
+        <el-table-column label="不合格数" align="center" min-width="140px">
           <template slot-scope="scope">
             {{ scope.row.不合格数量 || 0 }}
           </template>
@@ -79,7 +78,7 @@
         </el-table-column>
         <el-table-column label="检验时间" align="center" min-width="135px">
           <template slot-scope="scope">
-            {{ scope.row.操作时间 || '—' }}
+            {{ scope.row.操作时间.split(' ')[0] || '—' }}
           </template>
         </el-table-column>
         <el-table-column label="形位" align="center" width="90px">
@@ -103,7 +102,7 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(1, scope.row.外协到货单明细流水号)">形位</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(1, scope.row.外协到货单明细流水号)">形位</el-button>
             </el-popover>
           </template>
         </el-table-column>
@@ -128,7 +127,7 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(2, scope.row.外协到货单明细流水号)">尺寸</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(2, scope.row.外协到货单明细流水号)">尺寸</el-button>
             </el-popover>
           </template>
         </el-table-column>
@@ -153,7 +152,7 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" plain size="mini" icon="el-icon-search" @click="searchTableDetail(3, scope.row.外协到货单明细流水号)">外观</el-button>
+              <el-button slot="reference" type="text" plain size="mini" icon="el-icon-search" @click="searchTableDetail(3, scope.row.外协到货单明细流水号)">外观</el-button>
             </el-popover>
           </template>
         </el-table-column>
diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue
index ada8a541..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,8 @@
         <!--<el-input v-model="formNumber" size="small" placeholder="表单号" clearable style="width:200px;margin-bottom: 10px"/>-->
         <span>厂家:</span>
         <el-input v-model="manufacturers" size="small" placeholder="外协厂家" style="width:160px" clearable @keyup.enter.native="pageSize=20;pageList=1;fetchData()" @clear="pageSize=20;pageList=1;fetchData()"/>
-        <el-button type="success" size="mini" icon="el-icon-search" style="margin-left:10px" @click="pageSize=20;pageList=1;fetchData()">查询</el-button>
+        <el-button type="primary" size="mini" icon="el-icon-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" >
           <el-table-column label="表单号" prop="表单号" align="center" min-width="155px">
@@ -138,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] }}
@@ -274,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" >
@@ -341,6 +342,7 @@ export default {
   },
   data() {
     return {
+      isChecked: false,
       bianliang: [],
       card: false,
       费用: '',
@@ -536,7 +538,7 @@ export default {
       }
       this.List = []
       this.List3 = []
-      getTable(this.num, this.formNumber, this.num1, this.manufacturers, this.num2, this.time1, this.time2, this.id, this.pageList, this.pageSize, this.documentStatus, this.num3).then(response => {
+      getTable(this.num, this.formNumber, this.num1, this.manufacturers, this.num2, this.time1, this.time2, this.id, this.pageList, this.pageSize, this.documentStatus, this.num3, this.isChecked).then(response => {
         this.total = parseInt(response.data.total)
         for (let i = 0; i < response.data.rows.length; i++) {
           if (response.data.rows[i].任务下达日期 !== null) {
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/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/FundApproval2/index.vue b/src/views/PurchasingCenter/FundApproval2/index.vue
index 088e2ea1..5e273469 100644
--- a/src/views/PurchasingCenter/FundApproval2/index.vue
+++ b/src/views/PurchasingCenter/FundApproval2/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <h3 style="margin-top: 0">采购合同</h3>
-      <el-table v-loading="" :data="tableData1" border style="width: 100%;max-height: 300px;" height="300px" size="mini" highlight-current-row @row-click="searchTable01">
+      <el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 300px;" height="300px" size="mini" highlight-current-row @row-click="searchTable01">
         <el-table-column label="供应商" align="center" min-width="170">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -25,8 +25,8 @@
         </el-table-column>
         <el-table-column label="审核" align="center" width="200">
           <template slot-scope="scope">
-            <el-button type="warning" plain size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
-            <el-button type="danger" plain size="mini" icon="el-icon-close" @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>
@@ -45,7 +45,7 @@
     <h3 style="">合同明细</h3>
     <el-row>
       <el-col :span="8">
-        <el-table :data="gridData1" :summary-method="getSummaries2" border highlight-current-row size="mini" show-summary @row-click="searchContactDetail">
+        <el-table :data="gridData1" :summary-method="getSummaries2" border stripe highlight-current-row size="mini" show-summary @row-click="searchContactDetail">
           <el-table-column min-width="150" align="center" label="合同编号">
             <template slot-scope="scope">
               {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
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/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.采购零件名称 }}
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/MaterialManagement/index.vue b/src/views/PurchasingCenter/MaterialManagement/index.vue
index e4b936b4..cce0a192 100644
--- a/src/views/PurchasingCenter/MaterialManagement/index.vue
+++ b/src/views/PurchasingCenter/MaterialManagement/index.vue
@@ -115,22 +115,23 @@
         </el-col>
         <el-col style="width: 600px">
           <el-button
-            type="success"
+            type="primary"
             icon="el-icon-search"
             size="small"
             style="margin-left: 10px"
+            plain
             @click="pageCurrent=1;searchMaterial()">查询
           </el-button>
-          <el-button :disabled="token !== 11 && token !== 36" type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增</el-button>
+          <el-button :disabled="token !== 11 && token !== 36" class="button111" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">新增</el-button>
           <el-button
             :disabled="token !== 11 && token !== 36"
-            type="warning"
+            class="button111"
             icon="el-icon-refresh"
             size="small"
             style="margin:10px 5px 3px"
             @click="CategoryMaintenance">维护物料类别
           </el-button>
-          <el-button type="primary" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="open()">新增供货商</el-button>
+          <el-button class="button111" style="margin-bottom: 3px;margin-top: 10px" icon="el-icon-circle-plus-outline" size="small" @click="open()">新增供货商</el-button>
           <el-badge :value="weishenhe" class="item">
             <el-button type="primary" plain size="small" @click="daishenhe()">采购部新增物料审核</el-button>
           </el-badge>
@@ -1024,3 +1025,20 @@ export default {
     width:190px
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/PurchasingCenter/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/PurchaseContractApproval/index.vue b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
index 0f3d9c22..6fdae74f 100644
--- a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
@@ -23,7 +23,8 @@
       <span>供应商:</span>
       <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>
       <el-button
-        type="success"
+        type="primary"
+        plain
         size="small"
         icon="el-icon-search"
         style="margin-left:10px"
@@ -99,7 +100,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" plain 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/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/PurchaseMaterielModify/index.vue b/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
index 1afdf371..31d46ede 100644
--- a/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
+++ b/src/views/PurchasingCenter/PurchaseMaterielModify/index.vue
@@ -47,12 +47,14 @@
           <template slot-scope="scope">
             <el-button
               size="mini"
-              type="primary"
+              type="text"
               class="el-icon-edit"
+              icon="el-icon-circle-check"
               @click="handleEdit1(scope.$index, scope.row)">同意</el-button>
             <el-button
               size="mini"
-              type="danger"
+              type="text"
+              icon="el-icon-circle-close"
               class="el-icon-edit"
               @click="handleEdit2(scope.$index, scope.row)">不同意</el-button>
           </template>
diff --git a/src/views/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 017c40fa..bf7cc776 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -86,7 +86,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;">-->
@@ -134,7 +134,7 @@
                 <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" style="color: #909399" 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" width="160px" show-overflow-tooltip>
@@ -222,6 +222,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/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue
index 3d0db642..f11d35ea 100644
--- a/src/views/TechnologyCenter/CreatePackingList/index.vue
+++ b/src/views/TechnologyCenter/CreatePackingList/index.vue
@@ -10,10 +10,10 @@
           :value="item.value"/>
       </el-select>
       <el-tooltip :open-delay="1000" effect="dark" content="新增项目装箱单" placement="top">
-        <el-button type="primary" size="small" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addReceipt">新增</el-button>
+        <el-button class="button111" size="small" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addReceipt">新增</el-button>
       </el-tooltip>
       <el-tooltip :open-delay="1000" effect="dark" content="打印装箱单" placement="top">
-        <el-button type="warning" size="small" style="margin-left: 10px" icon="el-icon-download" @click="exportTable()">导出</el-button>
+        <el-button type="primary" size="small" style="margin-left: 10px" plain icon="el-icon-download" @click="exportTable()">导出</el-button>
       </el-tooltip>
       <el-table
         v-loading="loading"
@@ -85,12 +85,11 @@
     </el-card>
 
     <el-card >
-      <el-button :disabled="!disabled" plain type="primary" style="margin-top: 3px" size="small" icon="el-icon-circle-plus-outline" @click="addMachine">添加主机</el-button>
+      <el-button :disabled="!disabled" class="button111" style="margin-top: 3px" size="small" icon="el-icon-circle-plus-outline" @click="addMachine">添加主机</el-button>
       <el-table
         v-loading="loading"
         :data="machineTableData"
         border
-        stripe
         highlight-current-row
         size="mini"
         height="170px"
@@ -200,12 +199,11 @@
     </el-card>
 
     <el-card >
-      <el-button :disabled="!disabled" type="primary" style="margin-top: 3px" plain size="small" icon="el-icon-circle-plus-outline" @click="addSpare">添加备件</el-button>
+      <el-button :disabled="!disabled" class="button111" style="margin-top: 3px" size="small" icon="el-icon-circle-plus-outline" @click="addSpare">添加备件</el-button>
       <el-table
         v-loading="loading"
         :data="spareData"
         border
-        stripe
         highlight-current-row
         height="170px"
         size="mini"
@@ -269,13 +267,12 @@
     </el-card>
 
     <el-card >
-      <el-button :disabled="!disabled" plain type="primary" size="small" style="margin-top: 3px" icon="el-icon-circle-plus-outline" @click="addFile">添加文件</el-button>
+      <el-button :disabled="!disabled" class="button111" size="small" style="margin-top: 3px" icon="el-icon-circle-plus-outline" @click="addFile">添加文件</el-button>
       <el-table
         v-loading="fileLoading"
         :data="fileData"
         border
         highlight-current-row
-        stripe
         height="170px"
         size="mini"
         style="margin-top:3px;margin-bottom: 0">
@@ -1085,3 +1082,21 @@ span{
     }
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
index 7b9fc65f..369eb38a 100644
--- a/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
+++ b/src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
@@ -49,8 +49,8 @@
           width="50"/>
         <el-table-column align="center" label="物料状态" min-width="90">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.物料流水号===null" type="warning" size="mini">不存在</el-tag>
-            <el-tag v-if="scope.row.物料流水号!==null" type="primary" size="mini">存在</el-tag>
+            <span v-if="scope.row.物料流水号===null" type="warning" size="mini">不存在</span>
+            <span v-if="scope.row.物料流水号!==null" type="primary" size="mini">存在</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="图号" min-width="120">
@@ -58,7 +58,7 @@
             {{ scope.row.图号或者型号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="名称" min-width="80">
+        <el-table-column align="center" label="名称" min-width="80" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.名称 }}
           </template>
@@ -137,8 +137,7 @@
         size="mini"
         highlight-current-row
         height="150"
-        border
-        stripe>
+        border>
         <el-table-column
           label="序号"
           align="center"
@@ -168,7 +167,8 @@
           <template slot-scope="scope">
             <el-button
               size="mini"
-              type="primary"
+              type="text"
+              icon="el-icon-sort"
               @click="handle(scope.row)">替换
             </el-button>
           </template>
@@ -784,9 +784,9 @@ export default {
   .el-table .warning-row {
     background: red;
   }
-  .rgb196{
-    background: palevioletred !important;
-  }
+  /*.rgb196{*/
+  /*  background: palevioletred !important;*/
+  /*}*/
 </style>
 
 <style scoped>
diff --git a/src/views/TechnologyCenter/ImportParts/UploadExcel/index.vue b/src/views/TechnologyCenter/ImportParts/UploadExcel/index.vue
index 49d7ce57..0f2728c5 100644
--- a/src/views/TechnologyCenter/ImportParts/UploadExcel/index.vue
+++ b/src/views/TechnologyCenter/ImportParts/UploadExcel/index.vue
@@ -3,7 +3,7 @@
     <input id="excel-upload-input" ref="excel-upload-input" type="file" multiple="multiple" accept=".xlsx, .xls" class="c-hide" @change="handkeFileChange">
     <div id="drop" @drop="handleDrop" @dragover="handleDragover" @dragenter="handleDragover">
       将Excel文件拖到这或
-      <el-button style="margin-left:16px;" size="small" icon="el-icon-search" type="success" @click="handleUpload">浏览</el-button>
+      <el-button style="margin-left:16px;" size="small" icon="el-icon-search" type="primary" plain @click="handleUpload">浏览</el-button>
     </div>
   </div>
 </template>
diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue
index dabe83fe..6f0f332a 100644
--- a/src/views/TechnologyCenter/ImportParts/index.vue
+++ b/src/views/TechnologyCenter/ImportParts/index.vue
@@ -30,7 +30,7 @@
                   :label="item.label"
                   :value="item.value"/>
               </el-select>
-              <el-button type="primary" size="small" icon="el-icon-upload2" style="margin-left: 10px" @click="opendialogVisibleMachine()">上传总图</el-button>
+              <el-button class="button111" size="small" icon="el-icon-upload2" style="margin-left: 10px" @click="opendialogVisibleMachine()">上传总图</el-button>
             </div>
             <upload-excel-component @on-selected-file="selected"/>
           </div>
@@ -490,3 +490,21 @@ a{
   color: #999;
 }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue
index 520c9ec6..bb1ce005 100644
--- a/src/views/TechnologyCenter/ImportParts/specificationData.vue
+++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue
@@ -52,8 +52,8 @@
               width="50"/>
             <el-table-column align="center" label="物料状态" min-width="70">
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.物料流水号===null" type="warning" size="mini" style="margin: 0px">不存在</el-tag>
-                <el-tag v-if="scope.row.物料流水号!==null" type="primary" size="mini" style="margin: 0px">存在</el-tag>
+                <span v-if="scope.row.物料流水号===null" type="warning" size="mini" style="margin: 0px">不存在</span>
+                <span v-if="scope.row.物料流水号!==null" type="primary" size="mini" style="margin: 0px">存在</span>
               </template>
             </el-table-column>
             <el-table-column align="center" label="图号" min-width="100" show-overflow-tooltip>
@@ -66,7 +66,7 @@
                 {{ scope.row.名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="材料" width="70">
+            <el-table-column align="center" label="材料" width="70" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.材料或者规格 }}
               </template>
@@ -76,32 +76,32 @@
                 {{ scope.row.规格 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="备件数量" width="70">
+            <el-table-column align="center" label="备件数量" width="70" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.备件数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="装机数量" width="70">
+            <el-table-column align="center" label="装机数量" width="70" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.装机数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="部件数量" width="70">
+            <el-table-column align="center" label="部件数量" width="70" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.部件数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="制造商" min-width="100">
+            <el-table-column align="center" label="制造商" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.制造商 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="备注" width="80">
+            <el-table-column align="center" label="备注" width="80" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="分类码" width="80">
+            <el-table-column align="center" label="分类码" width="80" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.分类码 }}
               </template>
@@ -142,8 +142,7 @@
             size="mini"
             height="530px"
             highlight-current-row
-            border
-            stripe>
+            border>
             <el-table-column align="center" label="物料名称" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.物料名称 }}
@@ -168,7 +167,8 @@
               <template slot-scope="scope">
                 <el-button
                   size="mini"
-                  type="primary"
+                  type="text"
+                  icon="el-icon-sort"
                   @click="handle(scope.row)">替换
                 </el-button>
               </template>
@@ -657,9 +657,9 @@ export default {
 </script>
 
 <style>
-  .rgb196{
-    background: palevioletred !important;
-  }
+  /*.rgb196{*/
+  /*   background: palevioletred !important;*/
+  /* }*/
 </style>
 
 <style scoped>
diff --git a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
index c84da4e1..10a0e1e4 100644
--- a/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
+++ b/src/views/TechnologyCenter/PartDrawingMaintenance/index.vue
@@ -33,7 +33,7 @@
           :value="item.value"/>
       </el-select>
 
-      <el-button icon="el-icon-search" type="success" size="small" @click="pageCurrentWB = 1;pageSizeWB = 10;pageCurrent = 1;pageSize = 10;getTableData()">查询</el-button>
+      <el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrentWB = 1;pageSizeWB = 10;pageCurrent = 1;pageSize = 10;getTableData()">查询</el-button>
       <el-upload
         :disabled="disabled"
         :action="action"
@@ -44,7 +44,7 @@
         style="float: right; margin: 0px 50px"
         class="upload-demo"
         multiple>
-        <el-button type="success" size="small" style="float: right; margin: 0px 50px" @click="batchImportOfDrawings">图纸批量导入</el-button>
+        <el-button type="primary" size="small" style="float: right; margin: 0px 50px" plain @click="batchImportOfDrawings">图纸批量导入</el-button>
       </el-upload>
     </el-card>
     <el-card>
@@ -87,8 +87,8 @@
         </el-table-column>
         <el-table-column label="是否导入" align="center">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否导入)===1" type="success">已导入</el-tag>
-            <el-tag v-else type="danger">未导入</el-tag>
+            <span v-if="Number(scope.row.是否导入)===1" type="success">已导入</span>
+            <span v-else type="danger">未导入</span>
           </template>
         </el-table-column>
         <el-table-column min-width="50px" label="零件图纸" align="center">
@@ -107,7 +107,7 @@
               :file-list="fileList"
               class="upload-demo"
               multiple>
-              <el-button :disabled="disabled" size="mini" type="primary" round @click="getAction(scope.row)">点击上传</el-button>
+              <el-button :disabled="disabled" size="mini" type="text" icon="el-icon-upload2" round @click="getAction(scope.row)">点击上传</el-button>
             </el-upload>
           </template>
         </el-table-column>
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index 4fe01283..7485effd 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -26,7 +26,7 @@
           :value="item.value"/>
       </el-select>
       <el-button icon="el-icon-search" type="primary" plain size="small" @click="pageCurrentWB = 1;pageSizeWB = 1000;pageCurrent = 1;pageSize = 1000;getTableData()">查询</el-button>
-      <el-button icon="el-icon-circle-plus-outline" type="warning" plain size="small" @click="openUrgentItem()">加急件</el-button>
+      <el-button icon="el-icon-circle-plus-outline" class="button111" size="small" @click="openUrgentItem()">加急件</el-button>
     </el-card>
     <el-card>
       <div v-for="(file, key) in hadFile" :key="key">
@@ -78,7 +78,8 @@
           label="零件名称"
           align="center"
           prop="零件名称"
-          min-width="140px">
+          min-width="140px"
+          show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.零件名称 }}</template>
         </el-table-column>
         <el-table-column
@@ -107,13 +108,15 @@
         <el-table-column
           label="材料"
           prop="材料"
-          align="center">
+          align="center"
+          show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.材料 }}</template>
         </el-table-column>
         <el-table-column
           label="规格"
           prop="规格"
-          align="center">
+          align="center"
+          show-overflow-tooltip>
           <template slot-scope="scope">{{ scope.row.规格 }}</template>
         </el-table-column>
         <el-table-column
@@ -146,10 +149,9 @@
             <el-button
               :disabled="Number(id)!==0"
               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>
@@ -245,8 +247,7 @@
             <el-button
               :disabled="Number(id)!==0"
               size="mini"
-              plain
-              type="danger"
+              type="text"
               icon="el-icon-delete"
               @click="handleDelete(scope.row)">删除</el-button>
           </template>
@@ -570,3 +571,20 @@ a{
    margin: 0px !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/WorkshopProcurement/AccountingPrice/index.vue b/src/views/WorkshopProcurement/AccountingPrice/index.vue
index 6337f64a..1fc3c073 100644
--- a/src/views/WorkshopProcurement/AccountingPrice/index.vue
+++ b/src/views/WorkshopProcurement/AccountingPrice/index.vue
@@ -23,6 +23,7 @@
         highlight-current-row
         min-height="540px"
         height="540px"
+        stripe
         border>
         <el-table-column align="center" label="采购合同编号" width="150px">
           <template slot-scope="scope">
diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
index ee12874c..2b18f320 100644
--- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
+++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
@@ -38,8 +38,8 @@
           placeholder="规定到货时间"/>
         <el-input v-model="name" placeholder="采购员" style="width: 120px" size="small" readonly/>
         <el-input v-model="taxRate" placeholder="税率" style="width: 120px" size="small"/>
-        <el-button v-show="contractNumType===0" type="success" size="small" @click="linkGroup">成组采购</el-button>
-        <el-button v-show="contractNumType===1" type="danger" size="small" @click="unLinkGroup">取消成组采购</el-button>
+        <el-button v-show="contractNumType===0" type="primary" plain size="small" @click="linkGroup">成组采购</el-button>
+        <el-button v-show="contractNumType===1" type="danger" plain size="small" @click="unLinkGroup">取消成组采购</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -139,7 +139,7 @@
         </el-table-column>
       </el-table>
       <el-button
-        type="shengcheng"
+        class="button111"
         size="small"
         style="margin-top:10px"
         @click="calculateContractSum">计算合同总额</el-button>
@@ -158,7 +158,7 @@
           :value="item.value"/>
       </el-select>
       <el-button
-        type="shengcheng"
+        class="button111"
         size="small"
         style="margin-left: 7.5%; margin-top: 10px"
         @click="doneContract">生成采购合同</el-button>
@@ -744,3 +744,21 @@ export default {
     margin-bottom: 5px;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index b1370518..0b5da0b1 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -4,7 +4,7 @@
       <el-col>
         <el-input v-model="partDrawingNumber" placeholder="零件图号" size="small" clearable style="margin: 3px 0" @keyup.enter.native="searchTable1"/>
         <el-tooltip :open-delay="1200" effect="dark" content="查询备料零件" placement="top">
-          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
+          <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
         </el-tooltip>
         <el-tooltip :open-delay="1200" effect="dark" content="将零件打回重新分配备料计划" placement="top">
           <el-button type="danger" size="small" icon="el-icon-download" plain style="margin-left: 10px;float: right;" @click="back">打回重新分配</el-button>
@@ -82,22 +82,22 @@
         <!--<el-tooltip :open-delay="1200" effect="dark" content="查询采购计划单" placement="top">-->
         <!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>-->
         <!--</el-tooltip>-->
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchTable2">查询</el-button>
-        <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addPurchaseOrder">新增</el-button>
+        <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable2">查询</el-button>
+        <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addPurchaseOrder">新增</el-button>
         <el-tooltip :open-delay="1200" effect="dark" content="向选择的采购计划里添加采购零件" placement="top">
-          <el-button type="success" size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
+          <el-button type="primary" plain size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
         </el-tooltip>
         <el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">
-          <el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 140px" @click="saveMateriel">保存</el-button>
+          <el-button type="success" size="small" icon="el-icon-download" plain style="margin-left: 140px" @click="saveMateriel">保存</el-button>
         </el-tooltip>
       </div>
       <el-table v-loading="" :data="tableData2" border stripe style="max-height: 460px;" height="200px" size="mini" highlight-current-row @row-click="searchTable3">
         <el-table-column label="备料状态" prop="采购计划状态" align="center" width="75" fixed="left">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">编辑中</el-tag>
-            <el-tag v-if="Number(scope.row.采购计划状态)===1" type="primary" size="mini">已保存</el-tag>
-            <el-tag v-if="Number(scope.row.采购计划状态)===3" type="success" size="mini">已到货</el-tag>
-            <el-tag v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</el-tag>
+            <span v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">编辑中</span>
+            <span v-if="Number(scope.row.采购计划状态)===1" type="primary" size="mini">已保存</span>
+            <span v-if="Number(scope.row.采购计划状态)===3" type="success" size="mini">已到货</span>
+            <span v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</span>
           </template>
         </el-table-column>
         <el-table-column label="外购备料单号" prop="采购单号" align="center" width="120">
@@ -130,22 +130,22 @@
           <template slot-scope="scope">
             <el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top">
               <div style="display: inline-block">
-                <el-button size="mini" type="success" plain icon="el-icon-download" @click="exportExcel2(scope.row)">导出</el-button>
+                <el-button size="mini" style="margin-left: 10px" type="text" icon="el-icon-download" @click="exportExcel2(scope.row)">导出</el-button>
               </div>
             </el-tooltip>
-            <el-tooltip :open-delay="1200" effect="dark" content="打印" placement="top">
+            <el-tooltip :open-delay="1200" effect="text" content="打印" placement="top">
               <div style="display: inline-block">
-                <el-button size="mini" type="success" plain icon="el-icon-printer" @click="exportExcel(scope.row)">打印</el-button>
+                <el-button size="mini" type="text" style="margin-left: 10px" icon="el-icon-printer" @click="exportExcel(scope.row)">打印</el-button>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="primary" plain size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)">编辑</el-button>
+                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="text" style="margin-left: 10px" size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)"/>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
               <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="primary" plain size="mini" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)">删除</el-button>
+                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="text" style="margin-left: 10px" size="mini" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)"/>
               </div>
             </el-tooltip>
           </template>
@@ -173,12 +173,12 @@
           @size-change="handleSizeChange2"
           @current-change="handleCurrentChange2"/>
       </div>
-      <el-table v-loading="" :data="tableData3" border highlight-current-row stripe style="margin: 3px 0" height="455px" size="mini">
+      <el-table v-loading="" :data="tableData3" border highlight-current-row style="margin: 3px 0" height="455px" size="mini">
         <el-table-column label="备料状态" align="center" width="80">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</el-tag>
-            <el-tag v-if="Number(scope.row.是否到货)===1" type="success" size="mini">已到货</el-tag>
-            <el-tag v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</el-tag>
+            <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</span>
+            <span v-if="Number(scope.row.是否到货)===1" type="success" size="mini">已到货</span>
+            <span v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</span>
           </template>
         </el-table-column>
         <el-table-column label="物料编码" prop="物料零件编码" align="center" width="150" show-overflow-tooltip>
@@ -220,7 +220,7 @@
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="移出" placement="top">
               <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" type="info" size="mini" icon="el-icon-right" plain @click="deleteMateriel(scope.row)">移出</el-button>
+                <el-button :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" type="text" size="mini" icon="el-icon-right" @click="deleteMateriel(scope.row)">移出</el-button>
               </div>
             </el-tooltip>
           </template>
@@ -907,3 +907,21 @@ export default {
     top: 5px;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/WorkshopProcurement/FundApproval2/index.vue b/src/views/WorkshopProcurement/FundApproval2/index.vue
index 493825db..a138a8e3 100644
--- a/src/views/WorkshopProcurement/FundApproval2/index.vue
+++ b/src/views/WorkshopProcurement/FundApproval2/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <h3>采购合同</h3>
-      <el-table v-loading="" :data="tableData" border style="width: 100%;max-height: 500px;" height="300px" size="mini">
+      <el-table v-loading="" :data="tableData" border stripe style="width: 100%;max-height: 500px;" height="300px" size="mini">
         <el-table-column label="供应商" align="center" min-width="170">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
index 78b9a42c..9acc2c18 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
@@ -3,13 +3,13 @@
     <el-card>
       <span>发票号:</span>
       <el-input v-model="invoiceNum" placeholder="发票号" size="small" clearable/>
-      <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
-      <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">创建</el-button>
+      <el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+      <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">创建</el-button>
     </el-card>
 
     <el-card>
       <h4 style="margin-top: 5px">发票结算申请单</h4>
-      <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%;" height="350px" size="mini" @row-click="searchTable2">
+      <el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;" height="350px" size="mini" @row-click="searchTable2">
         <el-table-column label="详情" type="expand">
           <template slot-scope="scope">
             <el-form label-position="left" inline class="demo-table-expand">
@@ -99,9 +99,17 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="300" fixed="right">
           <template slot-scope="scope">
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="warning" plain icon="el-icon-edit" size="mini" style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="danger" plain icon="el-icon-delete" size="mini" style="margin-left:10px" @click="handleDelete(scope.row)">删除</el-button>
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="warning" plain size="mini" style="margin-left:10px" @click="submitApply(scope.row)">提交申请</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
+              <div style="display: inline-block">
+                <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-edit-outline" size="mini" style="margin-left:10px" @click="handleEdit(scope.row)"/>
+              </div>
+            </el-tooltip>
+            <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
+              <div style="display: inline-block">
+                <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-delete" size="mini" style="margin-left:10px" @click="handleDelete(scope.row)"/>
+              </div>
+            </el-tooltip>
+            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-circle-check" size="mini" style="margin-left:10px" @click="submitApply(scope.row)">提交申请</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -122,7 +130,7 @@
       <h4 style="margin-top: 5px;display: inline-block;width: 150px;">发票结算申请单明细</h4>
       <span>发票号：</span>
       <el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/>
-      <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
+      <el-button :disabled="disabled" class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
       <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
         <el-table-column label="名称" align="center" width="150">
           <template slot-scope="scope">
@@ -166,7 +174,11 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope">
-            <el-button :disabled="disabled" type="danger" size="mini" icon="el-icon-delete" @click="deleteTable2(scope.row)">删除</el-button>
+            <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
+              <div style="display: inline-block">
+                <el-button :disabled="disabled" type="text" size="mini" icon="el-icon-delete" @click="deleteTable2(scope.row)"/>
+              </div>
+            </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
@@ -753,3 +765,21 @@ export default {
     margin: 0;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue
index 8d440fcb..8219ae73 100644
--- a/src/views/WorkshopProcurement/NewArrivalList/index.vue
+++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue
@@ -23,8 +23,8 @@
           range-separator="～"
           start-placeholder="开始日期"
           end-placeholder="结束日期"/>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
-        <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addArrivalOrder">新增到货单</el-button>
+        <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent4=1;pageSize4=10;total4=0;searchTable4()">查询</el-button>
+        <el-button class="button111" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="addArrivalOrder">新增到货单</el-button>
       </div>
     </el-card>
     <el-card style="width: 45%;float: left">
@@ -32,8 +32,8 @@
       <el-table v-loading="" :data="tableData4" border stripe style="width: 100%" height="230px" size="mini" highlight-current-row @row-click="searchTable5">
         <el-table-column label="关联情况" align="center" width="80">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否关联) === 1" type="success" size="mini">已结算</el-tag>
-            <el-tag v-else type="primary" size="mini">未结算</el-tag>
+            <span v-if="Number(scope.row.是否关联) === 1" type="success" size="mini">已结算</span>
+            <span v-else type="primary" size="mini">未结算</span>
           </template>
         </el-table-column>
         <el-table-column label="供应商" prop="供应商名称" align="center" width="260" show-overflow-tooltip>
@@ -54,7 +54,7 @@
         <el-table-column label="操作" align="center" width="170" fixed="right">
           <template slot-scope="scope">
             <el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 10px" icon="el-icon-circle-plus-outline" @click="addArrivalOrderMX(scope.row)">到货明细</el-button>
-            <el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalOrder(scope.row)">删除</el-button>
+            <el-button :disabled="Number(scope.row.是否关联) === 1" type="text" size="mini" style="margin-left: 20px" icon="el-icon-delete" @click="deleteArrivalOrder(scope.row)"/>
           </template>
         </el-table-column>
       <!--</el-tooltip>-->
@@ -85,7 +85,7 @@
     </el-card>
     <el-card style="width: 54%;float: left;margin-left: 10px">
       <span>到货单明细</span>
-      <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>
+      <el-button type="primary" plain size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>
       <!--<el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel()">导出</el-button>-->
       <el-table
         v-loading=""
@@ -94,7 +94,6 @@
         border
         show-summary
         highlight-current-row
-        stripe
         style="margin: 3px 0"
         height="260px"
         size="mini"
@@ -150,7 +149,6 @@
         border
         show-summary
         highlight-current-row
-        stripe
         style="margin: 3px 0"
         height="500px"
         size="mini">
@@ -203,7 +201,7 @@
           <template slot-scope="scope">
             <el-tooltip effect="dark" content="取消关联" placement="top">
               <div style="display: inline-block">
-                <el-button :disabled="disable === '1'" type="text" size="mini" @click="deleteMateriel(scope.row)">取消关联</el-button>
+                <el-button :disabled="disable === '1'" type="text" icon="el-icon-delete" size="mini" @click="deleteMateriel(scope.row)"/>
               </div>
             </el-tooltip>
           </template>
@@ -1261,3 +1259,21 @@ function saveAs(blob, filename = '下载文件.xls') {
     color: black;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
index a749ec80..708412eb 100644
--- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue
+++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
@@ -22,7 +22,7 @@
       </el-select>
       <span>零件号：</span>
       <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 150px"/>
-      <el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent10 = 1;pageSize10 = 10;getTableData()">查询</el-button>
+      <el-button type="primary" plain class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent10 = 1;pageSize10 = 10;getTableData()">查询</el-button>
     </el-card>
     <el-card style="width: 1137px">
       <el-table v-loading="" :data="tableData10" stripe highlight-current-row border style="width: 100%;max-height: 315px;margin-top: 10px" height="315px" size="mini" @sort-change="sortChange" @selection-change="handleSelectionChange">
@@ -86,15 +86,15 @@
       <!--<el-tooltip :open-delay="1200" effect="dark" content="保存选中的采购计划单" placement="top">-->
       <!--<el-button type="baocun" size="small" icon="el-icon-download" style="margin-left: 10px" @click="saveMateriel">保存采购计划单</el-button>-->
       <!--</el-tooltip>-->
-      <el-button type="success" size="small" icon="el-icon-download" style="margin-left: 10px" @click="submitAddMaterial">选入备料</el-button>
+      <el-button type="primary" size="small" plain icon="el-icon-download" style="margin-left: 10px" @click="submitAddMaterial">选入备料</el-button>
     </el-card>
     <el-card style="width: 1137px">
       <el-table v-loading="" :data="tableData" stripe highlight-current-row border style="width: 100%;max-height: 230px;margin-top: 10px" height="230px" size="mini" @row-click="searchMX">
         <el-table-column label="采购状态" prop="采购计划状态" align="center" width="90">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">未到货</el-tag>
-            <el-tag v-if="Number(scope.row.采购计划状态)===3" type="success" size="mini">已到货</el-tag>
-            <el-tag v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</el-tag>
+            <span v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">未到货</span>
+            <span v-if="Number(scope.row.采购计划状态)===3" type="success" size="mini">已到货</span>
+            <span v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</span>
           </template>
         </el-table-column>
         <el-table-column label="离线采购计划编号" align="center" width="200">
@@ -107,7 +107,7 @@
             {{ scope.row.离线采购计划名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center" width="250">
+        <el-table-column label="供应商" align="center" width="250" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -121,17 +121,17 @@
           <template slot-scope="scope">
             <el-tooltip :open-delay="1200" effect="dark" content="打印采购计划单" placement="top">
               <div style="display: inline-block">
-                <el-button size="mini" type="success" plain icon="el-icon-printer" @click="exportExcel(scope.row)">打印单据</el-button>
+                <el-button size="mini" type="text" icon="el-icon-printer" @click="exportExcel(scope.row)">打印单据</el-button>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="primary" plain size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)">编辑</el-button>
+                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" style="margin-left: 10px" type="text" size="mini" icon="el-icon-edit-outline" @click="editPurchaseOrder(scope.row)"/>
               </div>
             </el-tooltip>
             <el-tooltip :open-delay="1200" effect="dark" content="删除" placement="top">
               <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" type="primary" plain size="mini" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)">删除</el-button>
+                <el-button :disabled="parseInt(scope.row.采购计划状态)===3 || parseInt(scope.row.采购计划状态)===4" style="margin-left: 10px" type="text" size="mini" icon="el-icon-delete" @click="deletePurchaseOrder(scope.row)"/>
               </div>
             </el-tooltip>
           </template>
@@ -150,12 +150,12 @@
       <!--</div>-->
     </el-card>
     <el-card style="width: 1137px">
-      <el-table v-loading="" :data="tableData3" stripe highlight-current-row border style="width: 100%;max-height: 300px;margin-top: 10px" size="mini">
+      <el-table v-loading="" :data="tableData3" highlight-current-row border style="width: 100%;max-height: 300px;margin-top: 10px" size="mini">
         <el-table-column label="采购状态" align="center" width="90">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</el-tag>
-            <el-tag v-if="Number(scope.row.是否到货)===1" type="success" size="mini">已到货</el-tag>
-            <el-tag v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</el-tag>
+            <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</span>
+            <span v-if="Number(scope.row.是否到货)===1" type="success" size="mini">已到货</span>
+            <span v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</span>
           </template>
         </el-table-column>
         <el-table-column label="物料编码" prop="物料零件编码" align="center" width="180">
@@ -192,7 +192,7 @@
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="物料移出采购计划" placement="top">
               <div style="display: inline-block">
-                <el-button :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" type="info" size="mini" icon="el-icon-right" plain @click="deleteMX(scope.row)">移出</el-button>
+                <el-button :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" type="text" size="mini" icon="el-icon-right" @click="deleteMX(scope.row)">移出</el-button>
               </div>
             </el-tooltip>
           </template>
@@ -678,3 +678,21 @@ export default {
     margin: 0
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
index 8592ba4f..ca39e556 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue
@@ -44,9 +44,9 @@
           type="date"
           placeholder="选择日期"/>
         <el-tooltip :open-delay="1200" effect="dark" content="查询外购备料发票信息" placement="top">
-          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
+          <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=30;searchTable1()">查询</el-button>
         </el-tooltip>
-        <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addTable1()">新增到票</el-button>
+        <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addTable1()">新增到票</el-button>
       </el-row>
     </el-card>
     <el-card style="width: 58%;float: left">
@@ -61,8 +61,8 @@
         @row-click="searchTable02">
         <el-table-column align="center" label="发票状态" width="80px">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否请款) === 0" type="warning" size="mini">未请款</el-tag>
-            <el-tag v-else-if="Number(scope.row.是否请款) === 1" type="primary" size="mini">已请款</el-tag>
+            <span v-if="Number(scope.row.是否请款) === 0" type="warning" size="mini">未请款</span>
+            <span v-else-if="Number(scope.row.是否请款) === 1" type="primary" size="mini">已请款</span>
           </template>
         </el-table-column>
         <el-table-column align="center" label="发票号" width="120px">
@@ -96,14 +96,13 @@
               <div style="display: inline-block">
                 <el-button
                   :disabled="Number(scope.row.是否请款)===1"
-                  type="success"
+                  type="text"
                   size="mini"
                   icon="el-icon-share"
-                  plain
                   @click="aboutArrival(scope.row)">关联到货单</el-button>
               </div>
             </el-tooltip>
-            <el-button type="primary" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel(scope.row)">导出</el-button>
+            <el-button type="text" size="mini" icon="el-icon-download" style="margin-left:10px" @click="downloadExcel(scope.row)">导出</el-button>
             <el-tooltip :open-delay="1200" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button
@@ -121,7 +120,7 @@
                   :disabled="Number(scope.row.是否请款)===1"
                   type="text"
                   size="mini"
-                  icon="el-icon-right"
+                  icon="el-icon-delete"
                   style="margin-left: 20px"
                   @click="deleteTable1(scope.row)"/>
               </div>
@@ -645,4 +644,21 @@ function saveAs(blob, filename = '下载文件.xls') {
     }
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
 
diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
index 2d16abbb..a34a21bd 100644
--- a/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
+++ b/src/views/WorkshopProcurement/OutsourcingMaterialsSearch/index.vue
@@ -58,9 +58,9 @@
           align="center"
           width="80px">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到</el-tag>
-            <el-tag v-if="Number(scope.row.是否到货)===1" type="primary" size="mini">已到</el-tag>
-            <el-tag v-if="Number(scope.row.是否到货)===2" type="success" size="mini">已结</el-tag>
+            <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到</span>
+            <span v-if="Number(scope.row.是否到货)===1" type="primary" size="mini">已到</span>
+            <span v-if="Number(scope.row.是否到货)===2" type="success" size="mini">已结</span>
           </template>
         </el-table-column>
         <el-table-column
diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
index ffdf4b0c..ddf44663 100644
--- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
@@ -17,8 +17,9 @@
       <span>供应商:</span>
       <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
       <el-button
-        type="success"
+        type="primary"
         size="small"
+        plain
         icon="el-icon-search"
         style="margin-left:10px"
         @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
@@ -30,6 +31,7 @@
         :data="tableData1"
         size="mini"
         border
+        stripe
         style="width: 100%;max-height: 300px;"
         height="450px"
         highlight-current-row
@@ -71,7 +73,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" plain 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/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
index 22b79c48..44f214f2 100644
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -13,12 +13,21 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <!--<span>采购员:</span>-->
-        <el-input v-model="buyerName" placeholder="请双击选择" size="small" clearable @dblclick.native="initBuyer();dialogVisible2=true;submitDisable=true"/>
         <!--<span>供应商:</span>-->
         <el-input v-model="supplierName" placeholder="供应商" size="small" clearable/>
+        <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="结束日期"/>
         <!--<span>审批情况:</span>-->
-        <el-select v-model="approvalValue" placeholder="审批情况" size="small" clearable>
+        <el-select v-model="approvalValue" placeholder="审批情况" size="small" clearable style="margin-left: 10px">
           <el-option
             v-for="item in approval"
             :key="item.value"
@@ -26,10 +35,17 @@
             :value="item.value"/>
         </el-select>
         <el-button
-          type="success"
+          type="primary"
           size="small"
+          plain
           icon="el-icon-search"
           @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+        <el-button
+          type="primary"
+          size="small"
+          plain
+          icon="el-icon-download"
+          @click="searchTable1()">导出合同报表</el-button>
       </el-row>
     </el-card>
 
@@ -40,8 +56,9 @@
         :row-class-name="tableRowClassName"
         size="mini"
         border
+        stripe
         style="width: 100%"
-        height="700px"
+        height="500px"
         highlight-current-row
         @row-click="searchTable2">
         <el-table-column label="采购合同号" align="center">
@@ -59,7 +76,7 @@
             {{ scope.row.规定到货时间 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center">
+        <el-table-column label="供应商" align="center" width="200px">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -69,16 +86,21 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="总金额" align="center">
+        <el-table-column label="总金额(元)" align="center">
           <template slot-scope="scope">
             {{ scope.row.含税总金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="预付款" align="center">
+        <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">
           <template slot-scope="scope">
             {{ scope.row.审批情况内容 }}
@@ -91,8 +113,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="100px">
           <template slot-scope="scope">
-            <el-button type="warning" plain size="mini" @click="exportTable()">打印</el-button>
-            <el-button type="danger" plain size="mini" @click="Disable(scope.row)">打回</el-button>
+            <el-button type="text" plain size="mini" icon="el-icon-printer" @click="exportTable()">打印</el-button>
+            <el-button type="text" plain size="mini" icon="el-icon-back" @click="Disable(scope.row)">打回</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -387,6 +409,7 @@ export default {
         value: 3,
         label: '未审批'
       }],
+      startTime: '',
       采购合同名称: '',
       规定到货时间: '',
       操作日期: '',
@@ -463,19 +486,15 @@ export default {
     searchTable1() {
       this.textarea = ``
       this.loading1 = true
-      if (this.startEndDate === '' || this.startEndDate === null || this.startEndDate[0] === '' || this.startEndDate[1] === '') {
-        this.check1 = 0
-        this.startEndDate = ''
-      } else { this.check1 = 1 }
+      this.startTime ? this.check1 = 1 : (this.check1 = 0, this.startTime = '')
       this.contractNumValue ? this.check2 = 1 : this.check2 = 0
-      this.buyerName ? this.check3 = 1 : this.check3 = 0
       this.supplierName ? this.check4 = 1 : this.check4 = 0
       if (this.approvalValue === '' || this.approvalValue === 0) {
         this.check5 = 0
       } else {
         this.check5 = 1
       }
-      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.startEndDate[0], this.startEndDate[1], this.check2, this.contractNumValue, this.check3, this.buyerValue, this.check4, this.supplierName, this.check5, this.approvalValue).then(response => {
+      searchTable1(this.pageCurrent1, this.pageSize1, this.check1, this.startTime[0], this.startTime[1], this.check2, this.contractNumValue, this.check4, this.supplierName, this.check5, this.approvalValue).then(response => {
         this.loading1 = false
         console.log(response.data.rows)
         for (let j = 0; j < response.data.rows.length; j++) {
diff --git a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
index a3a6022b..da4661a5 100644
--- a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
+++ b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
-    <el-card>
+    <el-card style="width: 47%">
       <span>项目名称:</span>
-      <el-select v-model="projectValue" placeholder="项目名称" size="small" filterable clearable>
+      <el-select v-model="projectValue" placeholder="项目名称" size="small" style="width: 180px" filterable clearable>
         <el-option
           v-for="item in project"
           :key="item.value"
@@ -10,45 +10,48 @@
           :value="item.value"/>
       </el-select>
       <el-button
-        type="success"
+        type="primary"
         size="small"
+        plain
         icon="el-icon-search"
         style="margin-left:10px"
-        @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+        @click="searchTable1()">查询</el-button>
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-download"
+        style="margin-left:10px"
+        @click="searchTable1()">导出项目采购明细</el-button>
     </el-card>
-    <el-card>
+    <el-card style="width: 47%">
       <el-table v-loading="" :data="tableData2" :summary-method="getSummaries1" show-summary border style="width: 100%;max-height: 700px;" height="700px">
-        <el-table-column label="项目名称" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.项目名称 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="零件名称" align="center" min-width="100">
+        <el-table-column label="零件名称" align="center" width="150">
           <template slot-scope="scope">
             {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.组件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" align="center" min-width="100">
+        <el-table-column label="图号或型号" align="center" width="150">
           <template slot-scope="scope">
             {{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="材料或规格" align="center" min-width="100">
+        <el-table-column label="材料或规格" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.材料 ? scope.row.材料 : scope.row.物料规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="数量" align="center" min-width="100">
+        <el-table-column label="数量" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="单价" align="center" min-width="100">
+        <el-table-column label="单价(元)" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.单价 }}
           </template>
         </el-table-column>
-        <el-table-column label="小计(元)" align="center" min-width="100" prop="金额">
+        <el-table-column label="小计(元)" align="center" width="100" prop="金额">
           <template slot-scope="scope">
             {{ scope.row.金额 }}
           </template>
@@ -111,39 +114,11 @@ export default {
         this.$message.error('请选择项目')
       }
     },
-    getSummaries(param) {
-      const { columns, data } = param
-      const sums = []
-      columns.forEach((column, index) => {
-        if (index === 4) {
-          sums[index] = '合计'
-          return
-        } else if (index === 5) {
-          const values = data.map(item => Number(item['金额']))
-          if (!values.every(value => isNaN(value))) {
-            sums[index] = values.reduce((prev, curr) => {
-              const value = Number(curr)
-              if (!isNaN(value)) {
-                return Number(prev) + Number(curr)
-              } else {
-                return Number(prev)
-              }
-            }, 0)
-            sums[index] += ' 元(未税)'
-          } else {
-            sums[index] = 'N/A'
-          }
-        } else if (index === 6) {
-          sums[index] = parseInt(parseInt(sums[5]) * 1.16 * 100) / 100 + ' 元(含税)'
-        }
-      })
-      return sums
-    },
     getSummaries1(param) {
       const { columns, data } = param
       const sums = []
       columns.forEach((column, index) => {
-        if (index === 4) {
+        if (index === 0) {
           sums[index] = '合计'
           return
         } else if (index === 5) {
@@ -157,12 +132,10 @@ export default {
                 return Number(prev)
               }
             }, 0)
-            sums[index] += ' 元(未税)'
+            sums[index] += ' 元(含税)'
           } else {
             sums[index] = 'N/A'
           }
-        } else if (index === 6) {
-          sums[index] = parseInt(parseInt(sums[5]) * 1.16 * 100) / 100 + ' 元(含税)'
         }
       })
       return sums
diff --git a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
index 55a5fe76..dd81c81b 100644
--- a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
+++ b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
@@ -23,12 +23,13 @@
           :value="item.value"/>
       </el-select>
       <el-button
-        type="success"
+        type="primary"
         size="small"
+        plain
         icon="el-icon-search"
         style="margin-left: 10px"
         @click="pageCurrent1=1;pageSize1=30;total1=0;searchTable1()">查询</el-button>
-      <el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">新增请款</el-button>
+      <el-button class="button111" size="small" icon="el-icon-goods" style="" @click="requestFund">新增请款</el-button>
     </el-card>
     <el-row>
       <el-col style="width: 1200px">
@@ -57,9 +58,9 @@
             <!--        <el-table-column label="请款付款情况" align="center">-->
             <el-table-column label="审批情况内容" width="100" align="center">
               <template slot-scope="scope">
-                <el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</el-tag>
-                <el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</el-tag>
-                <el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</el-tag>
+                <span v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="small">未审批</span>
+                <span v-if="Number(scope.row.审批情况流水号)===1" type="success" size="small">已通过</span>
+                <span v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="small">不通过</span>
               </template>
             </el-table-column>
             <el-table-column label="未通过审批原因" width="130" align="center">
@@ -69,9 +70,9 @@
             </el-table-column>
             <el-table-column label="付款情况" width="100" align="center">
               <template slot-scope="scope">
-                <el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</el-tag>
-                <el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已同意</el-tag>
-                <el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</el-tag>
+                <span v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="small">未操作</span>
+                <span v-if="Number(scope.row.付款情况流水号)===1" type="success" size="small">已同意</span>
+                <span v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="small">不同意</span>
               </template>
             </el-table-column>
             <el-table-column label="未付款原因" width="100" align="center">
@@ -82,7 +83,11 @@
             <!--        </el-table-column>-->
             <el-table-column label="操作" align="center" width="120">
               <template slot-scope="scope">
-                <el-button :disabled="Number(id)!==Number(scope.row.请款人) || (Number(scope.row.审批情况流水号)===1 && Number(scope.row.付款情况流水号)!==2)" type="danger" size="mini" icon="el-icon-delete" style="margin-left: 10px" plain @click="cancelRequestFund(scope.row)">取消请款</el-button>
+                <el-tooltip :open-delay="1000" effect="dark" content="取消请款" placement="top">
+                  <div style="display: inline-block">
+                    <el-button :disabled="Number(id)!==Number(scope.row.请款人) || (Number(scope.row.审批情况流水号)===1 && Number(scope.row.付款情况流水号)!==2)" type="text" size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(scope.row)"/>
+                  </div>
+                </el-tooltip>
               </template>
             </el-table-column>
           </el-table>
@@ -437,3 +442,20 @@ export default {
     margin-bottom: 5px;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
index 83587c30..3245ac38 100644
--- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue
@@ -19,14 +19,15 @@
         <el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>
         <el-tooltip :open-delay="1000" effect="dark" content="查询外购备料清款信息" placement="top">
           <el-button
-            type="success"
+            type="primary"
             size="small"
+            plain
             icon="el-icon-search"
             style="margin-left: 10px"
             @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
         </el-tooltip>
         <el-tooltip :open-delay="1000" effect="dark" content="对选择的请款任务创建请款申请" placement="top">
-          <el-button type="primary" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
+          <el-button class="button111" size="small" icon="el-icon-goods" style="" @click="requestFund">请款</el-button>
         </el-tooltip>
       </el-col>
     </el-card>
@@ -89,9 +90,9 @@
         </el-table-column>
         <el-table-column label="审批情况内容" width="100" align="center">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</el-tag>
-            <el-tag v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</el-tag>
-            <el-tag v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</el-tag>
+            <span v-if="Number(scope.row.审批情况流水号)===3" type="primary" size="mini">未审批</span>
+            <span v-if="Number(scope.row.审批情况流水号)===1" type="success" size="mini">已通过</span>
+            <span v-if="Number(scope.row.审批情况流水号)===2" type="danger" size="mini">不通过</span>
           </template>
         </el-table-column>
         <el-table-column label="未通过审批原因" width="110" align="center">
@@ -101,9 +102,9 @@
         </el-table-column>
         <el-table-column label="付款情况" width="100" align="center">
           <template slot-scope="scope">
-            <el-tag v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</el-tag>
-            <el-tag v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</el-tag>
-            <el-tag v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</el-tag>
+            <span v-if="Number(scope.row.付款情况流水号)===3" type="primary" size="mini">未操作</span>
+            <span v-if="Number(scope.row.付款情况流水号)===1" type="success" size="mini">已同意</span>
+            <span v-if="Number(scope.row.付款情况流水号)===2" type="danger" size="mini">不同意</span>
           </template>
         </el-table-column>
         <el-table-column label="未付款原因" width="100" align="center">
@@ -135,7 +136,7 @@
     </el-card>
     <el-card style="margin-left: 0px;width: 32%;float: left">
       <el-table-column type="expand" label="详情">
-        <el-table :data="gridData" class="subTableHeader" stripe size="mini" show-summary style="width: 100%">
+        <el-table :data="gridData" class="subTableHeader" size="mini" show-summary style="width: 100%">
           <el-table-column width="50" align="center" type="index" label="序号"/>
           <el-table-column min-width="150" align="center" label="发票号">
             <template slot-scope="scope">
@@ -423,3 +424,21 @@ export default {
     }
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>
+
diff --git a/src/views/WorkshopProcurement/manufacturingPurchaseArrival/index.vue b/src/views/WorkshopProcurement/manufacturingPurchaseArrival/index.vue
index 098e6d08..cb5bdc67 100644
--- a/src/views/WorkshopProcurement/manufacturingPurchaseArrival/index.vue
+++ b/src/views/WorkshopProcurement/manufacturingPurchaseArrival/index.vue
@@ -17,8 +17,8 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <el-button type="success" size="small" style="margin-left: 10px" @click="searchContractDetail">查询明细</el-button>
-      <el-button type="primary" style="margin: 10px" size="small" @click="submitInStorage">确认到货</el-button>
+      <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="searchContractDetail">查询明细</el-button>
+      <el-button class="button111" style="margin: 10px" size="small" icon="el-icon-circle-check" @click="submitInStorage">确认到货</el-button>
     </el-card>
     <el-card>
       <el-table ref="multipleTable" :data="table1" border stripe size="mini" highlight-current-row style="width: 100%;margin-bottom: 5px" @selection-change="handleSelectionChange">
@@ -213,4 +213,21 @@ export default {
     margin-bottom: 5px;
   }
 </style>
+<style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
+</style>