From c4e949918663ffc979b60f596f16667bbb3c1322 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 3 Jun 2022 18:34:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A2=E6=88=B7=E5=AF=B9?=
 =?UTF-8?q?=E8=B4=A6=E5=92=8C=E4=BE=9B=E5=BA=94=E5=95=86=E5=AF=B9=E8=B4=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/mixins/JeecgListMixin.js       |  4 +-
 .../src/views/report/CustomerAccount.vue      | 56 ++++++++++---------
 jshERP-web/src/views/report/VendorAccount.vue | 56 ++++++++++---------
 3 files changed, 60 insertions(+), 56 deletions(-)

diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js
index 40f14b6a..75ad32b3 100644
--- a/jshERP-web/src/mixins/JeecgListMixin.js
+++ b/jshERP-web/src/mixins/JeecgListMixin.js
@@ -400,8 +400,8 @@ export const JeecgListMixin = {
         let totalRow = { [numKey]: '合计' }
         //需要合计的列
         let parseCols = 'initialStock,currentStock,currentStockPrice,initialAmount,thisMonthAmount,currentAmount,inSum,inSumPrice,inOutSumPrice,' +
-          'outSum,outSumPrice,outInSumPrice,operNumber,allPrice,numSum,priceSum,prevSum,thisSum,thisAllPrice,billMoney,changeAmount,' +
-          'allPrice,currentNumber,lowSafeStock,highSafeStock,lowCritical,highCritical'
+          'outSum,outSumPrice,outInSumPrice,operNumber,allPrice,numSum,priceSum,prevSum,thisSum,thisAllPrice,changeAmount,' +
+          'allPrice,currentNumber,lowSafeStock,highSafeStock,lowCritical,highCritical,preNeed,debtMoney,backMoney,allNeed'
         columns.forEach(column => {
           let { key, dataIndex } = column
           if (![key, dataIndex].includes(numKey)) {
diff --git a/jshERP-web/src/views/report/CustomerAccount.vue b/jshERP-web/src/views/report/CustomerAccount.vue
index a10685a1..2151a1a5 100644
--- a/jshERP-web/src/views/report/CustomerAccount.vue
+++ b/jshERP-web/src/views/report/CustomerAccount.vue
@@ -18,7 +18,7 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-form-item label="账单周期" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-range-picker
                     style="width: 100%"
                     v-model="queryParam.createTimeRange"
@@ -57,8 +57,8 @@
             :scroll="scroll"
             :loading="loading"
             @change="handleTableChange">
-            <span slot="numberCustomRender" slot-scope="text, record">
-              <a @click="myHandleDetail(record)">{{record.number}}</a>
+            <span slot="action" slot-scope="text, record">
+              <a @click="showDebtAccountList(record)">{{record.id?'详情':''}}</a>
             </span>
           </a-table>
           <a-row :gutter="24" style="margin-top: 8px;text-align:right;">
@@ -81,15 +81,13 @@
         </section>
         <!-- table区域-end -->
         <!-- 表单区域 -->
-        <bill-detail ref="modalBillDetail"></bill-detail>
-        <financial-detail ref="modalFinancialDetail"></financial-detail>
+        <debt-account-list ref="debtAccountList"></debt-account-list>
       </a-card>
     </a-col>
   </a-row>
 </template>
 <script>
-  import BillDetail from '../bill/dialog/BillDetail'
-  import FinancialDetail from '../financial/dialog/FinancialDetail'
+  import DebtAccountList from './modules/DebtAccountList'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
   import { getAction } from '@/api/manage'
@@ -100,8 +98,7 @@
     name: "CustomerAccount",
     mixins:[JeecgListMixin],
     components: {
-      BillDetail,
-      FinancialDetail,
+      DebtAccountList,
       JEllipsis
     },
     data () {
@@ -115,7 +112,7 @@
         },
         // 查询条件
         queryParam: {
-          supType: "客户",
+          supplierType: "客户",
           organId: '',
           beginTime: getNowFormatYear() + '-01-01',
           endTime: moment().format('YYYY-MM-DD'),
@@ -139,19 +136,21 @@
               return (t !== '合计') ? (parseInt(index) + 1) : t
             }
           },
-          {
-            title: '单据编号', dataIndex: 'number', width: 140,
-            scopedSlots: { customRender: 'numberCustomRender' },
-          },
-          {title: '类型', dataIndex: 'type', width: 100},
-          {title: '单位名称', dataIndex: 'supplierName', width: 200},
-          {title: '单据金额', dataIndex: 'billMoney', width: 80},
-          {title: '实际支付', dataIndex: 'changeAmount', width: 80},
-          {title: '本期变化', dataIndex: 'allPrice', width: 80},
-          {title: '单据日期', dataIndex: 'oTime', width: 160}
+          {title: '客户', dataIndex: 'supplier', width: 150, ellipsis:true},
+          {title: '联系人', dataIndex: 'contacts', width: 100, ellipsis:true},
+          {title: '手机号码', dataIndex: 'telephone', width: 100},
+          {title: '联系电话', dataIndex: 'phoneNum', width: 100},
+          {title: '电子邮箱', dataIndex: 'email', width: 100},
+          {title: '期初应收', dataIndex: 'preNeed', width: 80},
+          {title: '本期欠款', dataIndex: 'debtMoney', width: 80},
+          {title: '本期收款', dataIndex: 'backMoney', width: 80},
+          {title: '期末应收', dataIndex: 'allNeed', width: 80},
+          {title: '欠款详情', dataIndex: 'action', align:"center", width: 80,
+            scopedSlots: { customRender: 'action' }
+          }
         ],
         url: {
-          list: "/depotHead/findStatementAccount",
+          list: "/depotHead/getStatementAccount",
         }
       }
     },
