1、用户查看提现账单

src/views/bussinessmng/bussinessinfo.vue

@@ -41,7 +41,7 @@
 
     <bussinessinfo-add v-show="addVisible" @submit="submit" :form1="data1" :form2="data2" :form3="data3" :form4="data4" :curEvent="currentEvent" ref="addDialog" @closeDialog="closeDialog"></bussinessinfo-add>
     <bussinessinfo-detail v-show="detailVisible" :form1="detailData" ref="detailDialog"></bussinessinfo-detail>
-    <el-dialog title="商户进件申请记录" :append-to-body="true" :visible.sync="registerRequestVisible" top="1vh" @close="closeRequestDialog" :close-on-click-modal="false">
+    <el-dialog title="商户进件申请记录" :append-to-body="true" :visible.sync="registerRequestVisible" top="1vh" @close="closeRequestDialog" :close-on-click-modal="false" width="80%">
       <bussiness-register-request :bussiness-info-id="bussinessInfoId" v-if="registerRequestVisible"></bussiness-register-request>
     </el-dialog>
   </basic-container>

src/views/bussinessmng/bussinessuserinfo.vue

@@ -41,10 +41,14 @@
                    @click.stop="submitRegister(row.id)">提交申请
         </el-button>
         <el-button style="color:orange;"type="text" size="small" plain class="none-border" @click.stop="handleRegisterRequestView(row.id)">进件记录</el-button>
+        <el-button v-if="permission.bussinessuserinfo_withdraw" style="color:red;"type="text" size="small" plain class="none-border" @click.stop="handleWithdrawView(row.id)">账单记录</el-button>
       </template>
     </avue-crud>
     <el-dialog title="用户进件申请记录" :append-to-body="true" :visible.sync="registerRequestVisible" top="1vh" @close="closeRequestDialog" :close-on-click-modal="false">
-      <bussiness-register-request :user-info-id="bussinessInfoId" v-if="registerRequestVisible"></bussiness-register-request>
+      <bussiness-register-request :user-info-id="userInfoId" v-if="registerRequestVisible"></bussiness-register-request>
+    </el-dialog>
+    <el-dialog title="用户账单记录" :append-to-body="true" :visible.sync="withdrawVisible" top="1vh" @close="closeWithdrawDialog" :close-on-click-modal="false" width="80%">
+      <bussiness-user-withdraw :user-info-id="userInfoId" v-if="withdrawVisible"></bussiness-user-withdraw>
     </el-dialog>
   </basic-container>
 </template>
@@ -54,10 +58,11 @@
   import {mapGetters} from "vuex";
   import {userRegister} from "@/api/bussinessmng/bussinessregisterrequest";
   import bussinessRegisterRequest from "../bussinessmng/bussinessregisterrequest.vue"
