From 6d9bd40f65d729894103a6f1f3ab11b8359a0ebc Mon Sep 17 00:00:00 2001
From: jishenghua <752718920@qq.com>
Date: Tue, 10 Jun 2025 23:33:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=B4=A6=E6=88=B7=E7=9A=84=E6=B5=81?=
 =?UTF-8?q?=E6=B0=B4=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8?=
 =?UTF-8?q?=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/report/modules/AccountInOutList.vue | 48 +++++++++++++++----
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/jshERP-web/src/views/report/modules/AccountInOutList.vue b/jshERP-web/src/views/report/modules/AccountInOutList.vue
index 7e428ebc..7a57619c 100644
--- a/jshERP-web/src/views/report/modules/AccountInOutList.vue
+++ b/jshERP-web/src/views/report/modules/AccountInOutList.vue
@@ -2,7 +2,7 @@
   <div ref="container">
     <a-modal
       :title="title"
-      :width="1000"
+      :width="1200"
       :visible="visible"
       :getContainer="() => $refs.container"
       :maskStyle="{'top':'93px','left':'154px'}"
@@ -60,6 +60,32 @@
         <span slot="numberCustomRender" slot-scope="text, record">
           <a @click="myHandleDetail(record)">{{record.number}}</a>
         </span>
+        <span slot="customTitle">
+          <a-popover trigger="click" placement="right">
+            <template slot="content">
+              <a-checkbox-group @change="onColChange" v-model="settingDataIndex" :defaultValue="settingDataIndex">
+                <a-row style="width: 600px">
+                  <template v-for="(item,index) in defColumns">
+                    <template>
+                      <a-col :span="6">
+                        <a-checkbox :value="item.dataIndex" v-if="item.dataIndex==='rowIndex'" disabled></a-checkbox>
+                        <a-checkbox :value="item.dataIndex" v-if="item.dataIndex!=='rowIndex'">
+                          <j-ellipsis :value="item.title" :length="10"></j-ellipsis>
+                        </a-checkbox>
+                      </a-col>
+                    </template>
+                  </template>
+                </a-row>
+                <a-row style="padding-top: 10px;">
+                  <a-col>
+                    恢复默认列配置：<a-button @click="handleRestDefault" type="link" size="small">恢复默认</a-button>
+                  </a-col>
+                </a-row>
+              </a-checkbox-group>
+            </template>
+            <a-icon type="setting" />
+          </a-popover>
+        </span>
       </a-table>
       <!-- table区域-end -->
       <!-- 表单区域 -->
@@ -100,14 +126,16 @@
           endTime: '',
         },
         tabKey: "1",
-        // 表头
-        columns: [
+        pageName: 'accountInOutList',
+        // 默认索引
+        defDataIndex:['rowIndex','number','type','supplierName','changeAmount','balance','operTime'],
+        // 默认列
+        defColumns: [
           {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
+            dataIndex: 'rowIndex',
             width:40,
             align:"center",
+            slots: { title: 'customTitle' },
             customRender:function (t,r,index) {
               return parseInt(index)+1;
             }
@@ -143,7 +171,8 @@
             }
           },
           { title: '余额', dataIndex: 'balance', width: 80},
-          { title: '单据日期', dataIndex: 'operTime', width: 120}
+          { title: '单据日期', dataIndex: 'operTime', width: 120},
+          { title: '备注', dataIndex: 'remark', width: 150}
         ],
         labelCol: {
           xs: { span: 1 },
@@ -159,6 +188,7 @@
       }
     },
     created() {
+      this.initColumnsSetting()
     },
     methods: {
       getQueryParams() {
@@ -216,11 +246,11 @@
       },
       exportExcel() {
         let list = []
-        let head = '单据编号,类型,单位信息,金额,余额,单据日期'
+        let head = '单据编号,类型,单位信息,金额,余额,单据日期,备注'
         for (let i = 0; i < this.dataSource.length; i++) {
           let item = []
           let ds = this.dataSource[i]
-          item.push(ds.number, ds.type, ds.supplierName, this.getRealChangeAmount(ds), ds.balance, ds.operTime)
+          item.push(ds.number, ds.type, ds.supplierName, this.getRealChangeAmount(ds), ds.balance, ds.operTime, ds.remark)
           list.push(item)
         }
         let tip = '账户流水'