From aac42f8de26f848be7fa7282840ad22215733d2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Sat, 4 Jun 2022 17:26:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=9F=E8=83=BD=EF=BC=9A?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=87=BA=E5=85=A5=E5=BA=93=E5=8D=95=E6=8D=AE?=
 =?UTF-8?q?id=E6=9F=A5=E8=AF=A2=E6=94=B6=E4=BB=98=E6=AC=BE=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/dialog/BillDetail.vue      | 39 ++++++++++++++++++-
 .../financial/dialog/FinancialDetail.vue      | 22 ++---------
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue
index 6e094855..3ca8ed17 100644
--- a/jshERP-web/src/views/bill/dialog/BillDetail.vue
+++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue
@@ -342,6 +342,13 @@
                 {{model.debt}}
               </a-form-item>
             </a-col>
+            <a-col v-if="financialBillNoList.length" :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="付款单号">
+                <template v-for="(item, index) in financialBillNoList">
+                  <a @click="myHandleFinancialDetail(item.billNo)">{{item.billNo}}</a><br/>
+                </template>
+              </a-form-item>
+            </a-col>
           </a-row>
         </section>
       </template>
@@ -605,6 +612,13 @@
                 {{model.salesManStr}}
               </a-form-item>
             </a-col>
+            <a-col v-if="financialBillNoList.length" :span="6">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="收款单号">
+                <template v-for="(item, index) in financialBillNoList">
+                  <a @click="myHandleFinancialDetail(item.billNo)">{{item.billNo}}</a><br/>
+                </template>
+              </a-form-item>
+            </a-col>
           </a-row>
         </section>
       </template>
@@ -954,21 +968,24 @@
       </template>
     </a-form>
     <bill-print-iframe ref="modalDetail"></bill-print-iframe>
+    <financial-detail ref="financialDetailModal"></financial-detail>
   </j-modal>
 </template>
 
 <script>
   import pick from 'lodash.pick'
   import { getAction } from '@/api/manage'
-  import { findBillDetailByNumber, getPlatformConfigByKey, getCurrentSystemConfig} from '@/api/api'
+  import { findBillDetailByNumber, findFinancialDetailByNumber, getPlatformConfigByKey, getCurrentSystemConfig} from '@/api/api'
   import { getMpListShort } from "@/utils/util"
   import BillPrintIframe from './BillPrintIframe'
+  import FinancialDetail from '../../financial/dialog/FinancialDetail'
   import JUpload from '@/components/jeecg/JUpload'
   import Vue from 'vue'
   export default {
     name: 'BillDetail',
     components: {
       BillPrintIframe,
+      FinancialDetail,
       JUpload
     },
     data () {
@@ -981,6 +998,7 @@
         billPrintFlag: false,
         fileList: [],
         purchaseBySaleFlag: false,
+        financialBillNoList: [],
         tableWidth: {
           'width': '1550px'
         },
@@ -1387,6 +1405,13 @@
           }
         })
       },
+      getFinancialBillNoByBillId(billId) {
+        getAction('/accountHead/getFinancialBillNoByBillId', {billId: billId}).then(res => {
+          if(res && res.code === 200){
+            this.financialBillNoList = res.data
+          }
+        })
+      },
       show(record, type) {
         this.billType = type
         //附件下载
@@ -1417,6 +1442,7 @@
         this.requestSubTableData(record, type, url, params);
         this.initPlatform()
         this.getSystemConfig()
+        this.getFinancialBillNoByBillId(this.model.id)
       },
       requestSubTableData(record, type, url, params, success) {
         this.loading = true
@@ -1446,6 +1472,17 @@
           }
         })
       },
+      myHandleFinancialDetail(billNo) {
+        let that = this
+        findFinancialDetailByNumber({ billNo: billNo }).then((res) => {
+          if (res && res.code === 200) {
+            if(that.$refs.financialDetailModal) {
+              that.$refs.financialDetailModal.show(res.data, res.data.type);
+              that.$refs.financialDetailModal.title= res.data.type + "-详情";
+            }
+          }
+        })
+      },
       //三联打印预览
       handlePrint() {
         getPlatformConfigByKey({"platformKey": "bill_print_url"}).then((res)=> {
diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
index 5b78e987..979e813a 100644
--- a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
+++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue
@@ -283,9 +283,6 @@
             :pagination="false"
             :columns="moneyInColumns"
             :dataSource="dataSource">
-            <span slot="numberCustomRender" slot-scope="text, record">
-              <a @click="myHandleDetail(record)">{{record.billNumber}}</a>
-            </span>
           </a-table>
           <a-row class="form-row" :gutter="24">
             <a-col :lg="24" :md="24" :sm="24">
@@ -395,20 +392,16 @@
         </a-row>
       </template>
     </a-form>
-    <!-- 表单区域 -->
-    <bill-detail ref="modalDetail"></bill-detail>
   </j-modal>
 </template>
 <script>
   import pick from 'lodash.pick'
-  import BillDetail from '../../bill/dialog/BillDetail'
   import { getAction } from '@/api/manage'
   import { findBillDetailByNumber} from '@/api/api'
   import JUpload from '@/components/jeecg/JUpload'
   export default {
     name: 'FinancialDetail',
     components: {
-      BillDetail,
       JUpload
     },
     data () {
@@ -455,8 +448,7 @@
         ],
         moneyInColumns: [
           {
-            title: '销售单据编号', dataIndex: 'billNumber', width: '20%',
-            scopedSlots: { customRender: 'numberCustomRender' },
+            title: '销售单据编号', dataIndex: 'billNumber', width: '20%'
           },
           { title: '应收欠款',dataIndex: 'needDebt', width: '10%'},
           { title: '已收欠款',dataIndex: 'finishDebt', width: '10%'},
@@ -464,7 +456,9 @@
           { title: '备注',dataIndex: 'remark', width: '20%'}
         ],
         moneyOutColumns: [
-          { title: '采购单据编号',dataIndex: 'billNumber',width: '20%'},
+          {
+            title: '采购单据编号', dataIndex: 'billNumber', width: '20%'
+          },
           { title: '应付欠款',dataIndex: 'needDebt', width: '10%'},
           { title: '已付欠款',dataIndex: 'finishDebt', width: '10%'},
           { title: '本次付款',dataIndex: 'eachAmount', width: '10%'},
@@ -510,14 +504,6 @@
         this.$emit('close');
         this.visible = false;
       },
-      myHandleDetail(record) {
-        findBillDetailByNumber({ number: record.billNumber }).then((res) => {
-          if (res && res.code === 200) {
-            this.$refs.modalDetail.show(res.data, res.data.subType + res.data.type);
-            this.$refs.modalDetail.title= res.data.subType + res.data.type + "-详情";
-          }
-        })
-      }
     }
   }
 </script>