@@ -209,10 +208,8 @@
             this.dataSource = res.data.rows;
             this.ipagination.total = res.data.total;
             this.tableAddTotalRow(this.columns, this.dataSource)
-            if(this.queryParam.organId) {
-              this.firstTotal = '期初应收：' + res.data.firstMoney + "，"
-              this.lastTotal = '期末应收：' + res.data.lastMoney
-            }
+            this.firstTotal = '期初应收：' + res.data.firstMoney + "，"
+            this.lastTotal = '期末应收：' + res.data.lastMoney
           }
           if(res.code===510){
             this.$message.warning(res.data)
@@ -228,13 +225,18 @@
         }
       },
       exportExcel() {
-        let aoa = [['单据编号', '类型', '单位名称', '单据金额', '实际支付', '本期变化', '单据日期']]
+        let aoa = [['客户', '联系人', '手机号码', '联系电话', '电子邮箱', '期初应收', '本期欠款', '本期收款', '期末应收']]
         for (let i = 0; i < this.dataSource.length; i++) {
           let ds = this.dataSource[i]
-          let item = [ds.number, ds.type, ds.supplierName, ds.billMoney, ds.changeAmount, ds.allPrice, ds.oTime]
+          let item = [ds.supplier, ds.contacts, ds.telephone, ds.phoneNum, ds.email, ds.preNeed, ds.debtMoney, ds.backMoney, ds.allNeed]
           aoa.push(item)
         }
         openDownloadDialog(sheet2blob(aoa), '客户对账')
+      },
+      showDebtAccountList(record) {
+        this.$refs.debtAccountList.show(record.id, '出库', '销售', '客户', "", this.queryParam.beginTime, this.queryParam.endTime)
+        this.$refs.debtAccountList.title = "欠款详情"
+        this.$refs.debtAccountList.disableSubmit = false
       }
     }
   }
diff --git a/jshERP-web/src/views/report/VendorAccount.vue b/jshERP-web/src/views/report/VendorAccount.vue
index d25c066e..03b2a7c0 100644
--- a/jshERP-web/src/views/report/VendorAccount.vue
+++ b/jshERP-web/src/views/report/VendorAccount.vue
@@ -18,7 +18,7 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-form-item label="账单周期" :labelCol="labelCol" :wrapperCol="wrapperCol">
                   <a-range-picker
                     style="width: 100%"
                     v-model="queryParam.createTimeRange"
@@ -57,8 +57,8 @@
             :scroll="scroll"
             :loading="loading"
             @change="handleTableChange">
-            <span slot="numberCustomRender" slot-scope="text, record">
-              <a @click="myHandleDetail(record)">{{record.number}}</a>
+            <span slot="action" slot-scope="text, record">
+              <a @click="showDebtAccountList(record)">{{record.id?'详情':''}}</a>
             </span>
           </a-table>
           <a-row :gutter="24" style="margin-top: 8px;text-align:right;">
@@ -81,15 +81,13 @@
         </section>
         <!-- table区域-end -->
         <!-- 表单区域 -->
-        <bill-detail ref="modalBillDetail"></bill-detail>
-        <financial-detail ref="modalFinancialDetail"></financial-detail>
+        <debt-account-list ref="debtAccountList"></debt-account-list>
       </a-card>
     </a-col>
   </a-row>
 </template>
 <script>
