From 8d70b74a1edf3c7c9668905fa89c594fe0938af6 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 20 Sep 2019 16:47:54 +0800
Subject: [PATCH] =?UTF-8?q?=19=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreateInquirySheet/index.vue              | 18 +++++++--------
 .../OfflineContract/index.vue                 | 23 ++++++++++---------
 .../OfflineContractRequestFund/index.vue      |  6 ++---
 .../PurchaseContractRequestFund/index.vue     |  8 +++----
 .../PurchaseContractSearch/index.vue          |  4 ++--
 .../PurchasingCenter/ReceiveCheck/index.vue   |  4 ++--
 .../PurchasingCenter/SetPayPlan/index.vue     |  2 +-
 7 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index 86e91a88..c2fb5147 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -417,12 +417,12 @@
       <h3 style="margin-top: 0;display:inline-block;width:50%">询价单</h3>
       <el-button :loading="baseInfoLoading" type="success" size="mini" style="float: right" @click="inquirySheetBaseInfoMaintain">询价单基础信息维护</el-button>
       <el-table v-loading="" :data="tableData2" border style="max-height: 300px;" height="300px" size="mini" highlight-current-row @row-click="searchTable3">
-        <el-table-column label="询价单编号" align="center" min-width="120">
+        <el-table-column label="询价单编号" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.询价单编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="200">
+        <el-table-column label="供应商" align="center" min-width="200" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -442,12 +442,12 @@
             {{ scope.row.注册资本 }}
           </template>
         </el-table-column>
-        <el-table-column label="帐号" align="center" min-width="100">
+        <el-table-column label="帐号" align="center" min-width="100" show-overflow-tooltip>
           <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" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.开户行 }}
           </template>
@@ -467,10 +467,10 @@
             {{ scope.row.货期 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="200">
+        <el-table-column label="操作" align="center" width="200" fixed="right">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" icon="el-icon-edit" @click="editInquirySheet(scope.row)">编辑</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-delete" @click="deleteInquirySheet(scope.row)">删除</el-button>
+            <el-button type="warning" size="mini" plain icon="el-icon-edit" @click="editInquirySheet(scope.row)">编辑</el-button>
+            <el-button type="danger" size="mini" plain icon="el-icon-delete" @click="deleteInquirySheet(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -545,9 +545,9 @@
             {{ scope.row.组号 || scope.row.基本件组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="100">
+        <el-table-column label="操作" align="center" width="100" fixed="right">
           <template slot-scope="scope">
-            <el-button type="danger" size="mini" icon="el-icon-delete" @click="outInquirySheet(scope.row)">移出</el-button>
+            <el-button type="danger" size="mini" plain icon="el-icon-delete" @click="outInquirySheet(scope.row)">移出</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 1b721d91..a020a176 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -12,7 +12,7 @@
         </el-row>
         <el-row style="">
           <span>物料状态:</span>
-          <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small"/>
+          <el-cascader :options="materialStatus" :props="{ checkStrictly: true }" v-model="materialStatusValue" size="small" style="margin: 0px"/>
           <el-button
             type="success"
             size="small"
@@ -81,7 +81,7 @@
             {{ scope.row.物料品种 }}
           </template>
         </el-table-column>
-        <el-table-column label="名称" align="center" min-width="100">
+        <el-table-column label="名称" align="center" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
@@ -91,7 +91,7 @@
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" align="center" min-width="200">
+        <el-table-column label="规格" align="center" min-width="200" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料规格 }}
           </template>
@@ -111,7 +111,7 @@
             {{ scope.row.待采购数量 = Number(scope.row.零件数量) - Number(scope.row.使用滞货数量) }}
           </template>
         </el-table-column>
-        <el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注筛选">
+        <el-table-column :filters="remarkFilters" :filter-method="filterHandler0" label="备注" align="center" min-width="100" prop="备注筛选" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.备注 }}
           </template>
@@ -192,7 +192,7 @@
               {{ scope.row.物料名称 }}
             </template>
           </el-table-column>
-          <el-table-column label="物料型号" min-width="150" align="center">
+          <el-table-column label="物料型号" min-width="150" align="center" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.物料型号 }}
             </template>
@@ -231,8 +231,9 @@
               <el-button v-if="scope.row.changeSafeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>
               <el-button
                 v-else
-                type="primary"
+                type="warning"
                 size="mini"
+                plain
                 icon="el-icon-edit"
                 @click="scope.row.changeSafeValue=!scope.row.changeSafeValue">设置</el-button>
             </template>
