From 6544fe4823bbad5420cebec0931ce8e56bdd9345 Mon Sep 17 00:00:00 2001
From: sujiaqi <liulujia@meswork.com>
Date: Sat, 8 Feb 2020 21:27:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B6=E9=80=A0=E4=B8=AD=E5=BF=83-=E9=87=91?=
 =?UTF-8?q?=E5=B7=A5=EF=BC=8C=E5=88=B6=E9=80=A0=E4=B8=AD=E5=BF=83-?=
 =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=83=A8=E9=87=87=E8=B4=AD=EF=BC=88=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=86=E9=85=8D=EF=BC=8C=E9=87=87=E8=B4=AD=E8=AF=A2?=
 =?UTF-8?q?=E4=BB=B7=EF=BC=8C=E9=87=87=E8=B4=AD=E5=90=88=E5=90=8C=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Inventory/Inboundscanning/index.vue |  2 +-
 .../SelfMadePartsWarehouseOut/index.vue       |  4 +-
 src/views/Inventory/StockInquiry/index.vue    |  2 +-
 .../ManufacturingCenter/AddingOrder/index.vue |  6 +--
 .../Enter0therData/index.vue                  |  8 ++--
 .../ManHourAnalysis/index.vue                 | 10 ++---
 .../ProcessingStatus/index.vue                |  4 +-
 .../ProcessingStatusNew/index.vue             |  4 +-
 .../ScheduleCompletionDetails/index.vue       |  6 +--
 .../maintainInformation/index.vue             | 37 ++++++++++++++-----
 .../CreateInquirySheet/index.vue              | 22 ++++++-----
 .../CreatePurchaseContract/index.vue          |  6 +--
 .../PurchaseTaskAllocate/index.vue            | 15 +++++---
 13 files changed, 75 insertions(+), 51 deletions(-)

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/SelfMadePartsWarehouseOut/index.vue b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
index 809cac35..2ffe89b8 100644
--- a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
+++ b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue
@@ -24,8 +24,8 @@
         <!--            :value="item.value"/>-->
         <!--        </el-select>-->
         <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 180px;margin: 10px 10px 0px 10px"/>
-        <el-button type="success" icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
-        <el-button type="primary" size="small" style="margin: 15px 0 0 10px" @click="wareHousing">出库</el-button>
+        <el-button type="primary" icon="el-icon-search" size="small" plain style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
+        <el-button type="warning" size="small" style="margin: 15px 0 0 10px" plain @click="wareHousing">出库</el-button>
       </el-row>
     </el-card>
     <el-card>
diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue
index 91cda143..e44add6d 100644
--- a/src/views/Inventory/StockInquiry/index.vue
+++ b/src/views/Inventory/StockInquiry/index.vue
@@ -22,7 +22,7 @@
       </el-select>
       <span>零件图号:</span>
       <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;"/>
-      <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=500;total = 0">查询</el-button>
+      <el-button type="primary" class="el-icon-search" size="small" plain style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=500;total = 0">查询</el-button>
     </el-card>
 
     <el-card style="width: 49.5%; float: left">
diff --git a/src/views/ManufacturingCenter/AddingOrder/index.vue b/src/views/ManufacturingCenter/AddingOrder/index.vue
index d476923f..1e3a5ed4 100644
--- a/src/views/ManufacturingCenter/AddingOrder/index.vue
+++ b/src/views/ManufacturingCenter/AddingOrder/index.vue
@@ -19,9 +19,9 @@
           :value="item.value"/>
       </el-select>
       <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;margin:0px 10px;"/>
-      <el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
-      <el-button type="primary" class="el-icon-plus" size="small" style="margin: 0px 10px;" @click="addTableData()">加序</el-button>
-      <el-button type="danger" class="el-icon-delete" size="small" style="margin: 0px 10px;" @click="deleteProcess()">删除加序</el-button>
+      <el-button type="primary" class="el-icon-search" size="small" plain style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
+      <el-button type="warning" class="el-icon-plus" size="small" plain style="margin: 0px 10px;" @click="addTableData()">加序</el-button>
+      <el-button type="danger" class="el-icon-delete" size="small" plain style="margin: 0px 10px;" @click="deleteProcess()">删除加序</el-button>
     </el-card>
     <el-row>
       <el-col style="width: 550px">
diff --git a/src/views/ManufacturingCenter/Enter0therData/index.vue b/src/views/ManufacturingCenter/Enter0therData/index.vue
index 3ba78ae4..3e5a55df 100644
--- a/src/views/ManufacturingCenter/Enter0therData/index.vue
+++ b/src/views/ManufacturingCenter/Enter0therData/index.vue
@@ -17,9 +17,9 @@
         <el-input-number v-model="workTime" :min="0" :step="1" size="small" placeholder="单件工时" style="width: 120px" clearable/>
       </el-row>
       <el-row>
