From 57de3b8b2f4ac04dd423a622284af8369deecef5 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 20 Sep 2019 12:20:43 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=BB=93=E7=AE=97?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=EF=BC=88=E8=BD=A6=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InvoiceSettlementApplication1/index.vue   | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
index 448e5fd0..6f6ecfac 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
@@ -9,7 +9,7 @@
 
     <el-card>
       <h4 style="margin-top: 5px">发票结算申请单</h4>
-      <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%;height: 300px;overflow:auto" size="mini" @row-click="searchTable2">
+      <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%;" 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">
@@ -42,12 +42,12 @@
             </el-form>
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="200">
+        <el-table-column label="供应商" align="center" width="170" 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" width="130">
           <template slot-scope="scope">
             {{ scope.row.发票号 }}
           </template>
@@ -57,17 +57,17 @@
             {{ scope.row.发票金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="申请人" align="center" min-width="70">
+        <el-table-column label="申请人" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
           </template>
         </el-table-column>
-        <el-table-column label="申请时间" align="center" min-width="120">
+        <el-table-column label="申请时间" align="center" width="130">
           <template slot-scope="scope">
             {{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="采购审批" align="center" min-width="60">
+        <el-table-column label="采购审批" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }}
           </template>
@@ -77,7 +77,7 @@
             {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="财务审批" align="center" min-width="60">
+        <el-table-column label="财务审批" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.审批人2姓名 ? scope.row.审批人2姓名 : '未审批' }}
           </template>
@@ -87,7 +87,7 @@
             {{ scope.row.审批2时间 ? scope.row.审批2时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="总经理审批" align="center" min-width="70">
+        <el-table-column label="总经理审批" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
           </template>
@@ -124,12 +124,12 @@
       <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-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">
+        <el-table-column label="名称" align="center" width="120">
           <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" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.采购物料型号 || scope.row.离线物料型号 || scope.row.采购零件图号 }}
           </template>
@@ -139,12 +139,12 @@
             {{ scope.row.采购物料规格 || scope.row.离线物料规格 || scope.row.采购零件规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center" min-width="150">
+        <el-table-column label="供应商" align="center" min-width="150" 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" width="120">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 || scope.row.离线合同编号 }}
           </template>

From b6eb5cf156a7e5b520a651a989dad4648853a3b0 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 20 Sep 2019 13:56:45 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E5=85=A8=E5=B1=80=E6=96=91=E9=A9=AC?=
 =?UTF-8?q?=E7=BA=B9=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/index.scss                                     | 3 +++
 src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 2b41a5dd..d3492b01 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -210,3 +210,6 @@ el-card{
 .el-table td, .el-table th {
   padding: 0;
 }
+.el-table--striped .el-table__body tr.el-table__row--striped td {
+  background-color: rgb(235,235,235);
+}
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index c3313d38..5812579b 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -216,6 +216,7 @@
                   :disabled="!(parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='')"
                   type="primary"
                   size="mini"
+                  plain=""
                   icon="el-icon-back"
                   @click="retract(scope.row)">撤回</el-button>
               </template>

From 008dc15c34dbd6a65a6215d2e65e5f2c81ca055c Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 20 Sep 2019 15:14:23 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=80=BB=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/index.scss                                   | 1 +
 src/views/PurchasingCenter/ProjectTotalSearch/index.vue | 2 +-
 src/views/PurchasingCenter/SupplierManagement/index.vue | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/styles/index.scss b/src/styles/index.scss
index d3492b01..48715afb 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -211,5 +211,6 @@ el-card{
   padding: 0;
 }
 .el-table--striped .el-table__body tr.el-table__row--striped td {
+  //斑马纹颜色
   background-color: rgb(235,235,235);
 }
diff --git a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
index 2d58d042..c6af2843 100644
--- a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
+++ b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
@@ -60,7 +60,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>
diff --git a/src/views/PurchasingCenter/SupplierManagement/index.vue b/src/views/PurchasingCenter/SupplierManagement/index.vue
index 94231b8f..f65b9bf1 100644
--- a/src/views/PurchasingCenter/SupplierManagement/index.vue
+++ b/src/views/PurchasingCenter/SupplierManagement/index.vue
@@ -84,12 +84,12 @@
             {{ scope.row.主要产品 }}
           </template>
         </el-table-column>
-        <el-table-column label="开户行" align="center" min-width="150">
+        <el-table-column label="开户行" align="center" min-width="150" 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>
@@ -136,8 +136,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" fixed="right" width="190">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" icon="el-icon-edit" @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+            <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>
           </template>
         </el-table-column>
       </el-table>

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 4/7] =?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>

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

---
 .../BacklogGoodsAnalysis/index.vue            |  4 +-
 .../InvoiceSettlementApplication/index.vue    | 22 ++++-----
 .../PurchaseSituationSearch/index.vue         | 46 +++++++++----------
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
index 36fa7d09..d01bf46a 100644
--- a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
+++ b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
@@ -88,12 +88,12 @@
             {{ scope.row.物料名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" align="center" min-width="120">
+        <el-table-column label="图号或型号" align="center" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" align="center" min-width="120">
+        <el-table-column label="规格" align="center" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料规格 }}
           </template>
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
index c5eb128a..9fa62c05 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
@@ -8,7 +8,7 @@
         <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">创建</el-button>
       </div>
       <h4 style="margin-top: 5px">发票结算申请单</h4>
-      <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%;height: 300px;overflow:auto" size="mini" @row-click="searchTable2">
+      <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%" 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">
@@ -41,7 +41,7 @@
             </el-form>
           </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>
@@ -51,7 +51,7 @@
             {{ scope.row.发票号 }}
           </template>
         </el-table-column>
-        <el-table-column label="发票金额" align="center" min-width="70">
+        <el-table-column label="发票金额" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.发票金额 }}
           </template>
@@ -61,7 +61,7 @@
             {{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
           </template>
         </el-table-column>
-        <el-table-column label="申请时间" align="center" min-width="115">
+        <el-table-column label="申请时间" align="center" min-width="115" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
           </template>
@@ -71,7 +71,7 @@
             {{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }}
           </template>
         </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="115">
+        <el-table-column label="审批时间" align="center" min-width="115" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
           </template>
@@ -81,7 +81,7 @@
             {{ scope.row.审批人4姓名 ? scope.row.审批人4姓名 : '未审批' }}
           </template>
         </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="115">
+        <el-table-column label="审批时间" align="center" min-width="115" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.审批4时间 ? scope.row.审批4时间 : '—' }}
           </template>
@@ -91,16 +91,16 @@
             {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
           </template>
         </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="115">
+        <el-table-column label="审批时间" align="center" min-width="115" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="300">
+        <el-table-column label="操作" align="center" width="300" fixed="right">
           <template slot-scope="scope">
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="primary" 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" icon="el-icon-delete" size="mini" style="margin-left:10px" @click="handleDelete(scope.row)">删除</el-button>
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="primary" size="mini" style="margin-left:10px" @click="submitApply(scope.row)">提交申请</el-button>
+            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="warning" icon="el-icon-edit" plain size="mini" style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="danger" icon="el-icon-delete" plain 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>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index 1249a747..a8d15013 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -45,7 +45,7 @@
               <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="机床图号" width="100px">
+          <el-table-column align="center" label="机床图号" width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.机床图号 }}
             </template>
@@ -55,27 +55,27 @@
               {{ scope.row.组号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="名称" width="100px">
+          <el-table-column align="center" label="名称" width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.物料名称 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="型号" min-width="100px">
+          <el-table-column align="center" label="型号" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.物料型号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="规格" min-width="200px">
+          <el-table-column align="center" label="规格" min-width="200px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.物料规格 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="供货商" min-width="100px">
+          <el-table-column align="center" label="供货商" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.供货商 || '—' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="备注" min-width="100px">
+          <el-table-column align="center" label="备注" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.备注 || '—' }}
             </template>
@@ -95,7 +95,7 @@
               {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="供应商" min-width="150px">
+          <el-table-column align="center" label="供应商" min-width="150px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
             </template>
@@ -133,7 +133,7 @@
               <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="机床图号" width="100px">
+          <el-table-column align="center" label="机床图号" width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.机床图号 }}
             </template>
@@ -143,27 +143,27 @@
               {{ scope.row.组号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="名称" width="100px">
+          <el-table-column align="center" label="名称" width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.物料名称 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="型号" min-width="100px">
+          <el-table-column align="center" label="型号" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.物料型号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="规格" min-width="200px">
+          <el-table-column align="center" label="规格" min-width="200px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.物料规格 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="供货商" min-width="100px">
+          <el-table-column align="center" label="供货商" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.供货商 || '—' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="备注" min-width="100px">
+          <el-table-column align="center" label="备注" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.备注 || '—' }}
             </template>
@@ -183,12 +183,12 @@
               {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="供应商" min-width="150px">
+          <el-table-column align="center" label="供应商" min-width="150px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || scope.row.离线合同供应商名称 || '—' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="合同编号" min-width="100px">
+          <el-table-column align="center" label="合同编号" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.采购合同编号 || scope.row.离线合同编号 || '—' }}
             </template>
