From 28119888cf61a553c2fb33fc56b6be7369d2c489 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Tue, 10 Mar 2020 09:35:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=BB=93=E7=AE=97=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FundApproval3/index.vue                   | 14 +++----
 .../InvoiceSettlementApprove1/index.vue       | 40 +++++++------------
 2 files changed, 22 insertions(+), 32 deletions(-)

diff --git a/src/views/WorkshopProcurement/FundApproval3/index.vue b/src/views/WorkshopProcurement/FundApproval3/index.vue
index 8bc6c547..35d3c57b 100644
--- a/src/views/WorkshopProcurement/FundApproval3/index.vue
+++ b/src/views/WorkshopProcurement/FundApproval3/index.vue
@@ -8,9 +8,9 @@
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款时间" align="center" min-width="150">
+        <el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">
           <template slot-scope="scope">
-            {{ scope.row.请款时间 }}
+            {{ scope.row.请款金额 }}
           </template>
         </el-table-column>
         <el-table-column label="请款人" align="center" min-width="100">
@@ -18,9 +18,9 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款金额" align="center" min-width="100" prop="请款金额">
+        <el-table-column label="请款时间" align="center" min-width="150">
           <template slot-scope="scope">
-            {{ scope.row.请款金额 }}
+            {{ scope.row.请款时间 }}
           </template>
         </el-table-column>
         <el-table-column label="审核" align="center" width="320">
@@ -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="text" size="mini" icon="el-icon-search" 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="text" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
+            <el-button type="text" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">未过</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue
index bda0aa13..e70f9477 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue
@@ -7,8 +7,8 @@
       <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="330" size="mini" @row-click="searchTable2">
+      <!--<h4 style="margin-top: 5px">发票结算申请单</h4>-->
+      <el-table id="expandTable" :data="tableData1" border highlight-current-row style="width: 100%" height="330" size="mini">
         <el-table-column label="展开" align="center" type="expand" >
           <template slot-scope="scope">
             <el-form label-position="left" inline class="demo-table-expand">
@@ -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="70">
           <template slot-scope="scope">
             {{ scope.row.发票金额 }}
           </template>
@@ -63,7 +63,7 @@
         </el-table-column>
         <el-table-column label="申请时间" align="center" min-width="140">
           <template slot-scope="scope">
-            {{ scope.row.申请时间 ? scope.row.申请时间 : '—' }}
+            {{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }}
           </template>
         </el-table-column>
         <el-table-column label="采购审批" align="center" min-width="60">
@@ -73,7 +73,7 @@
         </el-table-column>
         <el-table-column label="审批时间" align="center" min-width="110">
           <template slot-scope="scope">
-            {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
+            {{ scope.row.审批1时间 ? scope.row.审批1时间split(' ')[0] : '—' }}
           </template>
         </el-table-column>
         <el-table-column label="财务审批" align="center" min-width="60">
@@ -83,7 +83,7 @@
         </el-table-column>
         <el-table-column label="审批时间" align="center" min-width="110">
           <template slot-scope="scope">
-            {{ scope.row.审批2时间 ? scope.row.审批2时间 : '—' }}
+            {{ scope.row.审批2时间 ? scope.row.审批2时间split(' ')[0] : '—' }}
           </template>
         </el-table-column>
         <el-table-column label="总经理审批" align="center" min-width="70">
@@ -93,12 +93,13 @@
         </el-table-column>
         <el-table-column label="审批时间" align="center" min-width="110">
           <template slot-scope="scope">
-            {{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
+            {{ scope.row.审批3时间 ? scope.row.审批3时间split(' ')[0] : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="100" fixed="right">
+        <el-table-column label="操作" align="center" width="160" fixed="right">
           <template slot-scope="scope">
-            <el-button :disabled="false" type="primary" size="mini" plain @click="excuteApprove(scope.row)">审批</el-button>
+            <el-button slot="reference" type="text" size="mini" icon="el-icon-search" style="margin-right: 5px" @click="searchTable2(scope.row)">查看详情</el-button>
+            <el-button :disabled="false" type="text" icon="el-icon-check" size="mini" plain @click="excuteApprove(scope.row)">通过</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -115,10 +116,7 @@
       </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-dialog :visible.sync="dialogFormVisible" title="明细" center style="min-height: 200px" width="1000px">
       <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">
           <template slot-scope="scope">
@@ -135,28 +133,18 @@
             {{ scope.row.采购物料规格 || scope.row.离线物料规格 || scope.row.采购零件规格 }}
           </template>
         </el-table-column>
-        <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="100">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 || scope.row.离线合同编号 }}
           </template>
         </el-table-column>
-        <el-table-column label="合同名称" align="center" min-width="100">
-          <template slot-scope="scope">
-            {{ scope.row.采购合同名称 || scope.row.离线合同名称 }}
-          </template>
-        </el-table-column>
         <el-table-column label="到票数量" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.到票数量 }}
           </template>
         </el-table-column>
       </el-table>
-    </el-card>
+    </el-dialog>
   </div>
 </template>
 
@@ -177,7 +165,8 @@ export default {
       pageSize1: 10,
       invoiceNumber: '',
       tableData2: [],
-      tableData3: []
+      tableData3: [],
+      dialogFormVisible: false
     }
   },
   computed: {
@@ -255,6 +244,7 @@ export default {
       this.invoiceNumber = row.发票号
       searchTable2(row.发票结算申请单流水号).then(response => {
         this.tableData2 = response.data
+        this.dialogFormVisible = true
       })
     }
   }