From 68e3ef3c7e93de361e04dd2fc5dc261ba436b652 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期四, 11 九月 2025 15:57:58 +0800 Subject: [PATCH] fix: bug --- src/views/EnterpriseManage/components/ConfigureDialog.vue | 126 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 115 insertions(+), 11 deletions(-) diff --git a/src/views/EnterpriseManage/components/ConfigureDialog.vue b/src/views/EnterpriseManage/components/ConfigureDialog.vue index 46b8b87..4a8e7f9 100644 --- a/src/views/EnterpriseManage/components/ConfigureDialog.vue +++ b/src/views/EnterpriseManage/components/ConfigureDialog.vue @@ -55,20 +55,71 @@ </div> </ProFormItemV2> <ProFormItemV2 + label="鏀粯瀹濆鍚�:" + prop="name" + :checkRules="[{ message: '璇疯緭鍏ユ敮浠樺疂濮撳悕' }]" + > + <ProFormText v-model.trim="form.name" placeholder="璇疯緭鍏ユ敮浠樺疂濮撳悕" /> + </ProFormItemV2> + <ProFormItemV2 label="鍟嗘埛ID:" prop="alipayMerchantId" :checkRules="[{ message: '璇疯緭鍏ュ晢鎴稩D' }]" > - <ProFormText v-model.trim="form.alipayMerchantId" placeholder="璇疯緭鍏ュ晢鎴稩D" /> + <ProFormText v-model.trim="form.alipayMerchantId" placeholder="璇疯緭鍏ュ晢鎴稩D" disabled /> </ProFormItemV2> - <ProFormItemV2 label="绛剧害鐘舵��:" prop="alipayAccount" required> - <span>宸茬绾�</span> + <ProFormItemV2 label="涓氬姟鍦烘櫙:" prop="scene" :checkRules="[{ message: '璇烽�夋嫨涓氬姟鍦烘櫙' }]"> + <ProFormSelect + v-model="form.scene" + :valueEnum="EnumEnterpriseWalletExpandindirectOrderSceneText" + placeholder="璇烽�夋嫨涓氬姟鍦烘櫙" + > + </ProFormSelect> + </ProFormItemV2> + <ProFormItemV2 + label="鍦烘櫙鎻忚堪:" + prop="sceneDirections" + :checkRules="[{ message: '璇疯緭鍏ュ満鏅弿杩�' }]" + > + <ProFormText + v-model.trim="form.sceneDirections" + placeholder="璋�/閫氳繃浠�涔堝獟浠嬶紙APP/web/灏忕▼搴�)/涓昏涓鸿皝鎻愪緵浠�涔堟湇鍔�/鐢ㄤ簬鍦ㄤ粈涔堝満鏅粰浠�涔堜汉缇よ浆璐�" + /> + </ProFormItemV2> + <ProFormItemV2 + label="杞处鍦烘櫙鎴浘:" + prop="sceneFiles" + :check-rules="[{ type: 'upload', message: '璇蜂笂浼犺浆璐﹀満鏅埅鍥�' }]" + > + <ProFormUpload + v-model:file-url="form.sceneFiles" + :limit="5" + :limitFileSize="10" + accept="png,jpg,jpeg,pdf" + ></ProFormUpload> + </ProFormItemV2> + <ProFormItemV2 + label="璧勮川鏂囦欢:" + prop="sceneQualificationFiles" + :check-rules="[{ type: 'upload', message: '璇蜂笂浼犺祫璐ㄦ枃浠�' }]" + > + <ProFormUpload + v-model:file-url="form.sceneQualificationFiles" + :limit="5" + :limitFileSize="10" + accept="png,jpg,jpeg,pdf" + ></ProFormUpload> + </ProFormItemV2> + <ProFormItemV2 label="绛剧害鐘舵��:" prop="signStatus" required> + <span>{{ EnumEnterpriseWalletSignStatusText[form.signStatus] }}</span> <el-button style="margin-left: 10px" type="primary" link @click="handleCheckBankAccount" >鏍¢獙</el-button > </ProFormItemV2> - <ProFormItemV2 label="杩涗欢鐘舵��:" prop="alipayAccount" required> - <span>宸茶繘浠�</span> + <ProFormItemV2 label="杩涗欢鐘舵��:" prop="expandindirectOrderStatus" required> + <span>{{ + EnumEnterpriseWalletExpandindirectOrderStatusText[form.expandindirectOrderStatus] + }}</span> <el-button style="margin-left: 10px" type="primary" link @click="handleCheckBankAccount" >鏍¢獙</el-button > @@ -118,7 +169,7 @@ </span> </template> </ProDialog> - <QrcodeDialog v-bind="dialogQrcodeProps"></QrcodeDialog> + <AlipayWalletOpen v-bind="dialogQrcodeProps"></AlipayWalletOpen> </template> <script setup lang="ts"> @@ -133,6 +184,9 @@ ProFormSelect, ProFormSwitch, useFormDialog, + UploadUserFile, + ProFormImageUpload, + ProFormUpload, } from '@bole-core/components'; import { BoleRegExp } from '@bole-core/core'; import { @@ -142,9 +196,12 @@ EnumElectronSignAccessText, EnumSmsAccessText, EnumElectronSignAccess, + EnumEnterpriseWalletSignStatusText, + EnumEnterpriseWalletExpandindirectOrderStatusText, + EnumEnterpriseWalletExpandindirectOrderSceneText, } from '@/constants'; import * as enterpriseWalletServices from '@/services/api/enterpriseWallet'; -import QrcodeDialog from './QrcodeDialog.vue'; +import AlipayWalletOpen from './AlipayWalletOpen.vue'; defineOptions({ name: 'ConfigureDialog', @@ -161,6 +218,18 @@ smsCost: number; alipayAccount: string; alipayMerchantId: string; + id: string; + + signStatus: EnumEnterpriseWalletSignStatus; + expandindirectOrderStatus: EnumEnterpriseWalletExpandindirectOrderStatus; + + name: string; + scene: EnumEnterpriseWalletExpandindirectOrderScene; + sceneDirections: string; + /**杞处鍦烘櫙鎴浘 */ + sceneFiles: UploadUserFile[]; + /**鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� */ + sceneQualificationFiles: UploadUserFile[]; }; const form = defineModel<Form>('form'); @@ -173,9 +242,33 @@ const dialogForm = ref<FormInstance>(); -const { enabledElectronSignSettings } = useEnabledElectronSignSettings(); +const { enabledElectronSignSettings } = useEnabledElectronSignSettings({ + all: true, +}); -function handleCheckBankAccount() {} +async function handleCheckBankAccount() { + try { + let alipayWallet = await enterpriseWalletServices.getEnterpriseWallet({ + enterpriseId: form.value.id, + access: EnumEnterpriseWalletAccess.Alipay, + }); + if (alipayWallet) { + form.value.signStatus = alipayWallet.signStatus; + form.value.expandindirectOrderStatus = alipayWallet.expandindirectOrderStatus; + } + } catch (error) {} +} + +async function getEnterpriseWalletExpandindirectOrder() { + try { + let res = await enterpriseWalletServices.getEnterpriseWalletExpandindirectOrder({ + enterpriseId: form.value.id, + }); + if (res) { + form.value.expandindirectOrderStatus = res.orderStatus; + } + } catch (error) {} +} function onDialogClose() { if (!dialogForm.value) return; @@ -195,19 +288,30 @@ const { dialogProps: dialogQrcodeProps, handleAdd } = useFormDialog({ defaultFormParams: { - qrcodeUrl: '', + alipayUrl: '', }, }); + +// async function handleOpenEnterpriseWallet() { +// try { +// if (!dialogForm.value) return; +// const valid = await dialogForm.value.validateField(['alipayAccount', 'alipayMerchantId']); +// if (valid) { +// openEnterpriseWallet(); +// } +// } catch (error) {} +// } async function openEnterpriseWallet() { try { let params: API.OpenEnterpriseWalletCommand = { access: EnumEnterpriseWalletAccess.Alipay, + enterpriseId: form.value.id, }; let res = await enterpriseWalletServices.openEnterpriseWallet(params); if (res) { handleAdd({ - qrcodeUrl: res.signUrl, + alipayUrl: res.signUrl, }); } } catch (error) {} -- Gitblit v1.9.1