lilei 3 周之前
父节点
当前提交
c7fca53091

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1758850613251
+  "version": 1758858811116
 }

+ 1 - 1
src/api/settle.js

@@ -163,7 +163,7 @@ export const settleInfoQueryReceiptOrPaySum = (params) => {
 //  单位收付款  列表 合计
 export const settleInfoQuerySum = (params) => {
   return axios({
-    url: '/settle/info/querySum',
+    url: '/settle/unit/queryClientUnSettleSum',
     data: params,
     method: 'post'
   })

+ 25 - 15
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -53,13 +53,13 @@
       <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ total }}</strong> 条记录,
-          应收合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
-          已收合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
-          待收合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
-          应付合计 <strong>{{ (productTotal&&(productTotal.pay || productTotal.pay==0)) ? toThousands(productTotal.pay) : '--' }}</strong> ;
-          已付合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
-          待付合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
-          折让合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ;
+          应收合计 <strong>{{ (productTotal&&(productTotal.unsettleAmountReceipt || productTotal.unsettleAmountReceipt==0)) ? toThousands(productTotal.unsettleAmountReceipt) : '--' }}</strong> ,
+          已收合计 <strong>{{ (productTotal&&(productTotal.settleAmountReceipt || productTotal.settleAmountReceipt==0)) ? toThousands(productTotal.settleAmountReceipt) : '--' }}</strong> ,
+          待收合计 <strong>{{ (productTotal&&(productTotal.waitSettleAmountReceipt || productTotal.waitSettleAmountReceipt==0)) ? toThousands(productTotal.waitSettleAmountReceipt) : '--' }}</strong> ,
+          应付合计 <strong>{{ (productTotal&&(productTotal.unsettleAmountPay || productTotal.unsettleAmountPay==0)) ? toThousands(productTotal.unsettleAmountPay) : '--' }}</strong> ;
+          已付合计 <strong>{{ (productTotal&&(productTotal.settleAmountPay || productTotal.settleAmountPay==0)) ? toThousands(productTotal.settleAmountPay) : '--' }}</strong> ,
+          待付合计 <strong>{{ (productTotal&&(productTotal.waitSettleAmountPay || productTotal.waitSettleAmountPay==0)) ? toThousands(productTotal.waitSettleAmountPay) : '--' }}</strong> ,
+          折让合计 <strong>{{ (productTotal&&(productTotal.discountAmount || productTotal.discountAmount==0)) ? toThousands(productTotal.discountAmount) : '--' }}</strong> ;
         </div>
       </a-alert>
       <!-- 列表 -->
