Ver código fonte

fixup! refactor: 😀优化字典模块 1. 移除字典类型表租户隔离特 2. 以SysFlag字段区分平台字典与业务字典 3. 保留字典值Code字段,移除Name字段 4. 移除字典多租户查询条件

喵你个旺呀 1 ano atrás
pai
commit
f6a5e176e6

+ 11 - 1
Web/src/views/system/dict/component/editDictType.vue

@@ -19,6 +19,14 @@
 							<el-input v-model="state.ruleForm.code" placeholder="字典编码" clearable />
 						</el-form-item>
 					</el-col>
+					<el-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24" class="mb20" v-if="userInfo.accountType === AccountTypeEnum.NUMBER_999">
+						<el-form-item label="内置参数" prop="sysFlag" :rules="[{ required: true, message: '内置参数不能为空', trigger: 'blur' }]">
+							<el-radio-group v-model="state.ruleForm.sysFlag" :disabled="state.ruleForm.sysFlag == 1 && state.ruleForm.id != undefined">
+								<el-radio :value="1">是</el-radio>
+								<el-radio :value="2">否</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="状态">
 							<el-radio-group v-model="state.ruleForm.status">
@@ -54,11 +62,13 @@ import { reactive, ref } from 'vue';
 
 import { getAPI } from '/@/utils/axios-utils';
 import { SysDictTypeApi } from '/@/api-services/api';
-import { UpdateDictTypeInput } from '/@/api-services/models';
+import {AccountTypeEnum, UpdateDictTypeInput} from '/@/api-services/models';
+import {useUserInfo} from "/@/stores/userInfo";
 
 const props = defineProps({
 	title: String,
 });
+const userInfo = useUserInfo().userInfos;
 const emits = defineEmits(['handleQuery', 'handleUpdate']);
 const ruleFormRef = ref();
 const state = reactive({

+ 2 - 2
Web/src/views/system/dict/index.vue

@@ -47,7 +47,7 @@
 									<el-button icon="ele-Edit" size="small" text type="primary" :disabled="!hasPermission(scope.row)" @click="openEditDictType(scope.row)" v-auth="'sysDictType:update'"> </el-button>
 								</el-tooltip>
 								<el-tooltip content="删除">
-									<el-button icon="ele-Delete" size="small" text type="danger" :disabled="!hasPermission(scope.row)" @click="delDictType(scope.row)" v-auth="'sysDictType:delete'"> </el-button>
+									<el-button icon="ele-Delete" size="small" text type="danger" :disabled="scope.row?.sysFlag === 1 || !hasPermission(scope.row)" @click="delDictType(scope.row)" v-auth="'sysDictType:delete'"> </el-button>
 								</el-tooltip>
 							</template>
 						</el-table-column>
@@ -242,7 +242,7 @@ const resetDictDataQuery = () => {
 // 打开新增字典页面
 const openAddDictType = () => {
 	state.editDictTypeTitle = '添加字典';
-	editDictTypeRef.value?.openDialog({ status: 1, orderNo: 100 });
+	editDictTypeRef.value?.openDialog({ sysFlag: 2, status: 1, orderNo: 100 });
 };
 
 // 打开新增字典值页面