lilei 2 minggu lalu
induk
melakukan
0258473f5b

+ 13 - 13
src/views/financialManagement/companyReceivablePayable/list.vue

@@ -53,12 +53,12 @@
       <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
           共 <strong>{{ total }}</strong> 条记录,
-          应收合计 <strong>{{ (productTotal&&(productTotal.unsettleAmountReceipt || productTotal.unsettleAmountReceipt==0)) ? toThousands(productTotal.unsettleAmountReceipt) : '--' }}</strong> ,
+          应收合计 <strong>{{ (productTotal&&(productTotal.receiveSettleAmountReceipt || productTotal.receiveSettleAmountReceipt==0)) ? toThousands(productTotal.receiveSettleAmountReceipt) : '--' }}</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.unsettleAmountReceipt || productTotal.unsettleAmountReceipt==0)) ? toThousands(productTotal.unsettleAmountReceipt) : '--' }}</strong> ,
+          应付合计 <strong>{{ (productTotal&&(productTotal.receivesettleAmountPay || productTotal.receivesettleAmountPay==0)) ? toThousands(productTotal.receivesettleAmountPay) : '--' }}</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.unsettleAmountPay || productTotal.unsettleAmountPay==0)) ? toThousands(productTotal.unsettleAmountPay) : '--' }}</strong> ,
           折让合计 <strong>{{ (productTotal&&(productTotal.discountAmount || productTotal.discountAmount==0)) ? toThousands(productTotal.discountAmount) : '--' }}</strong> ;
           余额合计 <strong>{{ (productTotal&&(productTotal.balance || productTotal.balance==0)) ? toThousands(productTotal.balance) : '--' }}</strong> ;
         </div>
@@ -138,12 +138,12 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '客户名称', width: '15%', align: 'center', scopedSlots: { customRender: 'customerName' } },
         { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '应收金额', dataIndex: 'unsettleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '应收金额', dataIndex: 'receiveSettleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '已收金额', dataIndex: 'settleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '待收金额', dataIndex: 'waitSettleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '应付金额', dataIndex: 'unsettleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '待收金额', dataIndex: 'unsettleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '应付金额', dataIndex: 'receiveSettleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '已付金额', dataIndex: 'settleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '待付金额', dataIndex: 'waitSettleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '待付金额', dataIndex: 'unsettleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '折让金额', dataIndex: 'discountAmount', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '余额', dataIndex: 'balance', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
@@ -153,12 +153,12 @@ export default {
         this.disabled = true
         this.spinning = true
         const sortFiled = {
-          'unsettleAmountReceipt': 'UNSETTLE_AMOUNT_RECEIPT',
+          'receiveSettleAmountReceipt': 'RECEIVE_SETTLE_AMOUNT_RECEIPT',
           'settleAmountReceipt': 'SETTLE_AMOUNT_RECEIPT',
-          'waitSettleAmountReceipt': 'WAIT_SETTLE_AMOUNT_RECEIPT',
-          'unsettleAmountPay': 'UNSETTLE_AMOUNT_PAY',
+          'unsettleAmountReceipt': 'UNSETTLE_AMOUNT_RECEIPT',
+          'receiveSettleAmountPay': 'RECEIVE_SETTLE_AMOUNT_PAY',
           'settleAmountPay': 'SETTLE_AMOUNT_PAY',
-          'waitSettleAmountPay': 'WAIT_SETTLE_AMOUNT_PAY',
+          'unsettleAmountPay': 'UNSETTLE_AMOUNT_PAY',
           'discountAmount': 'DISCOUNT_AMOUNT',
           'balance': 'BALANCE'
         }
@@ -173,7 +173,7 @@ export default {
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
               // 应付金额  值为负,应显示为正 余额
-              data.list[i].unSettleAmountPay = Math.abs(data.list[i].unSettleAmountPay) || 0
+              data.list[i].receiveSettleAmountPay = Math.abs(data.list[i].receiveSettleAmountPay) || 0
             }
             this.disabled = false
             this.total = data.count || 0

+ 9 - 9
src/views/financialManagement/companyReceivablePayableNew/list.vue

@@ -142,12 +142,12 @@ export default {
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '客户名称', width: '15%', align: 'center', scopedSlots: { customRender: 'customerName' } },
         { title: '单位类型', dataIndex: 'settleClientTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '应收金额', dataIndex: 'unsettleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '应收金额', dataIndex: 'receiveSettleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '已收金额', dataIndex: 'settleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '待收金额', dataIndex: 'waitSettleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '应付金额', dataIndex: 'unsettleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '待收金额', dataIndex: 'unsettleAmountReceipt', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '应付金额', dataIndex: 'receiveSettleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '已付金额', dataIndex: 'settleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '待付金额', dataIndex: 'waitSettleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '待付金额', dataIndex: 'unsettleAmountPay', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '折让金额', dataIndex: 'discountAmount', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '余额', dataIndex: 'balance', width: '8%', sorter: true, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
@@ -157,12 +157,12 @@ export default {
         this.disabled = true
         this.spinning = true
         const sortFiled = {
-          'unsettleAmountReceipt': 'UNSETTLE_AMOUNT_RECEIPT',
+          'receiveSettleAmountReceipt': 'RECEIVE_SETTLE_AMOUNT_RECEIPT',
           'settleAmountReceipt': 'SETTLE_AMOUNT_RECEIPT',
-          'waitSettleAmountReceipt': 'WAIT_SETTLE_AMOUNT_RECEIPT',
-          'unsettleAmountPay': 'UNSETTLE_AMOUNT_PAY',
+          'unsettleAmountReceipt': 'UNSETTLE_AMOUNT_RECEIPT',
+          'receiveSettleAmountPay': 'RECEIVE_SETTLE_AMOUNT_PAY',
           'settleAmountPay': 'SETTLE_AMOUNT_PAY',
-          'waitSettleAmountPay': 'WAIT_SETTLE_AMOUNT_PAY',
+          'unsettleAmountPay': 'UNSETTLE_AMOUNT_PAY',
           'discountAmount': 'DISCOUNT_AMOUNT',
           'balance': 'BALANCE'
         }
@@ -177,7 +177,7 @@ export default {
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
               // 应付金额  值为负,应显示为正
-              data.list[i].unSettleAmountPay = Math.abs(data.list[i].unSettleAmountPay) || 0
+              data.list[i].receiveSettleAmountPay = Math.abs(data.list[i].receiveSettleAmountPay) || 0
             }
             this.disabled = false
             this.total = data.count || 0