From 7ed5f33e7bd9ca26fb41700e518234b973841921 Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: 星期三, 24 四月 2024 22:30:52 +0800
Subject: [PATCH] !107 add 新增岗位编码与部门编码 并将岗位放到部门下 * add 新增获取岗位选择框列表 * update 岗位查询树表和单表相互undefined * update 岗位查询增加单部门查询 * update 优化类别编码与后台一致性 * add 新增岗位部门树以及类别编码 * add 部门增加类别代码
---
src/components/DictTag/index.vue | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
index e5dd57d..ad326c2 100644
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -15,7 +15,15 @@
:key="item.value + ''"
:disable-transitions="true"
:index="index"
- :type="item.elTagType === 'primary' || item.elTagType === 'default' ? '' : item.elTagType"
+ :type="
+ item.elTagType === 'primary' ||
+ item.elTagType === 'success' ||
+ item.elTagType === 'info' ||
+ item.elTagType === 'warning' ||
+ item.elTagType === 'danger'
+ ? item.elTagType
+ : 'primary'
+ "
:class="item.elTagClass"
>
{{ item.label + ' ' }}
@@ -32,8 +40,8 @@
interface Props {
options: Array<DictDataOption>;
value: number | string | Array<number | string>;
- showValue: boolean;
- separator: string;
+ showValue?: boolean;
+ separator?: string;
}
const props = withDefaults(defineProps<Props>(), {
showValue: true,
@@ -48,12 +56,13 @@
const unmatch = computed(() => {
if (props.options?.length == 0 || props.value === '' || props.value === null || typeof props.value === 'undefined') return false;
// 浼犲叆鍊间负闈炴暟缁�
+ let unmatch = false; // 娣诲姞涓�涓爣蹇楁潵鍒ゆ柇鏄惁鏈夋湭鍖归厤椤�
values.value.forEach((item) => {
if (!props.options.some((v) => v.value === item)) {
- return true; // 濡傛灉鏈夋湭鍖归厤椤癸紝灏嗘爣蹇楄缃负true
+ unmatch = true; // 濡傛灉鏈夋湭鍖归厤椤癸紝灏嗘爣蹇楄缃负true
}
});
- return false; // 杩斿洖鏍囧織鐨勫��
+ return unmatch; // 杩斿洖鏍囧織鐨勫��
});
const unmatchArray = computed(() => {
--
Gitblit v1.9.3