From 745f1e2ee7072731611391b89c5c0020783828bf Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 22 八月 2025 14:23:29 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
src/views/EnterpriseManage/components/ConfigureDialog.vue | 56 +++-------------------------
src/views/EnterpriseManage/EnterpriseManageList.vue | 19 +--------
2 files changed, 9 insertions(+), 66 deletions(-)
diff --git a/src/views/EnterpriseManage/EnterpriseManageList.vue b/src/views/EnterpriseManage/EnterpriseManageList.vue
index bcf9029..e27c0cd 100644
--- a/src/views/EnterpriseManage/EnterpriseManageList.vue
+++ b/src/views/EnterpriseManage/EnterpriseManageList.vue
@@ -156,19 +156,13 @@
handleEdit({
id: row.id,
enterpriseConfigureType: EnterpriseConfigureType.Electronic,
- realAccess: electronSignSetting.realAccess,
- realVerifyCost: electronSignSetting.realVerifyCost,
- signCost: electronSignSetting.signCost,
- mergeSignCost: electronSignSetting.mergeSignCost,
-
+ electronSignAccesses: electronSignSetting.electronSignAccesses,
smsAccess: smsSetting.smsAccess,
- chargeType: ChargeTypeEnum.Group,
smsCost: smsSetting.smsCost,
});
} else {
handleAdd({
enterpriseConfigureType: EnterpriseConfigureType.Electronic,
- chargeType: ChargeTypeEnum.Group,
});
}
}
@@ -178,11 +172,7 @@
defaultFormParams: {
id: '',
enterpriseConfigureType: EnterpriseConfigureType.Electronic,
- realAccess: '' as any as EnumRealAccess,
- realVerifyCost: 0,
- signCost: 0,
- mergeSignCost: 0,
- chargeType: ChargeTypeEnum.Group,
+ electronSignAccesses: [] as EnumElectronSignAccess[],
smsAccess: '' as any as EnumSmsAccess,
smsCost: 0,
},
@@ -225,10 +215,7 @@
try {
let params: API.SetEnterpriseElectronSignSettingCommand = {
id: editForm.id,
- realAccess: editForm.realAccess,
- realVerifyCost: editForm.realVerifyCost,
- signCost: editForm.signCost,
- mergeSignCost: editForm.mergeSignCost,
+ electronSignAccesses: editForm.electronSignAccesses,
};
return await enterpriseServices.setEnterpriseElectronSignSetting(params);
} catch (error) {}
diff --git a/src/views/EnterpriseManage/components/ConfigureDialog.vue b/src/views/EnterpriseManage/components/ConfigureDialog.vue
index 5a8a232..16d84e1 100644
--- a/src/views/EnterpriseManage/components/ConfigureDialog.vue
+++ b/src/views/EnterpriseManage/components/ConfigureDialog.vue
@@ -44,56 +44,17 @@
<div class="configure-dialog-form-title">閫氶亾閰嶇疆</div>
<ProFormItemV2
label="鍚嶇О:"
- prop="realAccess"
+ prop="electronSignAccesses"
:checkRules="[{ message: '璇烽�夋嫨鐢靛瓙绛鹃�氶亾' }]"
>
<ProFormSelect
- v-model="form.realAccess"
- :valueEnum="EnumRealAccessText"
+ v-model="form.electronSignAccesses"
+ :valueEnum="EnumElectronSignAccessText"
placeholder="璇烽�夋嫨鐢靛瓙绛鹃�氶亾"
+ multiple
>
</ProFormSelect>
</ProFormItemV2>
- <div class="configure-dialog-form-title">璐圭敤閰嶇疆</div>
- <ProFormItemV2
- label="璁¤垂鏂瑰紡:"
- prop="chargeType"
- :checkRules="[{ message: '璇烽�夋嫨璁¤垂鏂瑰紡' }]"
- >
- <ProFormRadio
- :button-style="false"
- v-model="form.chargeType"
- :value-enum="ChargeTypeEnumText"
- />
- </ProFormItemV2>
- <template v-if="form.chargeType === ChargeTypeEnum.Group">
- <ProFormItemV2 label="瀹炲悕璐圭敤:" prop="realVerifyCost">
- <ProFormInputNumber
- :controls="false"
- v-model="form.realVerifyCost"
- placeholder="璇疯緭鍏�"
- unit="鍏�/鏉�"
- />
- </ProFormItemV2>
- <ProFormItemV2 label="绛剧害璐圭敤:" prop="signCost">
- <ProFormInputNumber
- :controls="false"
- v-model="form.signCost"
- placeholder="璇疯緭鍏�"
- unit="鍏�/浠�"
- />
- </ProFormItemV2>
- </template>
- <template v-if="form.chargeType === ChargeTypeEnum.Merge">
- <ProFormItemV2 label="缁熶竴鐢靛瓙绛�:" prop="mergeSignCost">
- <ProFormInputNumber
- :controls="false"
- v-model="form.mergeSignCost"
- placeholder="璇疯緭鍏�"
- unit="鍏�/浠�"
- />
- </ProFormItemV2>
- </template>
</template>
<template v-if="form.enterpriseConfigureType === EnterpriseConfigureType.ShortMessage">
<div class="configure-dialog-form-title">閫氶亾閰嶇疆</div>
@@ -141,8 +102,7 @@
EnterpriseConfigureType,
EnterpriseConfigureTypeText,
ChargeTypeEnum,
- ChargeTypeEnumText,
- EnumRealAccessText,
+ EnumElectronSignAccessText,
EnumSmsAccessText,
EnumRealAccess,
} from '@/constants';
@@ -157,11 +117,7 @@
// openBranchBank: string;
// bankAccount: string;
// verifyStatus: VerifyStatus;
- chargeType: ChargeTypeEnum;
- realAccess: EnumRealAccess;
- realVerifyCost: number;
- signCost: number;
- mergeSignCost: number;
+ electronSignAccesses: EnumElectronSignAccess[];
smsAccess: EnumSmsAccess;
smsCost: number;
};
--
Gitblit v1.9.1