-        <el-button type="primary" size="small" icon="el-icon-plus" style="margin-left: 10px" @click="saveDate">保存</el-button>
-        <el-button type="success" size="small" icon="el-icon-edit" style="margin-left: 10px" @click="editDate">编辑</el-button>
-        <el-button type="danger" size="small" icon="el-icon-delete" style="margin-left: 10px" @click="deleteDate">删除</el-button>
+        <el-button type="warning" size="small" icon="el-icon-plus" plain style="margin-left: 10px" @click="saveDate">保存</el-button>
+        <el-button type="primary" size="small" icon="el-icon-edit" plain style="margin-left: 10px" @click="editDate">编辑</el-button>
+        <el-button type="danger" size="small" icon="el-icon-delete" plain style="margin-left: 10px" @click="deleteDate">删除</el-button>
         <el-date-picker
           v-model="monthValue"
           type="month"
@@ -27,7 +27,7 @@
           value-format="yyyy-MM"
           style="margin-left: 400px; width: 140px"
           placeholder="选择月"/>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-top: 10px;margin-bottom: 10px" @click="fetchDate">查询</el-button>
+        <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-top: 10px;margin-bottom: 10px" @click="fetchDate">查询</el-button>
       </el-row>
     </el-card>
     <el-table v-loading="" :data="tableData" border stripe style="width: 100%" height="730px" size="mini" highlight-current-row @row-click="searchTable">
diff --git a/src/views/ManufacturingCenter/ManHourAnalysis/index.vue b/src/views/ManufacturingCenter/ManHourAnalysis/index.vue
index 94c8f275..7686671e 100644
--- a/src/views/ManufacturingCenter/ManHourAnalysis/index.vue
+++ b/src/views/ManufacturingCenter/ManHourAnalysis/index.vue
@@ -18,7 +18,7 @@
           style="width: 170px;margin:0px 10px"
           type="date"
           placeholder="选择加工完成日期"/>
-        <el-button size="small" type="success" icon="el-icon-search" @click="search1()">查询</el-button>
+        <el-button size="small" type="primary" icon="el-icon-search" plain @click="search1()">查询</el-button>
         <div v-if="chart1" id="myChart1" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
       </el-card>
     </el-row>
@@ -34,7 +34,7 @@
               :value="item.value"/>
           </el-select>
           <el-date-picker v-model="startTime2" :clearable="false" size="small" type="year" value-format="yyyy" format="yyyy" style="width: 150px" placeholder="选择年"/>
-          <el-button size="small" type="success" icon="el-icon-search" @click="search2()">查询</el-button>
+          <el-button size="small" type="primary" icon="el-icon-search" plain @click="search2()">查询</el-button>
           <div v-if="chart2" id="myChart2" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
         </el-card>
       </el-col>
@@ -49,7 +49,7 @@
         <el-card v-loading="loading4" style="height: 550px">
           <span>不合格数量统计</span>
           <el-date-picker v-model="startTime4" :clearable="false" size="small" type="year" value-format="yyyy" format="yyyy" style="width: 150px" placeholder="选择年"/>
-          <el-button size="small" type="success" icon="el-icon-search" @click="search4()">查询</el-button>
+          <el-button size="small" type="primary" icon="el-icon-search" plain @click="search4()">查询</el-button>
           <div v-if="chart4" id="myChart4" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
         </el-card>
       </el-col>
@@ -73,7 +73,7 @@
             style="width: 160px"
             type="date"
             placeholder="选择日期"/>
-          <el-button size="small" type="success" icon="el-icon-search" @click="search5()">查询</el-button>
+          <el-button size="small" type="primary" icon="el-icon-search" plain @click="search5()">查询</el-button>
           <div v-if="chart5" id="myChart5" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
         </el-card>
       </el-col>
@@ -90,7 +90,7 @@
               :value="item.value"/>
           </el-select>
           <el-date-picker v-model="startTime6" :clearable="false" size="small" type="year" value-format="yyyy" format="yyyy" style="width: 150px" placeholder="选择年"/>
-          <el-button size="small" type="success" icon="el-icon-search" @click="search6()">查询</el-button>
+          <el-button size="small" type="primary" icon="el-icon-search" plain @click="search6()">查询</el-button>
           <div v-if="chart6" id="myChart6" :style="{width: '100%', height: '400px', margin: 'auto'}"/>
         </el-card>
       </el-col>
diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
index da00be87..fff065c3 100644
--- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue
@@ -47,9 +47,9 @@
           style="width: 160px"
           type="date"
           placeholder="选择日期"/>
