xxxxx

src/packages/mobile/views/bank/sign/Index.vue

@@ -12,6 +12,7 @@
                     <Cell title="手机号码" :value="bankInfo.mobilephone" v-if="bankInfo.mobilephone" />
                 </template>
                 <Cell title="支行名称" v-if="bankInfo.branchbankname != ''" :value="bankInfo.branchbankname" />
+                <Cell title="备注" v-if="bankInfo.dealstatus === 5 && bankInfo.remark != ''" :value="bankInfo.remark" />
                 <Cell title="状态" :value="getSignStatusName(bankInfo.signstatus)" />
             </CellGroup>
         </div>

src/packages/mobile/views/bank/sign/components/edit/Index.vue

@@ -20,10 +20,7 @@
                         v-model="formData.MobilePhone" placeholder="请输入手机号码" />
                     <template v-for="(item, index) in configs" :key="index">
                         <template v-if="(item.fieldcode === 'verify_code')">
-                            <Field v-if="(bankInfo === undefined) &&
-                                ((item.usabletype === 1) ||
-                                    (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) ||
-                                    (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1))"
+                            <Field v-if="(bankInfo === undefined) && showExtendInfo(item)"
                                 v-model="item.value" type="digit" name="vcode" :label="item.fieldname" placeholder="必填"
                                 autocomplete="off" :rules="item.fieldname">
                                 <template #button>
@@ -34,24 +31,18 @@
                                 </template>
                             </Field>
                         </template>
-                        <!-- <template v-else-if="(item.fieldcode === 'bank_branch_name')">
-                            <Field v-if="(item.usabletype === 1) ||
-                                (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) ||
-                                (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)" name="OpenBankName"
+                        <template v-else-if="(item.fieldcode === 'bank_branch_name')">
+                            <Field v-if="showExtendInfo(item)" name="OpenBankName"
                                 :label="item.fieldname"
                                 v-model="item.value" maxlength="50" :placeholder="`请输入${item.fieldname}`" :rules="formRules.OpenBankName"/>
                         </template>
                         <template v-else-if="(item.fieldcode === '100')">
-                            <Field v-if="(item.usabletype === 1) ||
-                                (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) ||
-                                (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)" name="OpenBankNo"
+                            <Field v-if="showExtendInfo(item)" name="OpenBankNo"
                                 :label="item.fieldname"
                                 v-model="item.value" maxlength="50" :placeholder="`请输入${item.fieldname}`" :rules="formRules.OpenBankNo"/>
-                        </template> -->
+                        </template>
                         <template v-else>
-                            <Field v-if="(item.usabletype === 1) ||
-                                (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) ||
-                                (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)" :name="item.fieldcode"
+                            <Field v-if="showExtendInfo(item)" :name="item.fieldcode"
                                 :label="item.fieldname"
                                 :readonly="item.fieldcode === 'legal_name' && userStore.userInfo?.legalpersonname != ''"
                                 v-model="item.value" maxlength="50" :placeholder="`请输入${item.fieldname}`" />
@@ -109,6 +100,13 @@ const props = defineProps({
     }
 })
 
