src/lang/en.js

@@ -552,6 +552,7 @@ export default {
     createdTime: 'Created Time',
     rechargeAmount: 'Recharge Amount',
     rechargeStatus: 'Recharge Status',
+    type: 'Type',
     bankName: 'Bank Name',
     bankAccount: 'Bank Account',
     printVoucher: 'Recharge Voucher',

src/lang/zh.js

@@ -547,6 +547,7 @@ export default {
     createdTime: '转账时间',
     rechargeAmount: '充值金额',
     rechargeStatus: '充值状态',
+    type: '充值类型',
     bankName: '汇款银行',
     bankAccount: '汇款账号',
     printVoucher: '充值凭证',

src/views/finance/recharge-list.vue

@@ -16,6 +16,7 @@
           <el-tag :type="row.AUDIT_STATUS | statusFilter">{{ row.STATUS_NAME }}</el-tag>
         </template>
       </el-table-column>
+      <el-table-column align="center" min-width="180px" :label="$t('finance.type')" prop="TYPE" />
       <el-table-column align="center" min-width="180px" :label="$t('finance.bankName')" prop="OPEN_BANK_NAME" />
       <el-table-column align="center" min-width="150px" :label="$t('finance.paymentReference')" prop="BANK_NO" />
       <el-table-column align="center" min-width="150px" :label="$t('finance.printVoucher')">
@@ -43,6 +44,11 @@
             <el-form-item :label="$t('finance.paymentReference')" prop="bankNo" required>
               <el-input v-model="form.bankNo" type="text" clearable style="width: 100%" />
             </el-form-item>
+            <el-form-item :label="$t('finance.type')" prop="rechargeType">
+              <el-select v-model="form.rechargeType" clearable filterable style="width: 100%">
+                <el-option v-for="(item,key) in typeList" :key="key" :label="item" :value="item" />
+              </el-select>
+            </el-form-item>
             <el-form-item :label="$t('finance.bankName')" prop="openBank" required>
               <el-select v-model="form.openBank" clearable filterable style="width: 100%">
                 <el-option v-for="(item,key) in bankList" :key="key" :label="item.BANK_NAME" :value="item.BANK_CODE" />
@@ -148,7 +154,8 @@ export default {
         applyAmount: 0,
         bankNo: '',
         openBank: '',
-        bankAddress: ''
+        bankAddress: '',
+        rechargeType: ''
       },
       minAmount: 1,
       maxAmount: 10000000000,
@@ -158,7 +165,7 @@ export default {
         openBank: [{ required: true, message: this.$t('finance.bankName') + this.$t('common.require'), trigger: 'blur' }]
       },
       bankList: [],
-
+      typeList: [],
       screenWidth: getScreenWidth() > 600 ? '500px' : getScreenWidth() + 'px',
       labelPosition: getScreenWidth() > 600 ? 'right' : 'top',
 
@@ -202,6 +209,7 @@ export default {
     fetchBankList() {
       fetchBankList().then(response => {
         this.bankList = response.data.allOpenBank
+        this.typeList = response.data.type
       })
     },
     onSubmit() {
@@ -209,9 +217,9 @@ export default {
         if (valid) {
           this.loading = true
           let form = {}
-          let { applyAmount, bankNo, openBank, bankAddress, ID } = this.form
-          if(this.isEdit){
-            form = { applyAmount, bankNo, openBank, bankAddress, id: ID }
+          const { applyAmount, bankNo, openBank, bankAddress, ID, rechargeType } = this.form
+          if (this.isEdit) {
+            form = { applyAmount, bankNo, openBank, bankAddress, id: ID, rechargeType }
             editApplyRecharge(form).then(response => {
               this.$message({
                 message: response.data,
@@ -234,7 +242,7 @@ export default {
               this.loading = false
             })
           } else {
-            form = { applyAmount, bankNo, openBank, bankAddress }
+            form = { applyAmount, bankNo, openBank, bankAddress, rechargeType }
             fetchApplyRecharge(form).then(response => {
               this.$message({
                 message: response.data,
@@ -285,12 +293,13 @@ export default {
       }, 0.5 * 1000)
     },
     handleEdit(row){
-      let { AMOUNT, BANK_NO, OPEN_BANK, ID } = row
+      let { AMOUNT, BANK_NO, OPEN_BANK, ID, TYPE } = row
       this.form = {
         applyAmount: AMOUNT,
         bankNo: BANK_NO,
         openBank: OPEN_BANK,
-        ID: ID
+        ID: ID,
+        rechargeType: TYPE
       }
       this.isEdit = true
       this.dialog = true