From bcd07444b9b19a5783fc4b68223275ace74ed462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Thu, 17 Jun 2021 23:06:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BE=9B=E5=BA=94=E5=95=86?=
 =?UTF-8?q?=E5=AF=B9=E8=B4=A6=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=B8=8D=E5=BC=B9=E5=87=BA=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/views/report/VendorAccount.vue | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/jshERP-web/src/views/report/VendorAccount.vue b/jshERP-web/src/views/report/VendorAccount.vue
index f6dbab4f..57d62d44 100644
--- a/jshERP-web/src/views/report/VendorAccount.vue
+++ b/jshERP-web/src/views/report/VendorAccount.vue
@@ -57,16 +57,18 @@
         </a-table>
         <!-- table区域-end -->
         <!-- 表单区域 -->
-        <bill-detail ref="modalDetail"></bill-detail>
+        <bill-detail ref="modalBillDetail"></bill-detail>
+        <financial-detail ref="modalFinancialDetail"></financial-detail>
       </a-card>
     </a-col>
   </a-row>
 </template>
 <script>
   import BillDetail from '../bill/dialog/BillDetail'
+  import FinancialDetail from '../financial/dialog/FinancialDetail'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatMonth } from '@/utils/util';
-  import {findBySelectSup, findSupplierById, findDepotHeadTotalPay, findAccountHeadTotalPay, findBillDetailByNumber} from '@/api/api'
+  import {findBySelectSup, findSupplierById, findDepotHeadTotalPay, findAccountHeadTotalPay, findBillDetailByNumber,findFinancialDetailByNumber} from '@/api/api'
   import JEllipsis from '@/components/jeecg/JEllipsis'
   import moment from 'moment'
   export default {
@@ -74,6 +76,7 @@
     mixins:[JeecgListMixin],
     components: {
       BillDetail,
+      FinancialDetail,
       JEllipsis
     },
     data () {
@@ -190,11 +193,21 @@
         }
       },
       myHandleDetail(record) {
-        findBillDetailByNumber({ number: record.number }).then((res) => {
-          if (res && res.code === 200) {
-            this.handleDetail(res.data, record.type);
-          }
-        })
+        if(record.type === '支出' || record.type === '付款') {
+          findFinancialDetailByNumber({ billNo: record.number }).then((res) => {
+            if (res && res.code === 200) {
+              this.$refs.modalFinancialDetail.show(res.data, record.type);
+              this.$refs.modalFinancialDetail.title="详情";
+            }
+          })
+        } else {
+          findBillDetailByNumber({ number: record.number }).then((res) => {
+            if (res && res.code === 200) {
+              this.$refs.modalBillDetail.show(res.data, record.type);
+              this.$refs.modalBillDetail.title="详情";
+            }
+          })
+        }
       },
       searchQuery() {
         if(this.queryParam.beginTime == '' || this.queryParam.endTime == ''){