Browse Source

fix:资金账户管理新增划扣逻辑

lazy 2 months ago
parent
commit
78a3707a55

+ 9 - 4
src/views/cyAccountManage/memberFundManage/cashFlow.vue

@@ -77,6 +77,7 @@ import {
   findBusinessRecords,
   downloadDealNoticeBook
 } from '@/api/cyAccountManage/memberAccountManage/index'
+import { formatMoney } from '@/utils'
 
 export default {
   data() {
@@ -149,13 +150,17 @@ export default {
         },
         {
           label: '金额',
-          prop: 'txnAmt',
-          showTooltip: true
+          showTooltip: true,
+          render: (h, row) => {
+            return <div>{ formatMoney(row.txnAmt) }</div>
+          }
         },
         {
           label: '手续费',
-          prop: 'hdlFee',
-          showTooltip: true
+          showTooltip: true,
+          render: (h, row) => {
+            return <div>{ formatMoney(row.hdlFee) }</div>
+          }
         },
         {
           label: '对方账号',

+ 55 - 1
src/views/cyAccountManage/memberFundManage/transactionRecord.vue

@@ -76,7 +76,8 @@ import { exportFile, formatMoney } from '@/utils'
 import {
   findBusinessRecords,
   downloadDealNoticeBook,
-  refreshTranserResultByPlfmSerNo
+  refreshTranserResultByPlfmSerNo,
+  execDealRecord
 } from '@/api/cyAccountManage/memberAccountManage/index'
 
 export default {
@@ -143,6 +144,41 @@ export default {
             )
           }
         },
+        {
+          label: '资金来源',
+          showTooltip: true,
+          render: (h, row) => {
+            if (row.fundSource === 0) {
+              return (
+                <div>实体卡</div>
+              )
+            }
+            if (row.fundSource === 1) {
+              return (
+                <div>静默户</div>
+              )
+            }
+            return (<div></div>)
+          }
+        },
+        {
+          label: '是否划转到长银',
+          showTooltip: true,
+          width: 140,
+          render: (h, row) => {
+            if (row.toInkasso === 0) {
+              return (
+                <div>否</div>
+              )
+            }
+            if (row.toInkasso === 1) {
+              return (
+                <div>是</div>
+              )
+            }
+            return (<div></div>)
+          }
+        },
         {
           label: '币种',
           prop: 'currency',
@@ -247,6 +283,13 @@ export default {
                 power: 'updateTransactionRecordsStatus',
                 // rowPower: [],
                 category: 'refresh'
+              },
+              {
+                msg: '处理',
+                icon: 'iconfont icon-Union',
+                power: '',
+                // rowPower: [],
+                category: 'exec'
               }
             ]
             const options = btnList.map(item => {
@@ -313,6 +356,15 @@ export default {
           Loading: true
         })
 
+        if (res.success) {
+          this.$router.go(0)
+        }
+      } else if (type === 'exec') {
+        const res = await execDealRecord({
+          id: row.id,
+          Loading: true
+        })
+
         if (res.success) {
           this.$router.go(0)
         }
@@ -346,6 +398,8 @@ export default {
         return true
       } else if (type === 'download' && row.acctgSerNo && row.acctgSerNo !== '') {
         return true
+      } else if (type === 'exec' && (row.thaw === 0 || row.toInkasso === 0)) {
+        return true
       }
       return false
     }