+/// 是否显示拓展信息
+const showExtendInfo = (item: Model.BankCusBankExtendConfigRsp) => {
+    return (item.usabletype === 1) || 
+           (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) || 
+           (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)
+}
+
 // 发送手机验证码
 const sendVerifyCode = () => {
     formRef.value?.validate('MobilePhone').then(() => {

src/packages/pc/views/account/sign/components/sign/index.vue

@@ -22,10 +22,7 @@
             <template v-for="(item, index) in configs" :key="index">
                 <template v-if="(item.fieldcode === 'verify_code')">
                     <el-form-item :label="item.fieldname" :prop="item.fieldcode" 
-                    v-if="(bankInfo === undefined) && 
-                            ((item.usabletype === 1) || 
-                            (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) || 
-                            (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1))">
+                    v-if="bankInfo === undefined && showExtendInfo(item)">
                         <el-input placeholder="请必须输入" type="number" v-model="item.value" :rules="formRules.vcode">
                             <template #append>
                                 <el-button size="small" type="primary" :disabled="isCountdown" @click="sendVerifyCode">
@@ -38,25 +35,19 @@
                     </template>
                     <template v-else-if="(item.fieldcode === 'bank_branch_name')">
                         <el-form-item :label="item.fieldname" prop="OpenBankName"
-                                v-if="(item.usabletype === 1) || 
-                                    (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) || 
-                                    (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)">
+                                v-if="showExtendInfo(item)">
                             <el-input maxlength="50" :name="item.fieldcode" placeholder="请必须输入" v-model="item.value" />
                         </el-form-item>
                     </template>
                     <template v-else-if="(item.fieldcode === '100')">
                         <el-form-item :label="item.fieldname" prop="OpenBankNo"
-                                v-if="(item.usabletype === 1) || 
-                                    (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) || 
-                                    (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)">
+                                v-if="showExtendInfo(item)">
                             <el-input maxlength="50" :name="item.fieldcode" placeholder="请必须输入" v-model="item.value" />
                         </el-form-item>
                     </template>
                 <template v-else>
                     <el-form-item :label="item.fieldname" :prop="item.fieldcode"
-                            v-if="(item.usabletype === 1) || 
-                                (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) || 
-                                (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)">
+                            v-if="showExtendInfo(item)">
                         <el-input :readonly="item.fieldcode === 'legal_name' && userStore.userInfo?.legalpersonname != ''" maxlength="50" :name="item.fieldcode" placeholder="请必须输入" v-model="item.value" />
                     </el-form-item>
                 </template>
@@ -80,6 +71,19 @@ import service from '@/services'
 import AppDrawer from '@pc/components/base/drawer/index.vue'
 import { shallowRef } from 'vue'
 
+const { formData, onSubmit, banklist, bankInfo, loading } = useDoBankSign()
+const { configs } = useDoCusBankExtendConfigs(1)
+const { smsVerificationCode } = useT2bSMSVerificationCode()
+
+const userStore = useUserStore()
+const show = ref(true)
+const refresh = ref(false)
+const formRef = ref<FormInstance>()
+const seconds = ref(60) //倒计时剩余时间
+const isCountdown = ref(false) // 是否正在倒计时
+/// 短信验证码交易中心信息
+const CenterErrMsg = shallowRef('')
+
 const formRules: FormRules = {
     OpenBankAccId: [{
         message: '请选择银行信息',
@@ -123,24 +127,18 @@ const formRules: FormRules = {
     }]
 }
 
-const { formData, onSubmit, banklist, bankInfo, loading } = useDoBankSign()
-const { configs } = useDoCusBankExtendConfigs(1)
-const { smsVerificationCode } = useT2bSMSVerificationCode()
-
-const userStore = useUserStore()
-const show = ref(true)
-const refresh = ref(false)
-const formRef = ref<FormInstance>()
-const seconds = ref(60) //倒计时剩余时间
-const isCountdown = ref(false) // 是否正在倒计时
-/// 短信验证码交易中心信息
-const CenterErrMsg = shallowRef('')
-
 const onCancel = (isRefresh = false) => {
     show.value = false
     refresh.value = isRefresh
 }
 
+/// 是否显示拓展信息
+const showExtendInfo = (item: Model.BankCusBankExtendConfigRsp) => {
+    return (item.usabletype === 1) || 
+           (item.usabletype === 2 && userStore.userInfo?.userinfotype === 2) || 
+           (item.usabletype === 3 && userStore.userInfo?.userinfotype === 1)
+}
+
 // 发送手机验证码
 const sendVerifyCode = () => {
     formRef.value?.validateField('MobilePhone', (valid) => {

src/packages/pc/views/account/sign/index.vue

@@ -114,6 +114,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { prop: 'bankaccountno', label: '签约银行账号' },
     { prop: 'currency', label: '币种' },
     { prop: 'signstatus', label: '状态' },
+    { prop: 'remark', label: '备注' },
 ])
 
 onMounted(() => {

src/types/model/bank.d.ts

@@ -79,12 +79,15 @@ declare namespace Model {
         cardtype: string;//证件类型
         currency: string;//币种
         cusbankid: string;//托管银行编号
+        dealstatus: number // Log处理状态
         direct: number;//方向(可以判断那方先发起的签约)
         exchticket: string;//最后一次签约成功的流水号
         extendinfo: string;//扩展信息(JSON字符串)
         mobilephone: string;//手机号
         mobilephone2: string;//手机号 - 密文
         netaddr: string;//调转网址
+        relateduserid: number // 关联使用者userid
+        remark: string // Log备注
         relateduserid: number;//关联使用者userid
         signstatus: number;//签约状态 - 1:未签约 2:签约待审核 3:签约中 4:已签约 5:解约待审核 6:解约中 7:已解约 8:已解绑 9:绑卡中 1number;
         //:审核拒绝 11:换签待审核