Browse Source

bug修复

chenrui 3 years ago
parent
commit
83495683ea

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

@@ -83,7 +83,7 @@
       :rowKey="record => record.id"
       :rowKey="record => record.id"
       :columns="columns"
       :columns="columns"
       :data="loadData"
       :data="loadData"
-      :scroll="{ x: 1460, y: tableHeight }"
+      :scroll="{ x: 1660, y: tableHeight }"
       bordered
       bordered
     >
     >
       <!-- 操作 -->
       <!-- 操作 -->
@@ -172,11 +172,29 @@ export default {
           }
           }
         },
         },
         {
         {
-          title: '收金额',
+          title: '收金额',
           width: 100,
           width: 100,
           align: 'center',
           align: 'center',
           customRender: function (text, record) {
           customRender: function (text, record) {
-            const val = record.settleState == 'SETTLED' ? record.settledAmount : record.unsettleAmount
+            const val = record.totalAmount
+            return val || val == 0 ? '¥' + val : '--'
+          }
+        },
+        {
+          title: '已收金额',
+          width: 100,
+          align: 'center',
+          customRender: function (text, record) {
+            const val = record.settledAmount
+            return val || val == 0 ? '¥' + val : '--'
+          }
+        },
+        {
+          title: '待收金额',
+          width: 100,
+          align: 'center',
+          customRender: function (text, record) {
+            const val = record.unsettleAmount
             return val || val == 0 ? '¥' + val : '--'
             return val || val == 0 ? '¥' + val : '--'
           }
           }
         },
         },

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

@@ -82,7 +82,7 @@
       :rowKey="record => record.id"
       :rowKey="record => record.id"
       :columns="columns"
       :columns="columns"
       :data="loadData"
       :data="loadData"
-      :scroll="{ x: 1460, y: tableHeight }"
+      :scroll="{ x: 1660, y: tableHeight }"
       bordered
       bordered
     >
     >
       <!-- 操作 -->
       <!-- 操作 -->
@@ -170,11 +170,29 @@ export default {
           }
           }
         },
         },
         {
         {
-          title: '付金额',
+          title: '付金额',
           width: 100,
           width: 100,
           align: 'center',
           align: 'center',
           customRender: function (text, record) {
           customRender: function (text, record) {
-            const val = record.settleState == 'SETTLED' ? record.settledAmount : record.unsettleAmount
+            const val = record.totalAmount
+            return val || val == 0 ? '¥' + val : '--'
+          }
+        },
+        {
+          title: '已付金额',
+          width: 100,
+          align: 'center',
+          customRender: function (text, record) {
+            const val = record.settledAmount
+            return val || val == 0 ? '¥' + val : '--'
+          }
+        },
+        {
+          title: '待付金额',
+          width: 100,
+          align: 'center',
+          customRender: function (text, record) {
+            const val = record.unsettleAmount
             return val || val == 0 ? '¥' + val : '--'
             return val || val == 0 ? '¥' + val : '--'
           }
           }
         },
         },