+  import bussinessUserWithdraw from "../bussinessmng/bussinessuserwithdraw.vue"
 
   export default {
     components: {
-      bussinessRegisterRequest
+      bussinessRegisterRequest, bussinessUserWithdraw
     },
     data() {
       return {
@@ -69,8 +74,9 @@
           currentPage: 1,
           total: 0
         },
-        bussinessInfoId: null,
+        userInfoId: null,
         registerRequestVisible: false,
+        withdrawVisible: false,
         isLoading: false,
         selectionList: [],
         option: {
@@ -409,7 +415,8 @@
           addBtn: this.vaildData(this.permission.bussinessuserinfo_add, false),
           viewBtn: this.vaildData(this.permission.bussinessuserinfo_view, false),
           delBtn: this.vaildData(this.permission.bussinessuserinfo_delete, false),
-          editBtn: this.vaildData(this.permission.bussinessuserinfo_edit, false)
+          editBtn: this.vaildData(this.permission.bussinessuserinfo_edit, false),
+          withdrawBtn: this.vaildData(this.permission.bussinessuserinfo_withdraw, false)
         };
       },
       ids() {
@@ -424,10 +431,17 @@
       closeRequestDialog(){
         this.registerRequestVisible = false;
       },
-      handleRegisterRequestView(bussinessInfoId){
-        this.bussinessInfoId = bussinessInfoId;
+      closeWithdrawDialog(){
+        this.withdrawVisible = false;
+      },
+      handleRegisterRequestView(userInfoId){
+        this.userInfoId = userInfoId;
         this.registerRequestVisible = true;
       },
+      handleWithdrawView(userInfoId){
+        this.userInfoId = userInfoId;
+        this.withdrawVisible = true;
+      },
       submitRegister(userInfoId) {
         this.$confirm("确定提交进件申请吗?如果需要修改，请先点击保存后再提交申请", {
           confirmButtonText: "确定",

src/views/bussinessmng/bussinessuserwithdraw.vue

@@ -36,6 +36,9 @@
   import {mapGetters} from "vuex";
 
   export default {
+    props:{
+      userInfoId: null
+    },
     data() {
       return {
         form: {},
@@ -57,232 +60,105 @@
           index: true,
           viewBtn: true,
           selection: true,
+          editDisplay: false,
+          addDisplay: false,
+          delBtn: false,
+          menu: false,
           dialogClickModal: false,
           column: [
             {
               label: "商户请求号",
               prop: "requestNo",
-              rules: [{
-                required: true,
-                message: "请输入商户请求号",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "商户号",
-              prop: "merchantNo",
-              rules: [{
-                required: true,
-                message: "请输入商户号",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "提现卡ID",
-              prop: "bankCardId",
-              rules: [{
-                required: true,
-                message: "请输入提现卡ID",
-                trigger: "blur"
-              }]
             },
             {
               label: "提现账号",
               prop: "bankAccountNo",
-              rules: [{
-                required: true,
-                message: "请输入提现账号",
-                trigger: "blur"
-              }]
             },
             {
-              label: "到账类型	REAL_TIME:实时	TWO_HOUR:2小时到账	NEXT_DAY:次日到账（无特殊情况资金于次日上午7点左右到提现银行账户中）",
+              label: "到账类型",
               prop: "receiveType",
-              rules: [{
-                required: true,
-                message: "请输入到账类型	REAL_TIME:实时	TWO_HOUR:2小时到账	NEXT_DAY:次日到账（无特殊情况资金于次日上午7点左右到提现银行账户中）",
-                trigger: "blur"
-              }]
+              type: "select",
+              dicData: [
+                {
+                  label: '实时',
+                  value: "REAL_TIME"
+                },
+                {
+                  label: '2小时到账',
+                  value: "TWO_HOUR"
+                },
+                {
+                  label: '次日到账',
+                  value: "NEXT_DAY"
+                }
+              ]
             },
             {
-              label: "提现金额，单位：元（RMB）",
+              label: "提现金额（元）",
               prop: "orderAmount",
-              rules: [{
-                required: true,
-                message: "请输入提现金额，单位：元（RMB）",
-                trigger: "blur"
-              }]
             },
             {
-              label: "银行附言	展示在收款银行系统中的附言，由数字、字母、汉字组成（最终附言内容以银行实际账单为准）。",
-              prop: "remark",
-              rules: [{
-                required: true,
-                message: "请输入银行附言	展示在收款银行系统中的附言，由数字、字母、汉字组成（最终附言内容以银行实际账单为准）。",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "小微用户信息id",
+              label: "用户名称",
               prop: "userInfoId",
-              rules: [{
-                required: true,
-                message: "请输入小微用户信息id",
-                trigger: "blur"
-              }]
+              type: "select",
+              filterable: true,
+              dicUrl: "/api/cyzh-bussiness-user-info/bussinessuserinfo/listUserInfo",
+              props:{
+                label: "userName",
+                value: "id"
+              },
             },
             {
               label: "提现状态",
               prop: "withdrawStatus",
-              rules: [{
-                required: true,
-                message: "请输入提现状态",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "第三方提现订单号",
-              prop: "thirdOrderNo",
-              rules: [{
-                required: true,
-                message: "请输入第三方提现订单号",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "第三方提现日志",
-              prop: "thirdLog",
-              rules: [{
-                required: true,
-                message: "请输入第三方提现日志",
-                trigger: "blur"
-              }]
+              dicData: [
+                {
+                  label: '待发起',
+                  value: 10
+                },
+                {
+                  label: '处理中',
+                  value: 11
+                },
+                {
+                  label: '处理中',
+                  value: 12
+                },
+                {
+                  label: '处理中',
+                  value: 13
+                },
+                {
+                  label: '失败',
+                  value: 14
+                },
+                {
+                  label: '成功',
+                  value: 15
+                },
+              ]
             },
             {
               label: "失败原因",
               prop: "failReason",
-              rules: [{
-                required: true,
-                message: "请输入失败原因",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "返回的失败信息",
-              prop: "returnMsg",
-              rules: [{
-                required: true,
-                message: "请输入返回的失败信息",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "真实提现金额",
-              prop: "thirdOrderAmount",
-              rules: [{
-                required: true,
-                message: "请输入真实提现金额",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "扣账金额，返回易宝账户扣账金额（包含提现金额和手续费（若有））",
-              prop: "thirdDebitAmount",
-              rules: [{
-                required: true,
-                message: "请输入扣账金额，返回易宝账户扣账金额（包含提现金额和手续费（若有））",
-                trigger: "blur"
-              }]
             },
             {
-              label: "到账金额，返回提现银行账户入账金额",
-              prop: "thirdReceiveAmount",
-              rules: [{
-                required: true,
-                message: "请输入到账金额，返回提现银行账户入账金额",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "手续费",
-              prop: "fee",
-              rules: [{
-                required: true,
-                message: "请输入手续费",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "手续费承担方商编	",
-              prop: "feeUndertakerMerchantNo",
-              rules: [{
-                required: true,
-                message: "请输入手续费承担方商编	",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "冲退标识，1冲退，0没冲退",
+              label: "是否冲退",
               prop: "isReversed",
-              rules: [{
-                required: true,
-                message: "请输入冲退标识，1冲退，0没冲退",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "返回银行通知冲退的时间",
-              prop: "reverseTime",
-              rules: [{
-                required: true,
-                message: "请输入返回银行通知冲退的时间",
-                trigger: "blur"
-              }]
+              dicData: [
+                {
+                  label: '是',
+                  value: 1
+                },
+                {
+                  label: '否',
+                  value: 0
+                },
+              ]
             },
             {
-              label: "所属入驻商户",
-              prop: "bussinessId",
-              rules: [{
-                required: true,
-                message: "请输入所属入驻商户",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "第一次转账订单ID",
-              prop: "firstTransferOrderId",
-              rules: [{
-                required: true,
-                message: "请输入第一次转账订单ID",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "第二次转账订单ID",
-              prop: "secondTransferOrderId",
-              rules: [{
-                required: true,
-                message: "请输入第二次转账订单ID",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "小微用户进件请求ID",
-              prop: "userRegisterRequestId",
-              rules: [{
-                required: true,
-                message: "请输入小微用户进件请求ID",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "商户提供的订单号",
+              label: "采购商订单号",
               prop: "bussinessOrderId",
-              rules: [{
-                required: true,
-                message: "请输入商户提供的订单号",
-                trigger: "blur"
-              }]
             },
           ]
         },
@@ -409,6 +285,9 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
+        if(this.userInfoId != null){
+          params['userInfoId'] = this.userInfoId;
+        }
         getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
           const data = res.data.data;
           this.page.total = data.total;