diff --git a/src/styles/index.scss b/src/styles/index.scss
index 1da11e6a..c8385a27 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -218,6 +218,23 @@ el-card{
   //card白条宽度
   padding: 5px 5px;
 }
+.subTableHeader {
+  th {
+    background: #8ff4ea !important;
+    color: black;
+  }
+  tr.el-table__row td {
+    background-color: #d8e5f6 !important;
+  }
+  tr.el-table__row.el-table__row--striped td {
+    background: #e9f0f9 !important;
+  }
+}
+
+h3 {
+  height: 10px !important;
+  margin: 0px !important;
+}
 .el-table__footer {
   height: 37px;
 }
diff --git a/src/utils/request.js b/src/utils/request.js
index dcdec3af..f9d3fd3e 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.0.106:8005/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8005/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 
diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue
index ecf9f1ff..99a7f1b1 100644
--- a/src/views/Assembly/AssemblyExecution/index.vue
+++ b/src/views/Assembly/AssemblyExecution/index.vue
@@ -25,7 +25,7 @@
       </el-row>
     </el-card>
     <el-card>
-      <h3 style="text-align: center;">总装调试</h3>
+      <h3 style="text-align: center">总装调试</h3>
       <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="200px">
         <el-table-column label="项目名称" align="center">
           <template slot-scope="scope">
