From 519f3a8da042893d64d5faab697561b5a1c4d6db Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 07 八月 2025 13:36:37 +0800
Subject: [PATCH] fix: 修改字典
---
src/constants/dic.ts | 28 ++++++++++++++++++++++++++++
src/views/DictionaryManage/components/AddOrEditDictionaryCategory.vue | 2 +-
.eslintrc-auto-import.json | 2 ++
src/views/DictionaryManage/DataDictionary.vue | 3 ---
auto-imports.d.ts | 6 +++++-
src/views/DictionaryManage/components/AddOrEditDictionaryDialog.vue | 12 ++++++++----
6 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json
index 0660ad8..e64437a 100644
--- a/.eslintrc-auto-import.json
+++ b/.eslintrc-auto-import.json
@@ -14,6 +14,7 @@
"DirectiveBinding": true,
"EditorType": true,
"EditorTypeText": true,
+ "EducationCodeEnum": true,
"EffectScope": true,
"EmptyTextEditorItem": true,
"EnterpriseConfigureType": true,
@@ -55,6 +56,7 @@
"GlobalEvent": true,
"GlobalEventContext": true,
"GlobalEventListener": true,
+ "IdentityCodeEnum": true,
"InjectionKey": true,
"MaybeRef": true,
"MaybeRefOrGetter": true,
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 23868fa..472465b 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -19,6 +19,7 @@
const DataRangeEnumText: typeof import('./src/constants/enum')['DataRangeEnumText']
const EditorType: typeof import('./src/constants/editor')['EditorType']
const EditorTypeText: typeof import('./src/constants/editor')['EditorTypeText']
+ const EducationCodeEnum: typeof import('./src/constants/dic')['EducationCodeEnum']
const EffectScope: typeof import('vue')['EffectScope']
const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
const EmptyTextEditorItem: typeof import('./src/constants/editor')['EmptyTextEditorItem']
@@ -57,6 +58,7 @@
const FlexWorkerEleSignEnumText: typeof import('./src/constants/cPerson')['FlexWorkerEleSignEnumText']
const Gender: typeof import('./src/constants/enum')['Gender']
const GenderText: typeof import('./src/constants/enum')['GenderText']
+ const IdentityCodeEnum: typeof import('./src/constants/dic')['IdentityCodeEnum']
const MenuSvgIconMap: typeof import('./src/constants/menu')['MenuSvgIconMap']
const MessageChannelEnum: typeof import('./src/constants/enterprise')['MessageChannelEnum']
const MessageChannelEnumText: typeof import('./src/constants/enterprise')['MessageChannelEnumText']
@@ -198,7 +200,7 @@
export type { FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum, FlexWorkerEleSignEnum, FlexTaskWorkerHireEnum } from './src/constants/cPerson'
import('./src/constants/cPerson')
// @ts-ignore
- export type { CategoryCode, CategoryCode } from './src/constants/dic'
+ export type { CategoryCode, IdentityCodeEnum, EducationCodeEnum, CategoryCode, IdentityCodeEnum, EducationCodeEnum } from './src/constants/dic'
import('./src/constants/dic')
// @ts-ignore
export type { EditorType, EditorType } from './src/constants/editor'
@@ -241,6 +243,7 @@
readonly ChargeTypeEnumText: UnwrapRef<typeof import('./src/constants/enterprise')['ChargeTypeEnumText']>
readonly EditorType: UnwrapRef<typeof import('./src/constants/editor')['EditorType']>
readonly EditorTypeText: UnwrapRef<typeof import('./src/constants/editor')['EditorTypeText']>
+ readonly EducationCodeEnum: UnwrapRef<typeof import('./src/constants/dic')['EducationCodeEnum']>
readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
readonly EmptyTextEditorItem: UnwrapRef<typeof import('./src/constants/editor')['EmptyTextEditorItem']>
readonly EnterpriseConfigureType: UnwrapRef<typeof import('./src/constants/enterprise')['EnterpriseConfigureType']>
@@ -275,6 +278,7 @@
readonly FlexWorkerEleSignEnumText: UnwrapRef<typeof import('./src/constants/cPerson')['FlexWorkerEleSignEnumText']>
readonly Gender: UnwrapRef<typeof import('./src/constants/enum')['Gender']>
readonly GenderText: UnwrapRef<typeof import('./src/constants/enum')['GenderText']>
+ readonly IdentityCodeEnum: UnwrapRef<typeof import('./src/constants/dic')['IdentityCodeEnum']>
readonly MenuSvgIconMap: UnwrapRef<typeof import('./src/constants/menu')['MenuSvgIconMap']>
readonly MessageChannelEnum: UnwrapRef<typeof import('./src/constants/enterprise')['MessageChannelEnum']>
readonly MessageChannelEnumText: UnwrapRef<typeof import('./src/constants/enterprise')['MessageChannelEnumText']>
diff --git a/src/constants/dic.ts b/src/constants/dic.ts
index 534792d..d3a9a27 100644
--- a/src/constants/dic.ts
+++ b/src/constants/dic.ts
@@ -12,3 +12,31 @@
/**琛屼笟绫诲瀷 */
IndustryCategory = '60',
}
+
+export enum IdentityCodeEnum {
+ /**瀛︾敓 */
+ Student = '10-10',
+ /**闈炲鐢� */
+ NotStudent = '10-20',
+}
+
+export enum EducationCodeEnum {
+ /**鍒濅腑浠ヤ笅 */
+ UnderPrimarySchool = '20-10',
+ /**鍒濅腑 */
+ PrimarySchool = '20-20',
+ /**楂樹腑 */
+ HighSchool = '20-30',
+ /**涓笓 */
+ JuniorCollege = '20-40',
+ /**鎶�鏍� */
+ TechnicalSchool = '20-50',
+ /**涓亴 */
+ JuniorHighSchool = '20-60',
+ /**楂樿亴 */
+ SeniorHighSchool = '20-70',
+ /**鏈 */
+ Undergraduate = '20-80',
+ /**鏈浠ヤ笂 */
+ UndergraduateAndAbove = '20-90',
+}
diff --git a/src/views/DictionaryManage/DataDictionary.vue b/src/views/DictionaryManage/DataDictionary.vue
index febbb11..b1ce7ff 100644
--- a/src/views/DictionaryManage/DataDictionary.vue
+++ b/src/views/DictionaryManage/DataDictionary.vue
@@ -43,9 +43,6 @@
:before-change="() => setCategoryVis(row)"
/>
</template>
- <template #category="{ row }">
- {{ row.category?.name }}
- </template>
</ProTableV2>
</AppContainer>
<AddOrEditDictionaryDialog v-bind="dialogProps" />
diff --git a/src/views/DictionaryManage/components/AddOrEditDictionaryCategory.vue b/src/views/DictionaryManage/components/AddOrEditDictionaryCategory.vue
index 021d6e4..80d7afb 100644
--- a/src/views/DictionaryManage/components/AddOrEditDictionaryCategory.vue
+++ b/src/views/DictionaryManage/components/AddOrEditDictionaryCategory.vue
@@ -14,7 +14,7 @@
:maxlength="15"
></ProFormText>
</ProFormItemV2>
- <ProFormItemV2 label="缂栧彿:" prop="code">
+ <ProFormItemV2 label="缂栧彿:" prop="code" :check-rules="[{ message: '璇疯緭鍏ョ紪鍙�' }]">
<ProFormText placeholder="璇疯緭鍏ョ紪鍙�" v-model.trim="form.code"></ProFormText>
</ProFormItemV2>
<ProFormItemV2 label="瀛楁鍚�:" prop="fieldNames">
diff --git a/src/views/DictionaryManage/components/AddOrEditDictionaryDialog.vue b/src/views/DictionaryManage/components/AddOrEditDictionaryDialog.vue
index 69b365d..59d0336 100644
--- a/src/views/DictionaryManage/components/AddOrEditDictionaryDialog.vue
+++ b/src/views/DictionaryManage/components/AddOrEditDictionaryDialog.vue
@@ -1,6 +1,6 @@
<template>
<ProDialog
- :title="`${title}绫诲埆`"
+ :title="`${title}瀛楀吀`"
v-model="visible"
@close="onDialogClose"
destroy-on-close
@@ -35,13 +35,17 @@
:max="999999"
></ProFormInputNumber>
</ProFormItemV2>
- <ProFormItemV2 label="缂栧彿:" prop="code">
+ <ProFormItemV2 label="缂栧彿:" prop="code" :check-rules="[{ message: '璇疯緭鍏ョ紪鍙�' }]">
<ProFormText v-model.trim="form.code"></ProFormText>
</ProFormItemV2>
- <ProFormItemV2 label="鍥剧墖:" prop="src" v-if="category?.data?.code === CategoryCode.Welfare">
+ <ProFormItemV2
+ label="鍥剧墖:"
+ prop="field2"
+ v-if="category?.data?.code === CategoryCode.Welfare"
+ >
<ProFormImageUpload v-model:file-url="form.field2" :limitFileCount="1"></ProFormImageUpload>
</ProFormItemV2>
- <ProFormItemV2 label="鐘舵��:" prop="status">
+ <ProFormItemV2 label="鐘舵��:" prop="isDisabled" required>
<ProFormRadio
v-model="form.isDisabled"
:value-enum="[
--
Gitblit v1.9.1