提现审核

src/views/system/withdraw/index.vue

@@ -49,29 +49,36 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="billId" width="50"/>
       <el-table-column label="提现单号" align="center" prop="billNo" />
-      <el-table-column label="到账用户" align="center" prop="mchName" />
+      <el-table-column label="到账用户" align="center" prop="mchName" >
+        <user-link slot-scope="d" :id="d.row.mchId" :name="d.row.mchName"/>
+      </el-table-column>
       <el-table-column label="提现金额" align="center">
         <template slot-scope="d">
-          {{d.row.money | money}}
+          {{d.row.money | money}} 元
         </template>
       </el-table-column>
       <el-table-column label="实际到账金额" align="center">
         <template slot-scope="d">
-          {{d.row.arrivalAmount | money}}
+          {{d.row.arrivalAmount | money}} 元
         </template>
       </el-table-column>
       <el-table-column label="手续费" align="center">
         <template slot-scope="d">
-          {{d.row.serviceCharge | money}}
+          {{d.row.serviceCharge | money}} 元
         </template>
       </el-table-column>
       <el-table-column label="时间" align="center" prop="createTime" width="180"/>
       <el-table-column label="到账时间" align="center" prop="payTime" width="180"/>
-      <el-table-column label="打款方式" align="center">
+      <el-table-column label="打款渠道" align="center">
         <template slot-scope="d">
           <dict-tag :value="d.row.channelId" :options="dict.type.sm_transaction_bill_pay_type"/>
         </template>
       </el-table-column>
+      <el-table-column label="打款方式" align="center">
+        <template slot-scope="d">
+          <dict-tag :value="d.row.withdrawType" :options="dict.type.withdraw_type"/>
+        </template>
+      </el-table-column>
       <el-table-column label="交易状态" align="center">
         <template slot-scope="d">
           <dict-tag :value="d.row.status" :options="dict.type.sm_transaction_bill_status"/>
@@ -109,28 +116,38 @@
     />
 
     <!-- 审核对话框 -->
-    <el-dialog title="审核" :visible.sync="openApproval" width="500px" append-to-body center top="30vh">
+    <el-dialog title="提现审核" :visible.sync="openApproval" width="500px" append-to-body center top="30vh">
-      <el-form ref="form" :model="approvalForm" :rules="rules" label-width="80px" size="mini">
+      <el-form ref="form" :model="approvalForm" :rules="approvalRules" label-width="6em">
         <el-row>
           <el-col :span="12">
-            <el-form-item label="ID">{{approvalForm.billId}}</el-form-item>
+            <el-form-item label="到账用户">
+              {{approvalForm.mchName | defaultVaule}}
+            </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="提现金额">{{approvalForm.money | money}}</el-form-item>
+            <el-form-item label="提现金额">{{approvalForm.money | money}} 元</el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="到账金额">{{approvalForm.arrivalAmount | money}}</el-form-item>
+            <el-form-item label="到账金额">{{approvalForm.arrivalAmount | money}} 元</el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="服务费">{{approvalForm.serviceCharge | money}}</el-form-item>
+            <el-form-item label="服务费">{{approvalForm.serviceCharge | money}} 元</el-form-item>
           </el-col>
         </el-row>
+        <el-form-item label="打款方式" prop="withdrawType">
+          <el-select v-model="approvalForm.withdrawType" style="width: 100%">
+            <el-option v-for="dict in dict.type.withdraw_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="支付凭证" v-if="approvalForm.withdrawType === '2'">
+          <image-upload v-model="approvalForm.payPicture"/>
+        </el-form-item>
         <el-form-item label-width="0">
           <el-input v-model="approvalForm.remark" type="textarea" placeholder="请输入审核意见" maxlength="500" :rows="5" show-word-limit/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="success" @click="pass" v-hasPermi="['system:bill:approval']" icon="el-icon-check">通过</el-button>
+        <el-button type="success" @click="pass" v-hasPermi="['system:bill:approval']" icon="el-icon-check">通过并打款</el-button>
         <el-button type="danger" @click="reject" v-hasPermi="['system:bill:approval']" icon="el-icon-close">驳回</el-button>
       </div>
     </el-dialog>
@@ -158,10 +175,12 @@ import {
   passWithDrawBill,
   rejectWithDrawBill, payWithDrawBill
 } from "@/api/system/withdraw";
+import UserLink from '@/components/Business/SmUser/UserLink.vue'
 
 export default {
   name: "Bill",
-  dicts: ['sm_transaction_bill_status', 'sm_transaction_bill_pay_type'],
+  components: { UserLink },
+  dicts: ['sm_transaction_bill_status', 'withdraw_type', 'sm_transaction_bill_pay_type'],
   data() {
     return {
       // 遮罩层
@@ -201,6 +220,11 @@ export default {
         billId: null,
         remark: null,
       },
+      approvalRules: {
+        withdrawType: [
+          { required: true, message: "请选择打款方式", trigger: "blur"}
+        ]
+      }
     };
   },
   created() {