From c51f946853ae22dec5d7334dfa379c9ae3906197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 17 May 2023 01:13:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=AF=B9=E8=B4=A6=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E7=95=8C=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E6=94=B6=E4=BB=98=E6=AC=BE=E9=A1=B5=E9=9D=A2=EF=BC=88?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/modules/HistoryFinancialList.vue     | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/jshERP-web/src/views/report/modules/HistoryFinancialList.vue b/jshERP-web/src/views/report/modules/HistoryFinancialList.vue
index 1b4145ba..eae2a349 100644
--- a/jshERP-web/src/views/report/modules/HistoryFinancialList.vue
+++ b/jshERP-web/src/views/report/modules/HistoryFinancialList.vue
@@ -64,8 +64,8 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="收款账户" :labelCol="labelCol" :wrapperCol="wrapperCol">
-                  <a-select placeholder="选择收款账户" showSearch optionFilterProp="children" v-model="queryParam.accountId">
+                <a-form-item label="账户信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                  <a-select placeholder="选择账户信息" showSearch optionFilterProp="children" v-model="queryParam.accountId">
                     <a-select-option v-for="(item,index) in accountList" :key="index" :value="item.id">
                       {{ item.name }}
                     </a-select-option>
@@ -100,7 +100,7 @@
         :loading="loading"
         @change="handleTableChange">
         <span slot="billNoCustomRender" slot-scope="text, record">
-          <a @click="myHandleDetail(record, '收款', prefixNo)">{{text}}</a>
+          <a @click="myHandleDetail(record, queryParam.type, prefixNo)">{{text}}</a>
         </span>
         <template slot="customRenderStatus" slot-scope="status">
           <a-tag v-if="status == '0'" color="red">未审核</a-tag>
@@ -154,7 +154,7 @@
           number: "",
           roleType: Vue.ls.get('roleType')
         },
-        prefixNo: 'SK',
+        prefixNo: '',
         disableMixinCreated: true,
         // 表头
         columns: [
@@ -201,6 +201,15 @@
     },
     methods: {
       show() {
+        if(this.queryParam.type === '付款') {
+          this.columns[6].title = '合计付款'
+          this.columns[8].title = '实际付款'
+          this.prefixNo = 'FK'
+        } else if(this.queryParam.type === '收款') {
+          this.columns[6].title = '合计收款'
+          this.columns[8].title = '实际收款'
+          this.prefixNo = 'SK'
+        }
         this.loadData(1)
       },
       close () {