From b9eb4d112d8e5f252c4d3d7e067290569b749cfb Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 05 九月 2025 14:39:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
src/views/EnterpriseManage/components/ConfigureDialog.vue | 89 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 77 insertions(+), 12 deletions(-)
diff --git a/src/views/EnterpriseManage/components/ConfigureDialog.vue b/src/views/EnterpriseManage/components/ConfigureDialog.vue
index 16d84e1..e094b3c 100644
--- a/src/views/EnterpriseManage/components/ConfigureDialog.vue
+++ b/src/views/EnterpriseManage/components/ConfigureDialog.vue
@@ -1,6 +1,6 @@
<template>
<ProDialog title="閰嶇疆" v-model="visible" @close="onDialogClose" destroy-on-close draggable>
- <ProForm :model="form" ref="dialogForm" label-width="100px">
+ <ProForm :model="form" ref="dialogForm" label-width="120px">
<ProFormItemV2 label="" prop="enterpriseConfigureType" label-width="0">
<ProFormRadio
v-model="form.enterpriseConfigureType"
@@ -35,25 +35,59 @@
</ProFormItemV2>
<ProFormItemV2 label="閾惰璐︽埛:" prop="verifyStatus">
{{ VerifyStatusText[form.verifyStatus] }}
- <el-button style="margin-left: 40px" type="primary" link @click="handleCheckBankAccount"
+ <el-button style="margin-left: 10px" type="primary" link @click="handleCheckBankAccount"
>鏍￠獙</el-button
>
</ProFormItemV2>
</template> -->
+ <template v-if="form.enterpriseConfigureType === EnterpriseConfigureType.AliPay">
+ <ProFormItemV2
+ label="鏀粯瀹濊处鍙�:"
+ prop="alipayAccount"
+ :checkRules="[{ message: '璇疯緭鍏ユ敮浠樺疂璐﹀彿' }]"
+ >
+ <div style="display: flex; width: 100%">
+ <ProFormText v-model.trim="form.alipayAccount" placeholder="璇疯緭鍏ユ敮浠樺疂璐﹀彿">
+ </ProFormText>
+ <el-button style="margin-left: 10px" type="primary" link @click="openEnterpriseWallet"
+ >鑾峰彇绛剧害閾炬帴</el-button
+ >
+ </div>
+ </ProFormItemV2>
+ <ProFormItemV2
+ label="鍟嗘埛ID:"
+ prop="alipayMerchantId"
+ :checkRules="[{ message: '璇疯緭鍏ュ晢鎴稩D' }]"
+ >
+ <ProFormText v-model.trim="form.alipayMerchantId" placeholder="璇疯緭鍏ュ晢鎴稩D" />
+ </ProFormItemV2>
+ <ProFormItemV2 label="绛剧害鐘舵��:" prop="alipayAccount" required>
+ <span>宸茬绾�</span>
+ <el-button style="margin-left: 10px" type="primary" link @click="handleCheckBankAccount"
+ >鏍￠獙</el-button
+ >
+ </ProFormItemV2>
+ <ProFormItemV2 label="杩涗欢鐘舵��:" prop="alipayAccount" required>
+ <span>宸茶繘浠�</span>
+ <el-button style="margin-left: 10px" type="primary" link @click="handleCheckBankAccount"
+ >鏍￠獙</el-button
+ >
+ </ProFormItemV2>
+ </template>
<template v-if="form.enterpriseConfigureType === EnterpriseConfigureType.Electronic">
<div class="configure-dialog-form-title">閫氶亾閰嶇疆</div>
<ProFormItemV2
- label="鍚嶇О:"
+ v-for="(item, index) in enabledElectronSignSettings"
+ :label="item.accessName"
+ :key="item.access"
prop="electronSignAccesses"
- :checkRules="[{ message: '璇烽�夋嫨鐢靛瓙绛鹃�氶亾' }]"
+ required
>
- <ProFormSelect
- v-model="form.electronSignAccesses"
- :valueEnum="EnumElectronSignAccessText"
- placeholder="璇烽�夋嫨鐢靛瓙绛鹃�氶亾"
- multiple
- >
- </ProFormSelect>
+ <ProFormSwitch
+ v-model="form.electronSignAccesses[index]"
+ :active-value="Number(item.access)"
+ :inactive-value="null"
+ ></ProFormSwitch>
</ProFormItemV2>
</template>
<template v-if="form.enterpriseConfigureType === EnterpriseConfigureType.ShortMessage">
@@ -84,6 +118,7 @@
</span>
</template>
</ProDialog>
+ <AlipayWalletOpen v-bind="dialogQrcodeProps"></AlipayWalletOpen>
</template>
<script setup lang="ts">
@@ -96,6 +131,8 @@
ProFormRadio,
ProFormInputNumber,
ProFormSelect,
+ ProFormSwitch,
+ useFormDialog,
} from '@bole-core/components';
import { BoleRegExp } from '@bole-core/core';
import {
@@ -104,8 +141,10 @@
ChargeTypeEnum,
EnumElectronSignAccessText,
EnumSmsAccessText,
- EnumRealAccess,
+ EnumElectronSignAccess,
} from '@/constants';
+import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
+import AlipayWalletOpen from './AlipayWalletOpen.vue';
defineOptions({
name: 'ConfigureDialog',
@@ -120,6 +159,9 @@
electronSignAccesses: EnumElectronSignAccess[];
smsAccess: EnumSmsAccess;
smsCost: number;
+ alipayAccount: string;
+ alipayMerchantId: string;
+ id: string;
};
const form = defineModel<Form>('form');
@@ -131,6 +173,8 @@
}>();
const dialogForm = ref<FormInstance>();
+
+const { enabledElectronSignSettings } = useEnabledElectronSignSettings();
function handleCheckBankAccount() {}
@@ -149,6 +193,27 @@
}
});
}
+
+const { dialogProps: dialogQrcodeProps, handleAdd } = useFormDialog({
+ defaultFormParams: {
+ alipayUrl: '',
+ },
+});
+
+async function openEnterpriseWallet() {
+ try {
+ let params: API.OpenEnterpriseWalletCommand = {
+ access: EnumEnterpriseWalletAccess.Alipay,
+ enterpriseId: form.value.id,
+ };
+ let res = await enterpriseWalletServices.openEnterpriseWallet(params);
+ if (res) {
+ handleAdd({
+ alipayUrl: res.signUrl,
+ });
+ }
+ } catch (error) {}
+}
</script>
<style lang="scss" scoped>
@use '@/style/common.scss' as *;
--
Gitblit v1.9.1