From 8c4d104ff2879ed101901efb22fea4e84cd1772f Mon Sep 17 00:00:00 2001
From: JS-LM <2497833386@QQ.com>
Date: Thu, 15 Jun 2023 09:38:12 +0800
Subject: [PATCH] update

---
 .../pile/merchant/components/adapayMember.vue | 220 ++++--------------
 1 file changed, 46 insertions(+), 174 deletions(-)

diff --git a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
index dbf27fb1f..035843d70 100644
--- a/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
+++ b/jsowell-ui/src/views/pile/merchant/components/adapayMember.vue
@@ -1,19 +1,21 @@
 <template>
     <div>
         <el-card class="box-card" shadow="hover" style="margin-bottom: 10px">
-            <div style="margin: 12px 0">汇付会员</div>
-            <div style="margin: 12px 0" v-if="ruleForm.nickname == ''">
-                没有查询到汇付会员配置，请点击按钮创建汇付会员
+            <!-- <div style="margin: 12px 0">汇付会员</div> -->
+            <h2>汇付会员</h2>
+            <hr>
+            <div style="margin: 12px 0" v-if="ruleForm.adapayMemberId == null">
+                没有查询到汇付会员配置，请点击按钮创建汇付会员，汇付结算账号
                 <!-- 刷新按钮 -->
                 <el-button
                     size="medium"
                     type="primary"
-                    @click="openCreateAdapayMember = true"
+                    @click="openCreateAdapaySettleAccount = true"
                 >
-                    创建汇付会员
+                    创建汇付会员与结算账号
                 </el-button>
             </div>
-            <el-descriptions v-else :column="2">
+            <el-descriptions :column="2" v-else>
                 <el-descriptions-item label="会员昵称">{{
                     ruleForm.nickname
                 }}</el-descriptions-item>
@@ -29,119 +31,37 @@
             </el-descriptions>
         </el-card>
 
