From 113efa89aebd6b92b5ea166a0763e1e88e8e8dee Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 21 Sep 2019 09:38:01 +0800
Subject: [PATCH] =?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/utils/request.js                          |  2 +-
 .../ProjectTotalSearch/index.vue              |  3 ++
 .../PurchasingCenter/SetPayPlan/index.vue     | 30 +++++++++++++++++--
 .../InvoiceSettlementApplication1/index.vue   | 10 +++----
 4 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 8eaacaf2..b5b44666 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.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.0.103:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 
diff --git a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
index c6af2843..74e3c374 100644
--- a/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
+++ b/src/views/PurchasingCenter/ProjectTotalSearch/index.vue
@@ -206,4 +206,7 @@ export default {
   .el-date-editor{
     width:300px
   }
+  .el-table__footer-wrapper {
+    height: 500px;
+  }
 </style>
diff --git a/src/views/PurchasingCenter/SetPayPlan/index.vue b/src/views/PurchasingCenter/SetPayPlan/index.vue
index 47c99288..c2900696 100644
--- a/src/views/PurchasingCenter/SetPayPlan/index.vue
+++ b/src/views/PurchasingCenter/SetPayPlan/index.vue
@@ -34,9 +34,9 @@
         size="mini"
         @row-click="searchContract"
         @expand-change="searchPlan">
-        <el-table-column type="expand">
+        <el-table-column label="详情" type="expand">
           <template slot-scope="props">
-            <el-table v-loading="" v-show="tableData01.length!==0" :data="tableData01" border size="mini">
+            <el-table v-show="tableData01.length!==0" :data="tableData01" class="subTableHeader" border size="mini" style="width: 450px">
               <el-table-column label="序号" align="center" type="index"/>
               <el-table-column label="计划付款日期" align="center">
                 <template slot-scope="scope">
@@ -55,7 +55,16 @@
               </el-table-column>
               <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
-                  <el-button type="danger" size="mini" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
+                  <el-tooltip effect="dark" content="删除" placement="top">
+                    <div style="display: inline-block">
+                      <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        @click.stop="handleDelete(scope.row)"/>
+                    </div>
+                  </el-tooltip>
+                  <!--<el-button type="danger" size="mini" plain icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>-->
                 </template>
               </el-table-column>
             </el-table>
@@ -292,4 +301,19 @@ export default {
   .el-tag{
     margin: 0
   }
+  .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;
+  }
+  }
+
 </style>
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
index 6f6ecfac..32ef089b 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
@@ -10,7 +10,7 @@
     <el-card>
       <h4 style="margin-top: 5px">发票结算申请单</h4>
       <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%;" height="350px" size="mini" @row-click="searchTable2">
-        <el-table-column type="expand">
+        <el-table-column label="详情" type="expand">
           <template slot-scope="scope">
             <el-form label-position="left" inline class="demo-table-expand">
               <el-row>
@@ -97,11 +97,11 @@
             {{ 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" plain icon="el-icon-edit" size="mini" style="margin-left:10px" @click="handleEdit(scope.row)">编辑</el-button>
+            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="danger" plain icon="el-icon-delete" size="mini" style="margin-left:10px" @click="handleDelete(scope.row)">删除</el-button>
+            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="warning" plain size="mini" style="margin-left:10px" @click="submitApply(scope.row)">提交申请</el-button>
           </template>
         </el-table-column>
       </el-table>