@@ -221,7 +221,7 @@
               <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="机床图号" width="100px">
+          <el-table-column align="center" label="机床图号" width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.机床图号 }}
             </template>
@@ -231,32 +231,32 @@
               {{ scope.row.组号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="名称" min-width="100px">
+          <el-table-column align="center" label="名称" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.零件名称 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="图号" min-width="100px">
+          <el-table-column align="center" label="图号" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.零件图号 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="规格" min-width="100px">
+          <el-table-column align="center" label="规格" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.规格 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="材料" min-width="100px">
+          <el-table-column align="center" label="材料" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.材料 }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="供货商" min-width="100px">
+          <el-table-column align="center" label="供货商" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.供货商 || '—' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="备注" min-width="100px">
+          <el-table-column align="center" label="备注" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.备注 || '—' }}
             </template>
@@ -276,7 +276,7 @@
               {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || '—' }}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="供应商" min-width="100px">
+          <el-table-column align="center" label="供应商" min-width="100px" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.供应商名称 || '—' }}
             </template>

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

---
 src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue | 8 ++++----
 src/views/PurchasingCenter/CreateInquirySheet/index.vue   | 7 ++++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
index d01bf46a..01510b03 100644
--- a/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
+++ b/src/views/PurchasingCenter/BacklogGoodsAnalysis/index.vue
@@ -7,10 +7,10 @@
           <el-input v-model="materialName" placeholder="物料名称" clearable size="small"/>
           <span>物料规格：</span>
           <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-row>
