From 1e89cc1601e4d945c91cebcdfa97a72d27fb5827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 17 Oct 2022 22:44:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=AC=A0=E6=AC=BE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=95=8C=E9=9D=A2=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=90=88?=
 =?UTF-8?q?=E8=AE=A1=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/mixins/JeecgListMixin.js       |  7 +++--
 .../views/report/modules/DebtAccountList.vue  | 30 ++++++-------------
 2 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js
index dedf46af..b8f2303a 100644
--- a/jshERP-web/src/mixins/JeecgListMixin.js
+++ b/jshERP-web/src/mixins/JeecgListMixin.js
@@ -400,9 +400,10 @@ export const JeecgListMixin = {
         let numKey = 'rowIndex'
         let totalRow = { [numKey]: '合计' }
         //需要合计的列
-        let parseCols = 'initialStock,currentStock,currentStockPrice,initialAmount,thisMonthAmount,currentAmount,inSum,inSumPrice,inOutSumPrice,' +
-          'outSum,outSumPrice,outInSumPrice,operNumber,allPrice,numSum,priceSum,prevSum,thisSum,thisAllPrice,changeAmount,' +
-          'allPrice,taxMoney,currentNumber,lowSafeStock,highSafeStock,lowCritical,highCritical,preNeed,debtMoney,backMoney,allNeed'
+        let parseCols = 'initialStock,currentStock,currentStockPrice,initialAmount,thisMonthAmount,currentAmount,inSum,inSumPrice,' +
+          'inOutSumPrice,outSum,outSumPrice,outInSumPrice,operNumber,allPrice,numSum,priceSum,prevSum,thisSum,thisAllPrice,changeAmount,' +
+          'allPrice,taxMoney,currentNumber,lowSafeStock,highSafeStock,lowCritical,highCritical,preNeed,debtMoney,backMoney,allNeed,' +
+          'needDebt,finishDebt,debt'
         columns.forEach(column => {
           let { key, dataIndex } = column
           if (![key, dataIndex].includes(numKey)) {
diff --git a/jshERP-web/src/views/report/modules/DebtAccountList.vue b/jshERP-web/src/views/report/modules/DebtAccountList.vue
index 0502ea93..08bc3197 100644
--- a/jshERP-web/src/views/report/modules/DebtAccountList.vue
+++ b/jshERP-web/src/views/report/modules/DebtAccountList.vue
@@ -3,7 +3,6 @@
     :title="title"
     :width="1250"
     :visible="visible"
-    @ok="handleOk"
     @cancel="handleCancel"
     cancelText="关闭"
     wrapClassName="ant-modal-cust-warp"
@@ -43,7 +42,7 @@
       rowKey="id"
       :columns="columns"
       :dataSource="dataSource"
-      :pagination="ipagination"
+      :pagination="false"
       :loading="loading"
       @change="handleTableChange">
       <span slot="numberCustomRender" slot-scope="text, record">
@@ -81,6 +80,9 @@
           roleType: Vue.ls.get('roleType'),
           status: ""
         },
+        ipagination:{
+          pageSize: 10001
+        },
         labelCol: {
           xs: { span: 24 },
           sm: { span: 8 },
@@ -92,13 +94,9 @@
         // 表头
         columns: [
           {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:40,
-            align:"center",
+            title: '#', dataIndex: 'rowIndex', width:40, align:"center",
             customRender:function (t,r,index) {
-              return parseInt(index)+1;
+              return (t !== '合计') ? (parseInt(index) + 1) : t
             }
           },
           {
@@ -115,17 +113,9 @@
           },
           { title: '单据日期', dataIndex: 'operTimeStr',width:130},
           { title: '操作员', dataIndex: 'userName',width:60},
-          { title: '欠款', dataIndex: 'needDebt',width:70,
-            customRender:function (text,record,index) {
-              return (record.discountLastMoney + record.otherMoney - (record.deposit + record.changeAmount)).toFixed(2);
-            }
-          },
-          { title: '已收欠款', dataIndex: 'finishDebt',width:70 },
-          { title: '待收欠款', dataIndex: 'debt',width:70,
-            customRender:function (text,record,index) {
-              return (record.discountLastMoney + record.otherMoney - (record.deposit + record.changeAmount + record.finishDebt)).toFixed(2);
-            }
-          }
+          { title: '欠款', dataIndex: 'needDebt',width:70},
+          { title: '已收欠款', dataIndex: 'finishDebt',width:70},
+          { title: '待收欠款', dataIndex: 'debt',width:70}
         ],
         url: {
           list: "/depotHead/debtList"
@@ -157,8 +147,6 @@
         }
         this.model = Object.assign({}, {});
         this.visible = true;
-        this.ipagination.pageSize = 100
-        this.ipagination.pageSizeOptions = ['100', '200', '300']
         this.loadData(1)
       },
       myHandleDetail(record) {