@@ -37,12 +37,12 @@
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" align="center">
+        <el-table-column label="机床名称" align="center" width="120px">
           <template slot-scope="scope">
             {{ scope.row.机床名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床数量" align="center">
+        <el-table-column label="机床数量" align="center" width="50px">
           <template slot-scope="scope">
             {{ scope.row.机床数量 }}
           </template>
@@ -67,7 +67,7 @@
             {{ scope.row.调试结束时间 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="460px" fixed="right">
+        <el-table-column label="操作" align="center" width="430px" fixed="right">
           <template slot-scope="scope">
             <el-button v-if="scope.row.装配状态===null || scope.row.装配状态===0" type="success" size="small" @click="handlestart_1(scope.row)">开始装配</el-button>
             <el-button v-if="scope.row.装配状态===1" type="danger" size="small" @click="handleend_1(scope.row)">结束装配</el-button>
@@ -84,7 +84,7 @@
       </el-table>
     </el-card>
     <el-card>
-      <h3 style="text-align: center;">部装</h3>
+      <h3 style="text-align: center">部装</h3>
       <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
         <el-table-column label="组号" align="center">
           <template slot-scope="scope">
diff --git a/src/views/Assembly/MakeAssemblyPlan/index.vue b/src/views/Assembly/MakeAssemblyPlan/index.vue
index 78643f0a..ad0cd019 100644
--- a/src/views/Assembly/MakeAssemblyPlan/index.vue
+++ b/src/views/Assembly/MakeAssemblyPlan/index.vue
@@ -57,7 +57,7 @@
       </el-table>
     </el-card>
     <el-card>
-      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加</el-button>
+      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加装配计划</el-button>
       <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
         <el-table-column label="组号" align="center">
           <template slot-scope="scope">
diff --git a/src/views/Assembly/MakeColdWorkPlan/index.vue b/src/views/Assembly/MakeColdWorkPlan/index.vue
index 7123edef..785a18cb 100644
--- a/src/views/Assembly/MakeColdWorkPlan/index.vue
+++ b/src/views/Assembly/MakeColdWorkPlan/index.vue
@@ -57,7 +57,7 @@
       </el-table>
     </el-card>
     <el-card>
-      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加</el-button>
+      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加冷作计划</el-button>
       <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
         <el-table-column label="组号" align="center">
           <template slot-scope="scope">
diff --git a/src/views/Assembly/MakeElectricalAssembly/index.vue b/src/views/Assembly/MakeElectricalAssembly/index.vue
index 74f7c566..fbe5f185 100644
--- a/src/views/Assembly/MakeElectricalAssembly/index.vue
+++ b/src/views/Assembly/MakeElectricalAssembly/index.vue
@@ -57,7 +57,7 @@
       </el-table>
     </el-card>
     <el-card>
-      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加</el-button>
+      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加电气计划</el-button>
       <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
         <el-table-column label="组号" align="center">
           <template slot-scope="scope">
diff --git a/src/views/Assembly/MakePaintPlan/index.vue b/src/views/Assembly/MakePaintPlan/index.vue
index 92bc2249..63e291d4 100644
--- a/src/views/Assembly/MakePaintPlan/index.vue
+++ b/src/views/Assembly/MakePaintPlan/index.vue
@@ -57,7 +57,7 @@
       </el-table>
     </el-card>
     <el-card>
-      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加</el-button>
+      <el-button size="small" icon="el-icon-circle-plus" type="primary" style="float:left;margin: 7px 0 0 0" @click="addTable()">增加油漆计划</el-button>
       <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="380px">
         <el-table-column label="组号" align="center">
           <template slot-scope="scope">
diff --git a/src/views/Assembly/QualityBasicData/index.vue b/src/views/Assembly/QualityBasicData/index.vue
index 1dfc7a83..dd57da6a 100644
--- a/src/views/Assembly/QualityBasicData/index.vue
+++ b/src/views/Assembly/QualityBasicData/index.vue
@@ -11,7 +11,7 @@
             :data="tableData"
             border
             style="width: 100%;max-height: 450px;margin-top: 10px"
-            height="450px"
+            height="350px"
             size="mini"
             stripe
             highlight-current-row>
@@ -75,7 +75,7 @@
           <el-row>
             <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检尺寸</div>
           </el-row>
-          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd3()">新增</el-button>
+          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left:75%;margin-top: 15px" @click="handleAdd3()">新增</el-button>
           <el-table
             :data="tableData2"
             border
@@ -88,13 +88,13 @@
               type="index"
               label="序号"
               align="center"
-              width="50"/>
+              min-width="50"/>
             <el-table-column label="质检尺寸" align="center">
               <template slot-scope="scope">
                 {{ scope.row.质检尺寸 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="200px">
+            <el-table-column label="操作" align="center" fixed="right" width="150px">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -112,7 +112,7 @@
           <el-row>
             <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检外观</div>
           </el-row>
-          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd4()">增加</el-button>
+          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left:75%;margin-top: 15px" @click="handleAdd4()">增加</el-button>
           <el-table :data="tableData3" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" stripe highlight-current-row size="mini">
             <el-table-column
               type="index"
@@ -124,7 +124,7 @@
                 {{ scope.row.质检外观 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="200px">
+            <el-table-column label="操作" align="center" fixed="right" width="150px">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -142,7 +142,7 @@
           <el-row>
             <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检形位</div>
           </el-row>
-          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd5()">增加</el-button>
+          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left:75%;margin-top: 15px" @click="handleAdd5()">增加</el-button>
           <el-table :data="tableData4" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" stripe highlight-current-row size="mini">
             <el-table-column
               type="index"
@@ -154,7 +154,7 @@
                 {{ scope.row.质检形位 }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" width="200px">
+            <el-table-column label="操作" align="center" fixed="right" width="150px">
               <template slot-scope="scope">
                 <el-button
                   size="mini"
@@ -174,7 +174,7 @@
           <el-row>
             <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">检测项</div>
           </el-row>
-          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd6()">增加</el-button>
+          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left:75%;margin-top: 15px" @click="handleAdd6()">增加</el-button>
           <el-table :data="tableData5" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" highlight-current-row stripe size="mini" @row-click="searchTesting">
             <el-table-column
               type="index"
diff --git a/src/views/PurchasingCenter/ArrivalEnquiry/index.vue b/src/views/PurchasingCenter/ArrivalEnquiry/index.vue
index f651786e..5d11108e 100644
--- a/src/views/PurchasingCenter/ArrivalEnquiry/index.vue
+++ b/src/views/PurchasingCenter/ArrivalEnquiry/index.vue
@@ -36,11 +36,6 @@
             {{ scope.row.采购合同流水号 }}
           </template>
         </el-table-column>
-        <el-table-column label="采购编码" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.采购合同流水号 }}
-          </template>
-        </el-table-column>
         <el-table-column label="采购合同编号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
diff --git a/src/views/PurchasingCenter/FundApproval3/index.vue b/src/views/PurchasingCenter/FundApproval3/index.vue
index 0efccfce..da8440da 100644
--- a/src/views/PurchasingCenter/FundApproval3/index.vue
+++ b/src/views/PurchasingCenter/FundApproval3/index.vue
@@ -2,23 +2,23 @@
   <div class="app-container">
     <el-card>
       <h3 style="margin-top: 0">采购合同</h3>
-      <el-table v-loading="" :data="tableData1" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
-        <el-table-column label="供应商" align="center" min-width="170">
+      <el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 300px;" height="300px" size="mini">
+        <el-table-column label="供应商" align="center" min-width="350">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款时间" align="center" min-width="150">
+        <el-table-column label="请款时间" align="center" min-width="140">
           <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="80">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">
+        <el-table-column label="请款金额" align="center" min-width="80" prop="请款金额">
           <template slot-scope="scope">
             {{ scope.row.请款金额 }}
           </template>
@@ -26,7 +26,7 @@
         <el-table-column label="审核" align="center" width="320">
           <template slot-scope="scope">
             <el-popover placement="right" width="400" trigger="click">
-              <el-table :data="gridData1" stripe size="mini" show-summary highlight-current-row @row-click="searchContactDetail">
+              <el-table :data="gridData1" class="subTableHeader" stripe size="mini" show-summary highlight-current-row @row-click="searchContactDetail">
                 <el-table-column width="50" align="center" type="index" label="序号"/>
                 <el-table-column min-width="150" align="center" label="采购合同编号">
                   <template slot-scope="scope">
@@ -39,10 +39,10 @@
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable01(scope.row)">查看详情</el-button>
+              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" plain style="margin-right: 10px" @click="searchTable01(scope.row)">查看详情</el-button>
             </el-popover>
-            <el-button type="primary" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>
+            <el-button type="primary" size="mini" icon="el-icon-check" plain @click="yesApproval(scope.row)">通过</el-button>
+            <el-button type="danger" size="mini" icon="el-icon-close" plain @click="noApproval(scope.row)">不通过</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -58,26 +58,25 @@
           @current-change="handleCurrentChange1"/>
       </div>
     </el-card>
-
     <el-card>
       <h3 style="margin-top: 0">离线合同</h3>
-      <el-table v-loading="" :data="tableData2" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
-        <el-table-column label="供应商" align="center" min-width="170">
+      <el-table v-loading="" :data="tableData2" border stripe style="width: 100%;max-height: 300px;" height="300px" size="mini">
+        <el-table-column label="供应商" align="center" min-width="320">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款时间" align="center" min-width="150">
+        <el-table-column label="请款时间" align="center" min-width="140">
           <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="80">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">
+        <el-table-column label="请款金额" align="center" min-width="90" prop="请款金额">
           <template slot-scope="scope">
             {{ scope.row.请款金额 }}
           </template>
@@ -85,23 +84,23 @@
         <el-table-column label="付款" align="center" width="320">
           <template slot-scope="scope">
             <el-popover placement="right" width="400" trigger="click">
-              <el-table :data="gridData2" stripe size="mini" show-summary highlight-current-row @row-click="searchOfflineContactDetail">
+              <el-table :data="gridData2" class="subTableHeader" stripe size="mini" show-summary highlight-current-row @row-click="searchOfflineContactDetail">
                 <el-table-column width="50" align="center" type="index" label="序号"/>
                 <el-table-column min-width="150" align="center" label="离线合同编号">
                   <template slot-scope="scope">
                     {{ scope.row.离线合同编号 }}
                   </template>
                 </el-table-column>
-                <el-table-column min-width="100" align="center" label="合同总额" prop="请款金额">
+                <el-table-column min-width="80" align="center" label="合同总额" prop="请款金额">
                   <template slot-scope="scope">
                     {{ scope.row.请款金额 }}
                   </template>
                 </el-table-column>
               </el-table>
-              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" style="margin-right: 10px" @click="searchTable02(scope.row)">查看详情</el-button>
+              <el-button slot="reference" type="success" size="mini" icon="el-icon-search" plain style="margin-right: 10px" @click="searchTable02(scope.row)">查看详情</el-button>
             </el-popover>
-            <el-button type="primary" size="mini" icon="el-icon-check" @click="yesApprovalOffline(scope.row)">通过</el-button>
-            <el-button type="danger" size="mini" icon="el-icon-close" @click="noApprovalOffline(scope.row)">不通过</el-button>
+            <el-button type="primary" size="mini" plain icon="el-icon-check" @click="yesApprovalOffline(scope.row)">通过</el-button>
+            <el-button type="danger" size="mini" icon="el-icon-close" plain @click="noApprovalOffline(scope.row)">不通过</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -120,23 +119,23 @@
     <h3 style="margin-top: 0">采购合同</h3>
     <div id="print" class="print" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="contractDetail1"/>
     <h3 style="">离线合同</h3>
-    <el-table v-loading="" :data="contractDetail2" :summary-method="getSummaries" border style="margin-top:10px;max-height: 500px;" height="500px" size="mini" show-summary>
-      <el-table-column label="离线合同编号" align="center" min-width="150">
+    <el-table v-loading="" :data="contractDetail2" :summary-method="getSummaries" border stripe style="margin-top:10px;max-height: 500px;" height="500px" size="mini" show-summary>
+      <el-table-column label="离线合同编号" align="center" min-width="130">
         <template slot-scope="scope">
           {{ scope.row.离线合同编号 }}
         </template>
       </el-table-column>
-      <el-table-column label="物料名称" align="center" min-width="150">
+      <el-table-column label="物料名称" align="center" min-width="100 ">
         <template slot-scope="scope">
           {{ scope.row.物料名称 }}
         </template>
       </el-table-column>
-      <el-table-column label="物料规格" align="center" min-width="100">
+      <el-table-column label="物料规格" align="center" min-width="150">
         <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="120">
         <template slot-scope="scope">
           {{ scope.row.物料型号 }}
         </template>
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
index bb24fb59..8140bf86 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
@@ -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" min-width="85">
           <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="126">
           <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="136">
           <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="136">
           <template slot-scope="scope">
             {{ scope.row.审批4时间 ? scope.row.审批4时间 : '—' }}
           </template>
@@ -91,14 +91,14 @@
             {{ 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="136">
           <template slot-scope="scope">
             {{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
           </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 :disabled="false" type="primary" size="mini" @click="excuteApprove(scope.row)">审批</el-button>
+            <el-button :disabled="false" type="primary" plain size="mini" @click="excuteApprove(scope.row)">审批</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -114,12 +114,11 @@
           @current-change="handleCurrentChange1"/>
       </div>
     </el-card>
-
     <el-card>
       <h4 style="margin-top: 5px;display: inline-block;width: 150px;">发票结算申请单明细</h4>
       <span>发票号：</span>
       <el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/>
-      <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
+      <el-table :data="tableData2" border stripe highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
         <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.采购物料名称 || scope.row.离线物料名称 || scope.row.采购零件名称 }}
@@ -277,4 +276,7 @@ export default {
   #expandTable .el-form-item{
     margin: 0;
   }
+  .el-card{
+    margin: 0px;
+  }
 </style>
diff --git a/src/views/WorkshopProcurement/FundApproval3/index.vue b/src/views/WorkshopProcurement/FundApproval3/index.vue
index 0578be24..f2879d0d 100644
--- a/src/views/WorkshopProcurement/FundApproval3/index.vue
+++ b/src/views/WorkshopProcurement/FundApproval3/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
 
     <el-card>
-      <el-table v-loading="" :data="tableData" border style="width: 100%;max-height: 500px;" height="300px" size="mini">
+      <el-table v-loading="" :data="tableData" border stripe style="width: 100%;max-height: 500px;" height="300px" size="mini">
         <el-table-column label="供应商" align="center" min-width="170">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -59,7 +59,7 @@
       </div>
     </el-card>
     <el-card>
-      <el-table v-loading="" :data="tableData2" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
+      <el-table v-loading="" :data="tableData2" border stripe style="width: 100%;max-height: 300px;" height="300px" size="mini">
         <el-table-column label="供应商" align="center" min-width="170">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -116,7 +116,7 @@
       </div>
     </el-card>
     <el-card>
-      <el-table v-loading="" :data="tableData3" border style="width: 100%;max-height: 300px;" height="300px" size="mini">
+      <el-table v-loading="" :data="tableData3" border stripe style="width: 100%;max-height: 300px;" height="300px" size="mini">
         <el-table-column label="供应商" align="center" min-width="170">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue
index 9d1d1cbf..19ddec39 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue
@@ -6,11 +6,10 @@
       <el-date-picker v-model="date2" size="small" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择结束日期"/>
       <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
     </el-card>
-
     <el-card>
       <h4 style="margin-top: 5px">发票结算申请单</h4>
-      <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%;height: 330px;overflow:auto" size="mini" @row-click="searchTable2">
-        <el-table-column type="expand">
+      <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%" height="330" size="mini" @row-click="searchTable2">
+        <el-table-column label="展开" align="center" type="expand" >
           <template slot-scope="scope">
             <el-form label-position="left" inline class="demo-table-expand">
               <el-row>
@@ -47,7 +46,7 @@
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="发票号" align="center" min-width="90">
+        <el-table-column label="发票号" align="center" min-width="118">
           <template slot-scope="scope">
             {{ scope.row.发票号 }}
           </template>
@@ -57,12 +56,12 @@
             {{ scope.row.发票金额 }}
           </template>
         </el-table-column>
-        <el-table-column label="申请人" align="center" min-width="60">
+        <el-table-column label="申请人" align="center" min-width="85">
           <template slot-scope="scope">
             {{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
           </template>
         </el-table-column>
-        <el-table-column label="申请时间" align="center" min-width="110">
+        <el-table-column label="申请时间" align="center" min-width="140">
           <template slot-scope="scope">
             {{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
           </template>
@@ -97,9 +96,9 @@
             {{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
           </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 :disabled="false" type="primary" size="mini" @click="excuteApprove(scope.row)">审批</el-button>
+            <el-button :disabled="false" type="primary" size="mini" plain @click="excuteApprove(scope.row)">审批</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -126,12 +125,12 @@
             {{ 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="180">
           <template slot-scope="scope">
             {{ 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="100">
           <template slot-scope="scope">
             {{ scope.row.采购物料规格 || scope.row.离线物料规格 || scope.row.采购零件规格 }}
           </template>