Pārlūkot izejas kodu

chore: 注册功能迁移至系统配置界面修改

喵你个旺呀 1 gadu atpakaļ
vecāks
revīzija
33a9b8bd9f

+ 7 - 15
Web/src/views/system/infoSetting/index.vue

@@ -32,25 +32,16 @@
 				<el-descriptions-item label="ICP地址">
 					<el-input v-model="state.formData.icpUrl" />
 				</el-descriptions-item>
-				<el-descriptions-item label="登录二次验证">
-					<el-radio-group v-model="state.formData.secondVer">
-						<el-radio :value="1">启用</el-radio>
-						<el-radio :value="2">禁用</el-radio>
-					</el-radio-group>
-				</el-descriptions-item>
 				<el-descriptions-item label="图形验证码">
-					<el-radio-group v-model="state.formData.captcha">
-						<el-radio :value="1">启用</el-radio>
-						<el-radio :value="2">禁用</el-radio>
-					</el-radio-group>
+					<g-sys-dict v-model="state.formData.captcha" code="YesNoEnum" render-as="radio" />
+				</el-descriptions-item>
+				<el-descriptions-item label="登录二次验证">
+					<g-sys-dict v-model="state.formData.secondVer" code="YesNoEnum" render-as="radio" />
 				</el-descriptions-item>
 				<el-descriptions-item label="用户注册">
-					<el-radio-group v-model="state.formData.enableReg">
-						<el-radio :value="1">启用</el-radio>
-						<el-radio :value="2">禁用</el-radio>
-					</el-radio-group>
+					<g-sys-dict v-model="state.formData.enableReg" code="YesNoEnum" render-as="radio" />
 				</el-descriptions-item>
-				<el-descriptions-item label="注册方案" v-if="state.formData.enableReg">
+				<el-descriptions-item label="注册方案" v-if="state.formData.enableReg == 1">
 					<el-select v-model="state.formData.regWayId" placeholder="注册方案" clearable class="w100">
 						<el-option :label="item.label" :value="item.value" v-for="(item, index) in state.wayList" :key="index" />
 					</el-select>
@@ -70,6 +61,7 @@ import { fileToBase64 } from '/@/utils/base64Conver';
 
 import { getAPI } from '/@/utils/axios-utils';
 import {SysConfigApi} from '/@/api-services';
+import GSysDict from "/@/components/sysDict/sysDict.vue";
 
 const uploadRef = ref<UploadInstance>();
 const state = reactive({

+ 6 - 19
Web/src/views/system/tenant/component/editTenant.vue

@@ -145,6 +145,10 @@
 									<el-input v-model="state.ruleForm.watermark" placeholder="应用水印" maxlength="32" clearable />
 								</el-form-item>
 							</el-col>
+						</el-row>
+					</el-tab-pane>
+					<el-tab-pane label="配置开关" style="height: 550px; overflow: auto; overflow-x: hidden;">
+						<el-row :gutter="35">
 							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 								<el-form-item label="启用验证码" prop="captcha">
 									<el-switch
@@ -169,25 +173,6 @@
 									/>
 								</el-form-item>
 							</el-col>
-							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
-								<el-form-item label="启用注册" prop="enableReg">
-									<el-switch
-											v-model="state.ruleForm.enableReg"
-											inline-prompt
-											:active-value="1"
-											:inactive-value="2"
-											active-text="开启"
-											inactive-text="关闭"
-									/>
-								</el-form-item>
-							</el-col>
-							<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20" v-if="state.ruleForm.enableReg == 1">
-								<el-form-item label="注册方案" prop="regWayId" :rules="[{ required: true, message: '职位不能为空', trigger: 'blur' }]">
-									<el-select v-model="state.ruleForm.regWayId" placeholder="注册方案" clearable class="w100">
-										<el-option :label="item.name" :value="item.id" v-for="(item, index) in state.regWayData" :key="index" />
-									</el-select>
-								</el-form-item>
-							</el-col>
 						</el-row>
 					</el-tab-pane>
 				</el-tabs>
@@ -238,6 +223,8 @@ const openDialog = async (row: any) => {
 	state.selectedTabName = '0';
 	ruleFormRef.value?.resetFields();
 	state.ruleForm = JSON.parse(JSON.stringify(row));
+	state.ruleForm.enableReg = undefined;
+	state.ruleForm.regWayId = undefined;
 	state.ruleForm.icp ??= '省ICP备12345678号';
 	state.ruleForm.icpUrl ??= 'https://beian.miit.gov.cn';
 	state.ruleForm.copyright ??= 'Copyright \u00a9 2024-present xxxxx All rights reserved.';