-  import BillDetail from '../bill/dialog/BillDetail'
-  import FinancialDetail from '../financial/dialog/FinancialDetail'
+  import DebtAccountList from './modules/DebtAccountList'
   import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
   import { getAction } from '@/api/manage'
@@ -100,8 +98,7 @@
     name: "VendorAccount",
     mixins:[JeecgListMixin],
     components: {
-      BillDetail,
-      FinancialDetail,
+      DebtAccountList,
       JEllipsis
     },
     data () {
@@ -115,7 +112,7 @@
         },
         // 查询条件
         queryParam: {
-          supType: "供应商",
+          supplierType: "供应商",
           organId: '',
           beginTime: getNowFormatYear() + '-01-01',
           endTime: moment().format('YYYY-MM-DD'),
@@ -139,19 +136,21 @@
               return (t !== '合计') ? (parseInt(index) + 1) : t
             }
           },
-          {
-            title: '单据编号', dataIndex: 'number', width: 140,
-            scopedSlots: { customRender: 'numberCustomRender' },
-          },
-          {title: '类型', dataIndex: 'type', width: 100},
-          {title: '单位名称', dataIndex: 'supplierName', width: 200},
-          {title: '单据金额', dataIndex: 'billMoney', width: 80},
-          {title: '实际支付', dataIndex: 'changeAmount', width: 80},
-          {title: '本期变化', dataIndex: 'allPrice', width: 80},
-          {title: '单据日期', dataIndex: 'oTime', width: 160}
+          {title: '供应商', dataIndex: 'supplier', width: 150, ellipsis:true},
+          {title: '联系人', dataIndex: 'contacts', width: 100, ellipsis:true},
+          {title: '手机号码', dataIndex: 'telephone', width: 100},
+          {title: '联系电话', dataIndex: 'phoneNum', width: 100},
+          {title: '电子邮箱', dataIndex: 'email', width: 100},
+          {title: '期初应付', dataIndex: 'preNeed', width: 80},
+          {title: '本期欠款', dataIndex: 'debtMoney', width: 80},
+          {title: '本期付款', dataIndex: 'backMoney', width: 80},
+          {title: '期末应付', dataIndex: 'allNeed', width: 80},
+          {title: '欠款详情', dataIndex: 'action', align:"center", width: 80,
+            scopedSlots: { customRender: 'action' }
+          }
         ],
         url: {
-          list: "/depotHead/findStatementAccount",
+          list: "/depotHead/getStatementAccount",
         }
       }
     },
@@ -209,10 +208,8 @@
             this.dataSource = res.data.rows;
             this.ipagination.total = res.data.total;
             this.tableAddTotalRow(this.columns, this.dataSource)
-            if(this.queryParam.organId) {
-              this.firstTotal = '期初应付：' + res.data.firstMoney + "，"
-              this.lastTotal = '期末应付：' + res.data.lastMoney
-            }
+            this.firstTotal = '期初应付：' + res.data.firstMoney + "，"
+            this.lastTotal = '期末应付：' + res.data.lastMoney
           }
           if(res.code===510){
             this.$message.warning(res.data)
@@ -228,13 +225,18 @@
         }
       },
       exportExcel() {
-        let aoa = [['单据编号', '类型', '单位名称', '单据金额', '实际支付', '本期变化', '单据日期']]
+        let aoa = [['供应商', '联系人', '手机号码', '联系电话', '电子邮箱', '期初应付', '本期欠款', '本期付款', '期末应付']]
         for (let i = 0; i < this.dataSource.length; i++) {
           let ds = this.dataSource[i]
-          let item = [ds.number, ds.type, ds.supplierName, ds.billMoney, ds.changeAmount, ds.allPrice, ds.oTime]
+          let item = [ds.supplier, ds.contacts, ds.telephone, ds.phoneNum, ds.email, ds.preNeed, ds.debtMoney, ds.backMoney, ds.allNeed]
           aoa.push(item)
         }
         openDownloadDialog(sheet2blob(aoa), '供应商对账')
+      },
+      showDebtAccountList(record) {
+        this.$refs.debtAccountList.show(record.id, '入库', '采购', '供应商', "", this.queryParam.beginTime, this.queryParam.endTime)
+        this.$refs.debtAccountList.title = "欠款详情"
+        this.$refs.debtAccountList.disableSubmit = false
       }
     }
   }