-        <el-button type="success" class="el-icon-search" size="small" style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
+        <el-button type="primary" class="el-icon-search" size="small" plain style="margin: 10px 0 0 10px" @click="getTableData();pageCurrent=1;pageSize=10;total = 0">查询</el-button>
         <el-tooltip :open-delay="1000" effect="dark" content="导出所选机床的加工进度" placement="top">
-          <el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
+          <el-button type="warning" class="el-icon-download" size="small" plain style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
         </el-tooltip>
       </el-row>
     </el-card>
diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
index e459cc65..8e4f13d4 100644
--- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
+++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue
@@ -21,8 +21,8 @@
           :value="item.value"/>
       </el-select>
       <el-input v-model="number" placeholder="零件号" clearable size="small" style="width: 170px;margin:0px 10px;"/>
-      <el-button type="success" class="el-icon-search" size="small" style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
-      <el-button type="warning" class="el-icon-download" size="small" style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
+      <el-button type="primary" class="el-icon-search" size="small" plain style="margin: 0px 10px;" @click="pageCurrent = 1;pageSize = 100;getTableData()">查询</el-button>
+      <el-button type="warning" class="el-icon-download" size="small" plain style="margin: 10px 0 0 10px" @click="exportExcel">导出</el-button>
     </el-card>
     <el-row>
       <el-col style="width: 37%">
diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
index c469cd22..81782d5d 100644
--- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
+++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
@@ -16,12 +16,12 @@
         style="width: 170px;margin:0px 10px"
         type="date"
         placeholder="选择加工完成日期"/>
-      <el-button type="success" class="el-icon-search" size="small" style="margin:0px 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
+      <el-button type="primary" class="el-icon-search" size="small" plain style="margin:0px 10px" @click="pageCurrent=1;total = 0;searchTable();">查询</el-button>
     </el-card>
     <el-row>
       <el-col :span="9">
         <el-card>
-          <el-table v-loading="loading" :data="tableData" highlight-current-row size="mini" style="width: 100%;" height="700px" border element-loading-text="拼命加载中" @row-click="searchTable2">
+          <el-table v-loading="loading" :data="tableData" highlight-current-row size="mini" stripe style="width: 100%;" height="700px" border element-loading-text="拼命加载中" @row-click="searchTable2">
             <el-table-column label="操作者" align="center" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.姓名 }}
@@ -65,7 +65,7 @@
       </el-col>
       <el-col :span="15">
         <el-card>
-          <el-table v-loading="loading2" :data="tableData2" size="mini" stripe style="width: 100%;" height="700px" border element-loading-text="拼命加载中">
+          <el-table v-loading="loading2" :data="tableData2" size="mini" style="width: 100%;" height="700px" border element-loading-text="拼命加载中">
             <el-table-column label="零件图号" align="center" width="135px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
diff --git a/src/views/ManufacturingCenter/maintainInformation/index.vue b/src/views/ManufacturingCenter/maintainInformation/index.vue
index 1057ab52..2299edd2 100644
--- a/src/views/ManufacturingCenter/maintainInformation/index.vue
+++ b/src/views/ManufacturingCenter/maintainInformation/index.vue
@@ -12,11 +12,11 @@
               :value="item.value"/>
           </el-select>
           <span>选择月份：</span>
-          <el-date-picker v-model="monthssss" size="small" type="month" value-format="yyyy-MM" format="yyyy-MM" style="width: 110px" placeholder="选择月"/>
-          <el-button size="small" type="primary" style="margin-right: 50px" @click="exportOut()">导出日点检表</el-button>
+          <el-date-picker v-model="monthssss" size="small" type="month" value-format="yyyy-MM" format="yyyy-MM" style="width: 120px" placeholder="选择月"/>
+          <el-button size="small" type="warning" style="margin-right: 50px" plain @click="exportOut()">导出日点检表</el-button>
         </div>
       </div>
-      <el-table v-loading="loading1" :data="tableData1" height="200" highlight-current-row border>
+      <el-table v-loading="loading1" :data="tableData1" stripe height="200" highlight-current-row border>
         <el-table-column align="center" label="序号" type="index" width="50"/>
         <el-table-column align="center" label="工位号" width="110">
           <template slot-scope="scope">
@@ -49,7 +49,7 @@
     <el-card>
       <div>点检类型、点检内容维护</div>
       <el-col :span="6">
-        <el-table v-loading="loading2" :data="tableData2" height="300" highlight-current-row border @row-click="getTableData3">
+        <el-table v-loading="loading2" :data="tableData2" stripe height="300" highlight-current-row border @row-click="getTableData3">
           <el-table-column align="center" label="序号" type="index" width="50"/>
           <el-table-column align="center" label="点检类型名称" min-width="150">
             <template slot-scope="scope">