@@ -302,7 +303,7 @@
             {{ scope.row.离线合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="250">
+        <el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -324,9 +325,9 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="240" fixed="right">
           <template slot-scope="scope">
-            <el-button :disabled="arrival(scope.row)" type="primary" size="mini" @click="editOfflineContract(scope.row)">编辑</el-button>
-            <el-button :disabled="arrival(scope.row)" type="danger" size="mini" @click="deleteOfflineContract(scope.row)">删除</el-button>
-            <el-button type="warning" size="mini" @click="exportExcel(scope.row)">导出</el-button>
+            <el-button :disabled="arrival(scope.row)" type="warning" plain size="mini" @click="editOfflineContract(scope.row)">编辑</el-button>
+            <el-button :disabled="arrival(scope.row)" type="danger" plain size="mini" @click="deleteOfflineContract(scope.row)">删除</el-button>
+            <el-button type="warning" size="mini" plain @click="exportExcel(scope.row)">导出</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -434,7 +435,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="100">
           <template slot-scope="scope">
-            <el-button v-if="quickChangePrice" :disabled="disable" type="danger" size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
+            <el-button v-if="quickChangePrice" :disabled="disable" type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
             <b v-else>移除</b>
           </template>
         </el-table-column>
diff --git a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
index 555cdd47..de2d9e24 100644
--- a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue
@@ -33,7 +33,7 @@
       </div>
       <h3 style="margin-top: 0">请款表</h3>
       <el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini">
-        <el-table-column label="供应商" align="center" min-width="250">
+        <el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -112,9 +112,9 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" @click="searchTable02(scope.row)">查看详情</el-button>
+              <el-button slot="reference" type="primary" size="mini" plain icon="el-icon-search" @click="searchTable02(scope.row)">查看详情</el-button>
             </el-popover>
-            <el-button :disabled="Number(id)!==Number(scope.row.请款人)||!Number(scope.row.审核情况流水号)!==3" type="danger" 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.审核情况流水号)!==3" type="danger" plain size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(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 200dc7e9..b1219bbf 100644
--- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
@@ -40,7 +40,7 @@
             {{ scope.row.计划付款备注 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购合同编号" min-width="100" align="center">
+        <el-table-column label="采购合同编号" min-width="100" align="center" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
@@ -86,7 +86,7 @@
       </div>
       <h3 style="margin-top: 0">请款表</h3>
       <el-table v-loading="" :data="tableData1" border style="max-height: 500px;" height="500px" size="mini">
-        <el-table-column label="供应商" align="center" min-width="250">
+        <el-table-column label="供应商" align="center" min-width="250" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -165,9 +165,9 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" @click="searchTable02(scope.row)">查看详情</el-button>
+              <el-button slot="reference" type="primary" plain size="mini" icon="el-icon-search" @click="searchTable02(scope.row)">查看详情</el-button>
             </el-popover>
-            <el-button :disabled="Number(id)!==Number(scope.row.请款人)||Number(scope.row.审核情况流水号)!==3" type="danger" 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.审核情况流水号)!==3" type="danger" plain size="mini" icon="el-icon-delete" style="margin-left: 10px" @click="cancelRequestFund(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 09bbe182..1477fa91 100644
--- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue
@@ -174,9 +174,9 @@
             {{ scope.row.合同总额 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="100">
+        <el-table-column label="操作" align="center" min-width="100" fixed="right">
           <template slot-scope="scope">
-            <el-button :disabled="true" type="danger" size="mini" icon="el-icon-delete" @click="deleteContract(scope.row)">删除</el-button>
+            <el-button :disabled="true" type="danger" plain size="mini" icon="el-icon-delete" @click="deleteContract(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/PurchasingCenter/ReceiveCheck/index.vue b/src/views/PurchasingCenter/ReceiveCheck/index.vue
index 217d56c4..37ca9118 100644
--- a/src/views/PurchasingCenter/ReceiveCheck/index.vue
+++ b/src/views/PurchasingCenter/ReceiveCheck/index.vue
@@ -53,7 +53,7 @@
             {{ scope.row.组号 || '—' }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="物料名称">
+        <el-table-column align="center" label="物料名称" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
           </template>
@@ -83,7 +83,7 @@
             {{ scope.row.出库数量 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="领用时间">
+        <el-table-column align="center" label="领用时间" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.出库时间 }}
           </template>
diff --git a/src/views/PurchasingCenter/SetPayPlan/index.vue b/src/views/PurchasingCenter/SetPayPlan/index.vue
index 768dd63a..47c99288 100644
--- a/src/views/PurchasingCenter/SetPayPlan/index.vue
+++ b/src/views/PurchasingCenter/SetPayPlan/index.vue
@@ -78,7 +78,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-circle-plus-outline" @click="handleSetPayPlan(scope.row)">新增</el-button>
+            <el-button type="warning" size="mini" plain icon="el-icon-circle-plus-outline" @click="handleSetPayPlan(scope.row)">新增</el-button>
           </template>
         </el-table-column>
       </el-table>