-        <el-card class="box-card" shadow="hover">
-            <div style="margin: 12px 0">汇付结算账户</div>
-            <div style="margin: 12px 0" v-if="ruleForm.bankAcctType == null">
-                没有查询到汇付结算账户配置，请点击按钮创建汇付结算账户
-                <!-- 刷新按钮 -->
-                <el-button
-                    size="medium"
-                    type="primary"
-                    @click="openCreateAdapaySettleAccount = true"
-                >
-                    创建汇付结算账户
-                </el-button>
-            </div>
-            <el-form
-                :model="ruleForm"
-                :rules="rules"
-                ref="ruleForm"
-                label-width="250px"
-                class="demo-ruleForm"
-                v-else
-            >
-                <el-form-item label="银行账户类型" prop="bankAcctType">
-                    <el-radio-group v-model="ruleForm.bankAcctType">
-                        <el-radio label="1">对公</el-radio>
-                        <el-radio label="2">对私</el-radio>
-                    </el-radio-group>
-                </el-form-item>
-
-                <el-form-item label="银行卡号" prop="cardId">
-                    <el-input v-model="ruleForm.cardId"></el-input>
-                </el-form-item>
-                <el-form-item label="银行卡对应的户名" prop="cardName">
-                    <el-input v-model="ruleForm.cardName"></el-input>
-                </el-form-item>
-                <el-form-item
-                    label="证件号"
-                    prop="certId"
-                    :rules="
-                        ruleForm.bankAcctType === '2'
-                            ? rules.certId
-                            : [{ required: false }]
-                    "
-                >
-                    <el-input v-model="ruleForm.certId"></el-input>
-                </el-form-item>
-
-                <el-form-item
-                    label="证件类型"
-                    prop="certType"
-                    :rules="
-                        ruleForm.bankAcctType === '2'
-                            ? rules.certType
-                            : [{ required: false }]
-                    "
-                >
-                    <el-input v-model="ruleForm.certType"></el-input>
-                </el-form-item>
-                <el-form-item label="手机号" prop="telNo">
-                    <el-input v-model="ruleForm.telNo"></el-input>
-                </el-form-item>
-                <el-form-item
-                    label="银行编码"
-                    prop="bankCode"
-                    :rules="
-                        ruleForm.bankAcctType === '1'
-                            ? rules.bankCode
-                            : [{ required: false }]
-                    "
-                >
-                    <el-input v-model="ruleForm.bankCode"></el-input>
-                </el-form-item>
-                <el-form-item label="开户银行名称" prop="bankName">
-                    <el-input v-model="ruleForm.bankName"></el-input>
-                </el-form-item>
-                <el-form-item
-                    label="银行账户开户银行所在省份编码"
-                    prop="provCode"
-                    :rules="
-                        ruleForm.bankAcctType === '1'
-                            ? rules.provCode
-                            : [{ required: false }]
-                    "
-                >
-                    <el-cascader
-                        v-model="value"
-                        :options="options"
-                        @change="handleChange"
-                        :props="cateProps"
-                    ></el-cascader>
-                    <!-- <el-input v-model="ruleForm.provCode"></el-input> -->
-                </el-form-item>
-                <!-- <el-form-item
-                    label="银行账户开户银行所在地区编码"
-                    prop="areaCode"
-                    :rules="
-                        ruleForm.bankAcctType === '1'
-                            ? rules.areaCode
-                            : [{ required: false }]
-                    "
-                >
-                    <el-input v-model="ruleForm.areaCode"></el-input>
-                </el-form-item> -->
-                <el-form-item>
-                    <el-button type="primary" @click="submitForm('ruleForm')"
-                        >提交</el-button
-                    >
-                </el-form-item>
-            </el-form>
+        <el-card class="box-card" shadow="hover" style="margin-top:20px" v-if="ruleForm.adapayMemberId !== null">
+            <!-- <div style="margin: 12px 0">汇付结算账户</div> -->
+            <h2>汇付结算账户</h2>
+            <hr>
+              <el-descriptions :column="2">
+                <el-descriptions-item label="银行账户类型">{{
+                    ruleForm.nickname
+                }}</el-descriptions-item>
+                <el-descriptions-item label="银行卡号">{{
+                    ruleForm.email
+                }}</el-descriptions-item>
+                <el-descriptions-item label="银行卡对应的户名">{{
+                    ruleForm.gender === "FEMALE" ? "女" : "男"
+                }}</el-descriptions-item>
+                <el-descriptions-item label="手机号">{{
+                    ruleForm.location
+                }}</el-descriptions-item>
+                <el-descriptions-item label="银行编码">{{
+                    ruleForm.location
+                }}</el-descriptions-item>
+                <el-descriptions-item label="开户银行名称">{{
+                    ruleForm.location
+                }}</el-descriptions-item>
+                <el-descriptions-item label="银行账户开户银行所在省份编码">{{
+                    ruleForm.location
+                }}</el-descriptions-item>
+            </el-descriptions>
         </el-card>
-
         <el-dialog
-            title="创建汇付会员"
-            :visible.sync="openCreateAdapayMember"
+            title="创建汇付会员与结算账户"
+            :visible.sync="openCreateAdapaySettleAccount"
             width="150"
             append-to-body
         >
@@ -152,7 +72,7 @@
                 label-width="250px"
                 class="demo-ruleForm"
             >
-                <el-form-item label="会员昵称" prop="nickname">
+               <el-form-item label="会员昵称" prop="nickname">
                     <el-input v-model="ruleForm.nickname"></el-input>
                 </el-form-item>
                 <el-form-item label="会员邮箱" prop="email">
@@ -168,28 +88,6 @@
                     <!-- type="textarea" -->
                     <el-input v-model="ruleForm.location"></el-input>
                 </el-form-item>
