From 650a84730f4418ebbcdc58bbadd4d56f5dd3c8fd Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 07 八月 2025 14:01:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin
---
src/views/DictionaryManage/components/AddOrEditDictionaryDialog.vue | 31 +++++++++++--------------------
1 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/src/views/DictionaryManage/components/AddOrEditDictionaryDialog.vue b/src/views/DictionaryManage/components/AddOrEditDictionaryDialog.vue
index 69b365d..0004505 100644
--- a/src/views/DictionaryManage/components/AddOrEditDictionaryDialog.vue
+++ b/src/views/DictionaryManage/components/AddOrEditDictionaryDialog.vue
@@ -1,6 +1,6 @@
<template>
<ProDialog
- :title="`${title}绫诲埆`"
+ :title="form.title"
v-model="visible"
@close="onDialogClose"
destroy-on-close
@@ -35,13 +35,17 @@
:max="999999"
></ProFormInputNumber>
</ProFormItemV2>
- <ProFormItemV2 label="缂栧彿:" prop="code">
- <ProFormText v-model.trim="form.code"></ProFormText>
+ <ProFormItemV2 label="缂栧彿:" prop="code" :check-rules="[{ message: '璇疯緭鍏ョ紪鍙�' }]">
+ <ProFormText v-model.trim="form.code" :disabled="!!form.id"></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="[
@@ -81,6 +85,7 @@
});
type Form = {
+ title?: string;
id?: string;
categoryId: string;
content: string;
@@ -94,29 +99,15 @@
const form = defineModel<Form>('form');
const visible = defineModel<boolean>('modelValue');
-const title = computed(() => (form.value.id ? '缂栬緫' : '鏂板'));
-
const { getDictionaryCategoryById } = useGetDictionaryCategorySelect();
-const { dictionaryDataList, refetch, getDictionaryDataNameById } = useDictionaryDataSelect({
+const { dictionaryDataList } = useDictionaryDataSelect({
categoryCode: computed(() => CategoryCode.IndustryCategory),
});
const category = computed(() => {
return getDictionaryCategoryById(form.value.categoryId);
});
-
-watch(
- () => visible.value,
- (value) => {
- if (value) {
- refetch();
- }
- },
- {
- immediate: true,
- }
-);
const emit = defineEmits<{
(e: 'onConfirm'): void;
--
Gitblit v1.9.1