From ce7ff0effee22807c8d29a31d6f5f2713d3bf95c Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 11 九月 2025 17:39:51 +0800
Subject: [PATCH] Merge branch 'master' into dev-v1.1
---
src/views/EnterpriseManage/components/ConfigureDialog.vue | 104 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 77 insertions(+), 27 deletions(-)
diff --git a/src/views/EnterpriseManage/components/ConfigureDialog.vue b/src/views/EnterpriseManage/components/ConfigureDialog.vue
index c7bf12b..4a8e7f9 100644
--- a/src/views/EnterpriseManage/components/ConfigureDialog.vue
+++ b/src/views/EnterpriseManage/components/ConfigureDialog.vue
@@ -49,35 +49,66 @@
<div style="display: flex; width: 100%">
<ProFormText v-model.trim="form.alipayAccount" placeholder="璇疯緭鍏ユ敮浠樺疂璐﹀彿">
</ProFormText>
- <el-button
- style="margin-left: 10px"
- type="primary"
- link
- @click="handleOpenEnterpriseWallet"
+ <el-button style="margin-left: 10px" type="primary" link @click="openEnterpriseWallet"
>鑾峰彇绛剧害閾炬帴</el-button
>
</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="scene" :checkRules="[{ message: '璇烽�夋嫨涓氬姟鍦烘櫙' }]">
+ <ProFormSelect
+ v-model="form.scene"
+ :valueEnum="EnumEnterpriseWalletExpandindirectOrderSceneText"
+ placeholder="璇烽�夋嫨涓氬姟鍦烘櫙"
+ >
+ </ProFormSelect>
</ProFormItemV2>
<ProFormItemV2
- label="鍥剧墖:"
- prop="url"
- :check-rules="[{ type: 'upload', message: '璇蜂笂浼犲浘鐗�' }]"
+ label="鍦烘櫙鎻忚堪:"
+ prop="sceneDirections"
+ :checkRules="[{ message: '璇疯緭鍏ュ満鏅弿杩�' }]"
>
- <ProFormImageUpload v-model:file-url="form.url" :limitFileCount="1"></ProFormImageUpload>
+ <ProFormText
+ v-model.trim="form.sceneDirections"
+ placeholder="璋�/閫氳繃浠�涔堝獟浠嬶紙APP/web/灏忕▼搴�)/涓昏涓鸿皝鎻愪緵浠�涔堟湇鍔�/鐢ㄤ簬鍦ㄤ粈涔堝満鏅粰浠�涔堜汉缇よ浆璐�"
+ />
</ProFormItemV2>
<ProFormItemV2
- label="鍥剧墖:"
- prop="url"
- :check-rules="[{ type: 'upload', message: '璇蜂笂浼犲浘鐗�' }]"
+ label="杞处鍦烘櫙鎴浘:"
+ prop="sceneFiles"
+ :check-rules="[{ type: 'upload', message: '璇蜂笂浼犺浆璐﹀満鏅埅鍥�' }]"
>
- <ProFormImageUpload v-model:file-url="form.url" :limitFileCount="1"></ProFormImageUpload>
+ <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>
@@ -155,6 +186,7 @@
useFormDialog,
UploadUserFile,
ProFormImageUpload,
+ ProFormUpload,
} from '@bole-core/components';
import { BoleRegExp } from '@bole-core/core';
import {
@@ -166,6 +198,7 @@
EnumElectronSignAccess,
EnumEnterpriseWalletSignStatusText,
EnumEnterpriseWalletExpandindirectOrderStatusText,
+ EnumEnterpriseWalletExpandindirectOrderSceneText,
} from '@/constants';
import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
import AlipayWalletOpen from './AlipayWalletOpen.vue';
@@ -190,7 +223,13 @@
signStatus: EnumEnterpriseWalletSignStatus;
expandindirectOrderStatus: EnumEnterpriseWalletExpandindirectOrderStatus;
- url: UploadUserFile[];
+ name: string;
+ scene: EnumEnterpriseWalletExpandindirectOrderScene;
+ sceneDirections: string;
+ /**杞处鍦烘櫙鎴浘 */
+ sceneFiles: UploadUserFile[];
+ /**鍟嗘埛琛屼笟璧勮川鍥剧墖鎴栧崗璁枃鏈� */
+ sceneQualificationFiles: UploadUserFile[];
};
const form = defineModel<Form>('form');
@@ -203,7 +242,9 @@
const dialogForm = ref<FormInstance>();
-const { enabledElectronSignSettings } = useEnabledElectronSignSettings();
+const { enabledElectronSignSettings } = useEnabledElectronSignSettings({
+ all: true,
+});
async function handleCheckBankAccount() {
try {
@@ -214,6 +255,17 @@
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) {}
}
@@ -240,23 +292,21 @@
},
});
-async function handleOpenEnterpriseWallet() {
- try {
- if (!dialogForm.value) return;
- const valid = await dialogForm.value.validateField(['alipayAccount', 'alipayMerchantId']);
- if (valid) {
- openEnterpriseWallet();
- }
- } catch (error) {}
-}
+// 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,
- account: form.value.alipayAccount,
- merchantId: form.value.alipayMerchantId,
};
let res = await enterpriseWalletServices.openEnterpriseWallet(params);
if (res) {
--
Gitblit v1.9.1