@@ -137,20 +137,30 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '客户名称', width: '15%', align: 'center', scopedSlots: { customRender: 'customerName' } },
         { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '应收金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '已收金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '待收金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '应付金额', dataIndex: 'unSettleAmountPay', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '已付金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '未付金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '折让金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '应收金额', dataIndex: 'unsettleAmountReceipt', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '已收金额', dataIndex: 'settleAmountReceipt', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '待收金额', dataIndex: 'waitSettleAmountReceipt', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '应付金额', dataIndex: 'unsettleAmountPay', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '已付金额', dataIndex: 'settleAmountPay', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '未付金额', dataIndex: 'waitSettleAmountPay', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '折让金额', dataIndex: 'discountAmount', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        const params = Object.assign(parameter, this.queryParam)
+        const sortFiled = {
+          'unsettleAmountReceipt': 'UNSETTLE_AMOUNT_RECEIPT',
+          'settleAmountReceipt': 'SETTLE_AMOUNT_RECEIPT',
+          'waitSettleAmountReceipt': 'WAIT_SETTLE_AMOUNT_RECEIPT',
+          'unsettleAmountPay': 'UNSETTLE_AMOUNT_PAY',
+          'settleAmountPay': 'SETTLE_AMOUNT_PAY',
+          'waitSettleAmountPay': 'WAIT_SETTLE_AMOUNT_PAY',
+          'discountAmount': 'DISCOUNT_AMOUNT'
+        }
+        const sortOrder = { 'descend': 'desc', 'ascend': 'asc' }
+        const params = Object.assign(parameter, this.queryParam, { sortField: sortFiled[parameter.sortField], sortOrder: sortOrder[parameter.sortOrder] })
         this.getTotal(params)
         return settleUnitClientList(params).then(res => {
           let data

+ 25 - 15
src/views/financialManagement/companyReceivablePayableNew/list.vue

@@ -56,13 +56,13 @@
         <div class="table-operator">
           <div slot="message">
             共 <strong>{{ total }}</strong> 条记录,
-            应收合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
-            已收合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
-            待收合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
-            应付合计 <strong>{{ (productTotal&&(productTotal.pay || productTotal.pay==0)) ? toThousands(productTotal.pay) : '--' }}</strong> ;
-            已付合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
-            待付合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ,
-            折让合计 <strong>{{ (productTotal&&(productTotal.receipt || productTotal.receipt==0)) ? toThousands(productTotal.receipt) : '--' }}</strong> ;
+            应收合计 <strong>{{ (productTotal&&(productTotal.unsettleAmountReceipt || productTotal.unsettleAmountReceipt==0)) ? toThousands(productTotal.unsettleAmountReceipt) : '--' }}</strong> ,
+            已收合计 <strong>{{ (productTotal&&(productTotal.settleAmountReceipt || productTotal.settleAmountReceipt==0)) ? toThousands(productTotal.settleAmountReceipt) : '--' }}</strong> ,
+            待收合计 <strong>{{ (productTotal&&(productTotal.waitSettleAmountReceipt || productTotal.waitSettleAmountReceipt==0)) ? toThousands(productTotal.waitSettleAmountReceipt) : '--' }}</strong> ,
+            应付合计 <strong>{{ (productTotal&&(productTotal.unsettleAmountPay || productTotal.unsettleAmountPay==0)) ? toThousands(productTotal.unsettleAmountPay) : '--' }}</strong> ;
+            已付合计 <strong>{{ (productTotal&&(productTotal.settleAmountPay || productTotal.settleAmountPay==0)) ? toThousands(productTotal.settleAmountPay) : '--' }}</strong> ,
+            待付合计 <strong>{{ (productTotal&&(productTotal.waitSettleAmountPay || productTotal.waitSettleAmountPay==0)) ? toThousands(productTotal.waitSettleAmountPay) : '--' }}</strong> ,
+            折让合计 <strong>{{ (productTotal&&(productTotal.discountAmount || productTotal.discountAmount==0)) ? toThousands(productTotal.discountAmount) : '--' }}</strong> ;
           </div>
         </div>
         <!-- 列表 -->
@@ -141,20 +141,30 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '客户名称', width: '15%', align: 'center', scopedSlots: { customRender: 'customerName' } },
         { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '应收金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '已收金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '待收金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '应付金额', dataIndex: 'unSettleAmountPay', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '已付金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '未付金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '折让金额', dataIndex: 'unSettleAmountReceipt', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '应收金额', dataIndex: 'unsettleAmountReceipt', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '已收金额', dataIndex: 'settleAmountReceipt', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '待收金额', dataIndex: 'waitSettleAmountReceipt', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '应付金额', dataIndex: 'unsettleAmountPay', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '已付金额', dataIndex: 'settleAmountPay', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '未付金额', dataIndex: 'waitSettleAmountPay', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '折让金额', dataIndex: 'discountAmount', width: '9%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        const params = Object.assign(parameter, this.queryParam)
+        const sortFiled = {
+          'unsettleAmountReceipt': 'UNSETTLE_AMOUNT_RECEIPT',
+          'settleAmountReceipt': 'SETTLE_AMOUNT_RECEIPT',
+          'waitSettleAmountReceipt': 'WAIT_SETTLE_AMOUNT_RECEIPT',
+          'unsettleAmountPay': 'UNSETTLE_AMOUNT_PAY',
+          'settleAmountPay': 'SETTLE_AMOUNT_PAY',
+          'waitSettleAmountPay': 'WAIT_SETTLE_AMOUNT_PAY',
+          'discountAmount': 'DISCOUNT_AMOUNT'
+        }
+        const sortOrder = { 'descend': 'desc', 'ascend': 'asc' }
+        const params = Object.assign(parameter, this.queryParam, { sortField: sortFiled[parameter.sortField], sortOrder: sortOrder[parameter.sortOrder] })
         this.getTotal(params)
         return settleUnitClientList(params).then(res => {
           let data