From f3d746181155c223bccdafcbbc45041e944e5eaa Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期二, 21 十月 2025 20:20:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into dev-1.2.0.2
---
src/views/EnterpriseManage/components/WechatConfigureView.vue | 72 +++++++++++++++++++++++++++++++----
1 files changed, 63 insertions(+), 9 deletions(-)
diff --git a/src/views/EnterpriseManage/components/WechatConfigureView.vue b/src/views/EnterpriseManage/components/WechatConfigureView.vue
index c979471..c9d5758 100644
--- a/src/views/EnterpriseManage/components/WechatConfigureView.vue
+++ b/src/views/EnterpriseManage/components/WechatConfigureView.vue
@@ -1,6 +1,6 @@
<template>
<LoadingLayout :loading="isLoading">
- <ProForm :model="form" ref="dialogForm" label-width="210px">
+ <ProForm :model="form" ref="dialogForm" label-width="210px" :is-read="isDetail">
<ProFormItemV2
label="涓氬姟鐢宠缂栧彿:"
prop="business_code"
@@ -123,7 +123,12 @@
:limitFileSize="10"
accept="jpg/jpeg,png"
></ProFormUpload>
- <el-button style="margin-left: 10px" type="primary" link @click="downloadTemplate"
+ <el-button
+ v-if="!isDetail"
+ style="margin-left: 10px"
+ type="primary"
+ link
+ @click="downloadTemplate"
>妯℃澘涓嬭浇</el-button
>
</div>
@@ -153,6 +158,7 @@
v-model="form.subject_type"
:valueEnum="EnumWeChatPayApplymentSubjectTypeText"
placeholder="璇烽�夋嫨涓讳綋绫诲瀷"
+ @change="handleSubjectTypeChange"
>
</ProFormSelect>
</ProFormItemV2>
@@ -363,7 +369,12 @@
:limitFileSize="10"
accept="jpg/jpeg,png"
></ProFormUpload>
- <el-button style="margin-left: 10px" type="primary" link @click="downloadFRTemplate"
+ <el-button
+ v-if="!isDetail"
+ style="margin-left: 10px"
+ type="primary"
+ link
+ @click="downloadFRTemplate"
>妯℃澘涓嬭浇</el-button
>
</div>
@@ -548,7 +559,7 @@
>
<div class="ubo-info-list-top">
<div class="ubo-info-list-title">鏈�缁堝彈鐩婁汉淇℃伅鍒楄〃</div>
- <div class="ubo-info-list-btn">
+ <div class="ubo-info-list-btn" v-if="!isDetail">
<el-button type="primary" link @click="addUboInfo">娣诲姞</el-button>
</div>
</div>
@@ -659,7 +670,9 @@
placeholder="璇烽�夋嫨璇佷欢鏈夋晥鏈熺粨鏉熸椂闂�"
></ProFormDatePicker>
</ProFormItemV2>
- <el-button type="primary" link @click="deleteUboInfo(index)">鍒犻櫎</el-button>
+ <el-button v-if="!isDetail" type="primary" link @click="deleteUboInfo(index)"
+ >鍒犻櫎</el-button
+ >
</div>
</div>
@@ -726,7 +739,7 @@
v-model.trim="form.biz_address_code"
placeholder="璇疯緭鍏ョ嚎涓嬪満鎵�鐪佸競缂栫爜"
/>
- <el-button type="primary" link @click="downloadAddressCodeTemplate"
+ <el-button v-if="!isDetail" type="primary" link @click="downloadAddressCodeTemplate"
>鐪佸競缂栫爜妯℃澘</el-button
>
</div>
@@ -896,9 +909,10 @@
v-model:file-url="form.web_authorisation"
:limit="1"
:limitFileSize="10"
- accept="jpg/jpeg,png,pdf"
+ accept="jpg/jpeg,png"
></ProFormUpload>
<el-button
+ v-if="!isDetail"
style="margin-left: 10px"
type="primary"
link
@@ -999,7 +1013,12 @@
>
<div style="display: flex; width: 100%">
<ProFormText v-model.trim="form.settlement_id" placeholder="璇疯緭鍏ュ叆椹荤粨绠楄鍒橧D" />
- <el-button style="margin-left: 10px" type="primary" link @click="openOuterSettleRule"
+ <el-button
+ v-if="!isDetail"
+ style="margin-left: 10px"
+ type="primary"
+ link
+ @click="openOuterSettleRule"
>璐圭巼缁撶畻瑙勫垯瀵圭収琛�</el-button
>
</div>
@@ -1027,8 +1046,9 @@
>
<ProFormSelect
v-model="form.bank_account_type"
- :valueEnum="EnumWeChatPayApplymentBankAccountTypeText"
+ :valueEnum="bank_account_typeList"
placeholder="璇烽�夋嫨缁撶畻閾惰璐︽埛绫诲瀷"
+ @change="handleBankAccountTypeChange"
>
</ProFormSelect>
</ProFormItemV2>
@@ -1044,12 +1064,15 @@
prop="bank_alias"
:checkRules="[{ message: '璇疯緭鍏ュ紑鎴烽摱琛�' }]"
>
+ <div v-if="isDetail">{{ form.bank_alias }}</div>
<WeChatPayWalletBanksSelect
+ v-else
v-model:bank_alias="form.bank_alias"
v-model:account_bank="form.account_bank"
v-model:account_bank_code="form.account_bank_code"
v-model:bank_alias_code="form.bank_alias_code"
v-model:need_bank_branch="form.need_bank_branch"
+ v-model:bank_branch_id="form.bank_branch_id"
:bank_account_type="form.bank_account_type"
placeholder="璇疯緭鍏ュ紑鎴烽摱琛�"
clearable
@@ -1102,6 +1125,7 @@
ProFormRadio,
ProFormDatePicker,
ProFormImageUpload,
+ useFormDialog,
} from '@bole-core/components';
import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
import { useQuery } from '@tanstack/vue-query';
@@ -1122,6 +1146,7 @@
EnumWeChatPayApplymentSalesScenesType,
EnumWeChatPayApplymentSalesScenesTypeText,
EnumWeChatPayApplymentBankAccountTypeText,
+ EnumWeChatPayApplymentBankAccountTypeTextForGTH,
BooleanOptions,
} from '@/constants';
import { convertApi2FormUrlOnlyOne, downloadFileByUrl, format, convertApi2FormUrls } from '@/utils';
@@ -1156,6 +1181,7 @@
const dialogForm = ref<FormInstance>();
const form = reactive({
+ applyment_state: '' as any as EnumWeChatPayApplymentState,
business_code: '',
contact_type: '' as any as EnumWeChatPayApplymentContactType,
contact_name: '',
@@ -1239,6 +1265,10 @@
bank_branch_area: [] as number[],
});
+const isDetail = computed(
+ () => form.applyment_state === EnumWeChatPayApplymentState.APPLYMENT_STATE_FINISHED
+);
+
const EnumWeChatPayApplymentCertTypeTextList = computed(() => {
if (form.subject_type === EnumWeChatPayApplymentSubjectType.SUBJECT_TYPE_INSTITUTIONS) {
return EnumWeChatPayApplymentCertTypeTextForSYDW;
@@ -1269,6 +1299,13 @@
return EnumWeChatPayApplymentIdDocTypeText;
});
+const bank_account_typeList = computed(() => {
+ if (form.subject_type === EnumWeChatPayApplymentSubjectType.SUBJECT_TYPE_INDIVIDUAL) {
+ return EnumWeChatPayApplymentBankAccountTypeTextForGTH;
+ }
+ return EnumWeChatPayApplymentBankAccountTypeText;
+});
+
const { isLoading, refetch } = useQuery({
queryKey: [
'enterpriseWalletServices/getEnterpriseWallet',
@@ -1281,6 +1318,7 @@
});
},
onSuccess(data) {
+ form.applyment_state = data.applyment_state;
form.business_code = data.business_code ?? '';
form.contact_type = data.contact_info?.contact_type;
form.contact_name = data.contact_info?.contact_name ?? '';
@@ -1739,6 +1777,22 @@
);
}
+function handleSubjectTypeChange() {
+ form.cert_type = '' as any as EnumWeChatPayApplymentCertType;
+ form.id_holder_type = '' as any as EnumWeChatPayApplymentIdHolderType;
+ form.id_doc_type = '' as any as EnumWeChatPayApplymentIdDocType;
+ form.bank_account_type = EnumWeChatPayApplymentBankAccountType.BANK_ACCOUNT_TYPE_CORPORATE;
+ handleBankAccountTypeChange();
+}
+
+function handleBankAccountTypeChange() {
+ form.bank_alias = '';
+ form.account_bank = '';
+ form.account_bank_code = '' as any as number;
+ form.bank_alias_code = '';
+ form.need_bank_branch = false;
+}
+
defineExpose({
onConfirm: openEnterpriseWeChatPayWallet,
});
--
Gitblit v1.9.1