diff --git a/src/components/Form/src/jeecg/components/JCheckbox.vue b/src/components/Form/src/jeecg/components/JCheckbox.vue
index 299090f..6aef033 100644
--- a/src/components/Form/src/jeecg/components/JCheckbox.vue
+++ b/src/components/Form/src/jeecg/components/JCheckbox.vue
@@ -1,128 +1,130 @@
-
- {{ label }}
+
+ {{ label }}
+// update-begin--author:liaozhiyang---date:20230110---for:【QQYUN-7799】字典组件(原生组件除外)加上颜色配置
+.colorText {
+ display: inline-block;
+ height: 20px;
+ line-height: 20px;
+ padding: 0 6px;
+ border-radius: 8px;
+ background-color: red;
+ color: #fff;
+ font-size: 12px;
+}
+
+// update-begin--author:liaozhiyang---date:20230110---for:【QQYUN-7799】字典组件(原生组件除外)加上颜色配置
diff --git a/src/components/Form/src/jeecg/components/JDictSelectTag.vue b/src/components/Form/src/jeecg/components/JDictSelectTag.vue
index ffbb017..478413e 100644
--- a/src/components/Form/src/jeecg/components/JDictSelectTag.vue
+++ b/src/components/Form/src/jeecg/components/JDictSelectTag.vue
@@ -2,7 +2,7 @@
-
+
{{ item.label }}
@@ -14,7 +14,7 @@
-
+
{{ item.label }}
@@ -31,10 +31,10 @@
:getPopupContainer="getPopupContainer" :style="style" @change="handleChange">
请选择…
-
+
- {{ item.label }}
+ {{ item.label }}{{ ignoreDisabled && item.disabled ? '(已停用)' : '' }}
@@ -75,6 +75,7 @@ export default defineComponent({
required: false,
},
style: propTypes.any,
+ ignoreDisabled: propTypes.bool.def(false),
},
emits: ['options-change', 'change', 'update:value'],
setup(props, { emit, refs }) {
@@ -133,7 +134,7 @@ export default defineComponent({
prev.push({
label: next['text'] || next['label'],
value: stringToNumber ? +value : value,
- disabled:next['status'] != 0,
+ disabled: next['status'] != 0,
color: next['color'],
...omit(next, ['text', 'value', 'color']),
});
diff --git a/src/views/config/directiveTag/DirectiveTagList.vue b/src/views/config/directiveTag/DirectiveTagList.vue
index 839c86a..c5ce308 100644
--- a/src/views/config/directiveTag/DirectiveTagList.vue
+++ b/src/views/config/directiveTag/DirectiveTagList.vue
@@ -15,7 +15,7 @@
是否启用
+ :ignoreDisabled="true" placeholder="请选择是否启用" allowClear />
diff --git a/src/views/config/serviceCategory/ConfigServiceCategoryList.vue b/src/views/config/serviceCategory/ConfigServiceCategoryList.vue
index 8028233..5478a29 100644
--- a/src/views/config/serviceCategory/ConfigServiceCategoryList.vue
+++ b/src/views/config/serviceCategory/ConfigServiceCategoryList.vue
@@ -15,7 +15,7 @@
是否启用
+ :ignoreDisabled="true" placeholder="请选择是否启用" allowClear />
diff --git a/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue b/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue
index b2ee88e..fc931d2 100644
--- a/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue
+++ b/src/views/config/serviceDirective/ConfigServiceDirectiveList.vue
@@ -10,7 +10,7 @@
服务类别
+ :ignoreDisabled="true" placeholder="请选择服务类别" allow-clear />
@@ -18,7 +18,7 @@
服务类型
+ :ignoreDisabled="true" allowClear />
@@ -26,7 +26,7 @@
指令标签
+ :ignoreDisabled="true" placeholder="请选择指令标签" allowClear />
@@ -51,34 +51,34 @@
医保报销
+ :ignoreDisabled="true" placeholder="请选择医保报销" allowClear />
机构优惠
+ dictCode="institutional_discount" :ignoreDisabled="true" placeholder="请选择机构优惠" allowClear />
收费频次
-
周期类型
-
是否启用
-
diff --git a/src/views/config/serviceType/ConfigServiceTypeList.vue b/src/views/config/serviceType/ConfigServiceTypeList.vue
index 04071fc..b1be729 100644
--- a/src/views/config/serviceType/ConfigServiceTypeList.vue
+++ b/src/views/config/serviceType/ConfigServiceTypeList.vue
@@ -10,7 +10,7 @@
服务类别
+ :ignoreDisabled="true" placeholder="请选择服务类别" allowClear />
@@ -24,7 +24,7 @@
是否启用
+ :ignoreDisabled="true" placeholder="请选择是否启用" allowClear />
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 5695c45..9e8c784 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -18,8 +18,7 @@
- 批量操作
+ 批量操作
@@ -38,160 +37,160 @@