@@ -61,13 +61,14 @@
           </el-table-column>
           <el-table-column align="center" label="操作" width="160">
             <template slot="header" slot-scope="scope">
-              <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd1('form1')">新增</el-button>
+              <!--<el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd1('form1')">新增</el-button>-->
+              <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()" >新增</el-button>
             </template>
             <template slot-scope="scope">
               <el-button v-if="scope.row.edit" type="text" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit1(scope.row)">确定</el-button>
               <el-button v-if="scope.row.edit" class="cancel-btn" size="mini" type="text" @click="cancelEdit1(scope.$index, scope.row)">取消</el-button>
-              <el-button v-else type="text" size="mini" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-              <el-button v-if="!scope.row.edit" type="danger" size="mini" plain icon="el-icon-delete" @click="openDelete1(scope.row)">删除</el-button>
+              <el-button v-else type="text" size="mini" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit"/>
+              <el-button v-if="!scope.row.edit" type="text" size="mini" plain icon="el-icon-delete" @click="openDelete1(scope.row)"/>
             </template>
           </el-table-column>
         </el-table>
@@ -105,13 +106,14 @@
           </el-table-column>
           <el-table-column align="center" label="操作" width="160">
             <template slot="header" slot-scope="scope">
-              <el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd2('form2')">新增</el-button>
+              <!--<el-button size="mini" type="primary" icon="el-icon-circle-plus-outline" @click="handleAdd2('form2')">新增</el-button>-->
+              <el-button class="button111" icon="el-icon-circle-plus-outline" size="small" style="margin-left: 10px" @click="ADD()" >新增</el-button>
             </template>
             <template slot-scope="scope">
               <el-button v-if="scope.row.edit" type="text" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit2(scope.row)">确定</el-button>
               <el-button v-if="scope.row.edit" class="cancel-btn" size="mini" type="text" @click="cancelEdit2(scope.$index, scope.row)">取消</el-button>
-              <el-button v-else type="text" size="mini" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit">编辑</el-button>
-              <el-button v-if="!scope.row.edit" type="danger" size="mini" plain icon="el-icon-delete" @click="openDelete2(scope.row)">删除</el-button>
+              <el-button v-else type="text" size="mini" icon="el-icon-edit" @click="scope.row.edit=!scope.row.edit"/>
+              <el-button v-if="!scope.row.edit" type="text" size="mini" plain icon="el-icon-delete" @click="openDelete2(scope.row)"/>
             </template>
           </el-table-column>
         </el-table>
@@ -745,6 +747,21 @@ export default {
 </script>
 
 <style lang="scss">
+  .button111{
+    background:rgb(253,246,236);
+    border-color: #ff9759;
+    color: #ff9759;
+    &:hover{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+    &:focus{
+      background: #ff9759;
+      border-color: #ff9759;
+      color: white;
+    }
+  }
   #dianjianbiao {
     /*.el-table td, .el-table th.is-leaf,.el-table--border, .el-table--group{*/
       /*border-color: black !important;*/
diff --git a/src/views/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/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index ff1732ee..5e600a2e 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -84,7 +84,7 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">查询</el-button>
+          <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px;" @click="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">查询</el-button>
           <el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">未分配</el-radio>
           <el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">已分配</el-radio>
           <div style="float:right;">
@@ -98,9 +98,10 @@
             </el-select>
             <el-tooltip :open-delay="1000" effect="dark" content="选择采购员后，将物料分配给所选的采购员" placement="top">
               <el-button
-                type="primary"
+                type="warning"
                 size="small"
                 icon="el-icon-menu"
+                plain
                 style="margin-left: 10px"
                 @click="allocateTask1">分配</el-button>
             </el-tooltip>
@@ -109,6 +110,7 @@
                 type="danger"
                 size="small"
                 icon="el-icon-back"
+                plain
                 style="margin-left: 10px"
                 @click="executeReturn1">退回</el-button>
             </el-tooltip>
@@ -119,10 +121,10 @@
             <el-table-column :selectable="selectable" align="center" type="selection"/>
             <el-table-column align="center" label="采购情况" prop="询价状态编号" min-width="100px">
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.人员编号===''" type="primary" size="small">未分配</el-tag>
-                <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
-                <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
-                <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
+                <span v-if="scope.row.人员编号===''" type="primary" size="small">未分配</span>
+                <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
+                <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</span>
+                <span v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span>
               </template>
             </el-table-column>
             <el-table-column align="center" prop="物料名称" label="名称" min-width="180px">
@@ -210,6 +212,7 @@
                 <el-tooltip :open-delay="1200" effect="dark" content="撤回已分配的采购任务" placement="top">
                   <el-button
                     :disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
+                    type="danger"
                     plain
                     size="mini"
                     icon="el-icon-back"