diff --git a/src/views/system/Dictionary/components/Right/Save/index.vue b/src/views/system/Dictionary/components/Right/Save/index.vue
index 6053c118..a435c258 100644
--- a/src/views/system/Dictionary/components/Right/Save/index.vue
+++ b/src/views/system/Dictionary/components/Right/Save/index.vue
@@ -47,7 +47,7 @@ const form: any = ref({
text: '',
ordinal: 0
})
-
+const lastValue = ref()
const loading = ref(false)
const formRef = ref()
/*
@@ -66,7 +66,7 @@ const validateInput = async (_rule: Rule, value: string) => {
* 校验value唯一
*/
const validateValue = async (_rule: Rule, value: string) => {
- if (value && props.type === 'add') {
+ if (value && lastValue.value !== value) {
const res:any = await verifyValue({
terms: [
{
@@ -133,6 +133,7 @@ onMounted(() => {
form.value.ordinal = props.sort
} else {
form.value = props.data
+ lastValue.value = props.data.value
}
})
diff --git a/src/views/system/Relationship/components/EditDialog.vue b/src/views/system/Relationship/components/EditDialog.vue
index 7ad2232f..67004110 100644
--- a/src/views/system/Relationship/components/EditDialog.vue
+++ b/src/views/system/Relationship/components/EditDialog.vue
@@ -76,25 +76,30 @@
:rules="[
{ required: true, message: '请输入名称' },
{ max: 64, message: '最多可输入64个字符' },
+ { required: true , validator:validateName, trigger: 'blur',}
]"
>
+ 正向关系示例:用户张三是001号视频设备的管理员
+
+ 反向关系示例:001号视频设备是用户张三的管辖设备
{
+ if(!value){
+ return Promise.resolve()
+ }
+ return form.data.reverseName === form.data.name ? Promise.reject('不能使用相同的关系名称') : Promise.resolve()
+}
const targetList = computed(() =>
form.data.objectType === 'device' ? [{ id: 'user', name: '用户' }] : [],
);
@@ -224,3 +235,9 @@ type formType = {
id?: string;
};
+
diff --git a/src/views/system/Relationship/index.vue b/src/views/system/Relationship/index.vue
index 480535dd..99b7fbce 100644
--- a/src/views/system/Relationship/index.vue
+++ b/src/views/system/Relationship/index.vue
@@ -90,7 +90,7 @@ const columns = [
},
},
{
- title: '正向关系名称',
+ title: '反向关系名称',
dataIndex: 'reverseName',
key: 'reverseName',
ellipsis: true,