lilei 4 tahun lalu
induk
melakukan
abdae01477

+ 3 - 3
src/views/financialManagement/financialCollection/list.vue

@@ -170,11 +170,11 @@ export default {
         },
         {
           title: '收款金额',
-          dataIndex: 'unsettleAmount',
           width: 100,
           align: 'center',
-          customRender: function (text) {
-            return text || text == 0 ? '¥' + text : '--'
+          customRender: function (text, record) {
+            const val = record.settleState == 'SETTLED' ? record.settledAmount : record.unsettleAmount
+            return val || val == 0 ? '¥' + val : '--'
           }
         },
         {

+ 3 - 3
src/views/financialManagement/financialPayment/list.vue

@@ -170,11 +170,11 @@ export default {
         },
         {
           title: '付款金额',
-          dataIndex: 'unsettleAmount',
           width: 100,
           align: 'center',
-          customRender: function (text) {
-            return text || text == 0 ? '¥' + text : '--'
+          customRender: function (text, record) {
+            const val = record.settleState == 'SETTLED' ? record.settledAmount : record.unsettleAmount
+            return val || val == 0 ? '¥' + val : '--'
           }
         },
         {