-
-                <el-form-item>
-                    <el-button type="primary" @click="submitForm('ruleForm')"
-                        >提交</el-button
-                    >
-                </el-form-item>
-            </el-form>
-        </el-dialog>
-
-        <el-dialog
-            title="创建汇付结算账户"
-            :visible.sync="openCreateAdapaySettleAccount"
-            width="150"
-            append-to-body
-        >
-            <el-form
-                :model="ruleForm"
-                :rules="rules"
-                ref="ruleForm"
-                label-width="250px"
-                class="demo-ruleForm"
-            >
                 <el-form-item label="银行账户类型" prop="bankAcctType">
                     <el-radio-group v-model="ruleForm.bankAcctType">
                         <el-radio label="1">对公</el-radio>
@@ -215,17 +113,6 @@
                     <el-input v-model="ruleForm.certId"></el-input>
                 </el-form-item>
 
-                <el-form-item
-                    label="证件类型"
-                    prop="certType"
-                    :rules="
-                        ruleForm.bankAcctType === '2'
-                            ? rules.certType
-                            : [{ required: false }]
-                    "
-                >
-                    <el-input v-model="ruleForm.certType"></el-input>
-                </el-form-item>
                 <el-form-item label="手机号" prop="telNo">
                     <el-input v-model="ruleForm.telNo"></el-input>
                 </el-form-item>
@@ -284,7 +171,7 @@
 <script>
 import {
     selectAdapayMember,
-    createAdapayMember,selectSettleAccount
+    createAdapayMember
 } from "@/api/adapayMember/adapayMember";
 export default {
     props: ["merchantId"],
@@ -297,6 +184,7 @@ export default {
             adapaySettleAccount: null,
             openCreateAdapaySettleAccount: false,
             ruleForm: {
+                adapayMemberId:null,
                 nickname: "",
                 email: "",
                 gender: "",
@@ -304,7 +192,6 @@ export default {
                 cardId: "",
                 cardName: "",
                 certId: "",
-                certType: "",
                 telNo: "",
                 bankCode: "",
                 bankName: "",
@@ -406,19 +293,17 @@ export default {
                         trigger: "blur",
                     },
                 ],
-                certType: [
-                    {
-                        required: true,
-                        message: "请填写证件类型",
-                        trigger: "blur",
-                    },
-                ],
                 bankCode: [
                     {
                         required: true,
                         message: "请填写银行编码",
                         trigger: "blur",
                     },
+                      {
+                        pattern: /^(?:(?:\+|00)86)?1\d{10}$/,
+                        message: "手机号格式有误",
+                        trigger: "change",
+                    },
                 ],
             },
             cateProps: {
@@ -446,10 +331,8 @@ export default {
                     console.log("valid", this.ruleForm);
                     createAdapayMember(this.ruleForm).then((response) => {
                         console.log("新增", response);
-                        this.openCreateAdapayMember = false;
                         this.openCreateAdapaySettleAccount = false
                         this.selectAdapayMember();
-                        this.selectSettleAccount()
                     });
                 } else {
                     console.log("提交表格失败");
@@ -467,23 +350,13 @@ export default {
                 merchantId: this.merchantId,
             };
             selectAdapayMember(param).then((response) => {
-                // console.log("查询 response", response);
+                console.log("查询 response", response);
                 if (response.data != null) {
                     this.ruleForm = response.data;
                     this.adapayMember = response.data;
                 }
             });
         },
-        // 查询汇付结算账户
-        selectSettleAccount() {
-             let param = {
-                merchantId: this.merchantId,
-            };
-            selectSettleAccount(param).then(response =>{
-                console.log('查询汇付结算账号 response',response)
-                this.ruleForm = response.data
-            })
-        },
         jsonHttp() {
             var that = this;
             //(1).实例化ajax对象
@@ -505,7 +378,6 @@ export default {
     },
     created() {
         this.selectAdapayMember();
-        this.selectSettleAccount();
         this.jsonHttp();
     },
 };