-        <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>
       </div>
       <h4 style="margin-top: 0">采购件列表</h4>
       <el-table :data="tableData1" size="mini" border style="width: 100%;" height="440">
@@ -245,7 +245,7 @@ export default {
     width:200px
   }
   .el-input{
-    width:200px
+    width:150px
   }
   span{
     margin: 10px 0 10px 10px;
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index c2fb5147..8a1d7031 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-card>
-      <div style="width:100%">
+      <div ref="height1" style="width:100%">
         <el-divider content-position="right">
           <el-button type="text" @click="searchUnInquiryPartNumber">刷新</el-button> | 待询价零件数
         </el-divider>
@@ -1072,6 +1072,8 @@ export default {
       })
     },
     clickCard1(project, machine) {
+      var hight = this.$refs.height1.offsetHeight
+      document.documentElement.scrollTop = hight + 140
       this.projectValue = project
       this.machine = []
       this.machineValue = ''
@@ -1092,6 +1094,8 @@ export default {
       })
     },
     clickCard2(project, machine) {
+      var hight = this.$refs.height1.offsetHeight
+      document.documentElement.scrollTop = hight + 140
       this.projectValue = project
       this.machine = []
       this.machineValue = ''
@@ -1147,6 +1151,7 @@ export default {
         }
       }).then(res => {
         this.machines1 = res.data
+        console.log(this.machines1)
       })
     },
     async searchUnBuyPartNumber() {

From 135ec524f0f32efdb238184d91779cd3e3130968 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 20 Sep 2019 18:51:16 +0800
Subject: [PATCH 7/7] =?UTF-8?q?card=E7=99=BD=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/index.scss                                | 4 ++++
 src/views/PurchasingCenter/OfflineContract/index.vue | 1 +
 2 files changed, 5 insertions(+)

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 48715afb..7a4f2451 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -214,3 +214,7 @@ el-card{
   //斑马纹颜色
   background-color: rgb(235,235,235);
 }
+.el-card__header {
+  //card白条宽度
+  padding: 5px 5px;
+}
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index a020a176..a857722c 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -1544,6 +1544,7 @@ export default {
 </script>
 
 <style scoped>
+
   .offlineContract td{
     height: 40px;
     text-align: center;