merge

src/components/common/treeCaseTable/dictLabel.vue

@@ -3,6 +3,7 @@
   <span v-if="editable">
     <el-select-v2
       v-model="dictValue"
+      :multiple="multiple"
       :options="dictOptions"
       size="small"
       collapseTags
@@ -23,6 +24,7 @@ interface Props {
   dictName?: any;
   options?: any;
   editable?: boolean;
+  multiple?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -30,6 +32,7 @@ const props = withDefaults(defineProps<Props>(), {
   dictName: '',
   options: () => [],
   editable: false,
+  multiple: false,
 });
 const emits = defineEmits(['update:modelValue', 'ok']);
 
@@ -45,6 +48,8 @@ onMounted(() => {
   }
   if (props.modelValue && typeof props.modelValue === 'string' && props.modelValue.includes(',')) {
     dictValue.value = props.modelValue.split(',');
+  } else if (props.multiple) {
+    dictValue.value = props.modelValue ? [String(props.modelValue)] : [];
   } else {
     dictValue.value = String(props.modelValue ?? '');
   }
@@ -98,6 +103,8 @@ watchEffect(() => {
   const val = props.modelValue;
   if (val && typeof val === 'string' && val.includes(',')) {
     dictValue.value = val.split(',');
+  } else if (props.multiple) {
+    dictValue.value = val ? [String(val)] : [];
   } else {
     dictValue.value = String(val ?? '');
   }

src/components/common/treeCaseTable/treeTable.vue

@@ -344,7 +344,7 @@
           :editMode="editMode"
           :icon="icon"
         >
-          <dictLabel v-model="row.discipline" dictName="DISCIPLINE_TYPE" />
+          {{ allDictData['DISCIPLINE_TYPE']?.O[row.discipline] || '--' }}
         </TreeEditItem>
       </template>
       <template #discipline-edit="{ row }">
@@ -414,7 +414,7 @@
           :editMode="editMode"
           :icon="icon"
         >
-          <dictLabel v-model="row.performanceType" dictName="PERFORMANCE_TYPE" />
+          {{ allDictData['PERFORMANCE_TYPE']?.O[row.performanceType] || '--' }}
         </TreeEditItem>
       </template>
       <template #performanceType-edit="{ row }">
@@ -428,7 +428,7 @@
           :editMode="editMode"
           :icon="icon"
         >
-          <dictLabel v-model="row.unit" dictName="PERFORMANCE_UNIT" />
+          {{ allDictData['PERFORMANCE_UNIT']?.O[row.unit] || '--' }}
         </TreeEditItem>
       </template>
       <template #unit-edit="{ row }">
@@ -475,7 +475,7 @@
           :editMode="editMode"
           :icon="icon"
         >
-          <dictLabel v-model="row.bCapacity" dictName="SIMULATION_CAPACITY" />
+          {{ allDictData['SIMULATION_CAPACITY']?.O[row.bCapacity] || '--' }}
         </TreeEditItem>
       </template>
       <template #bCapacity-edit="{ row }">
@@ -489,7 +489,7 @@
           :editMode="editMode"
           :icon="icon"
         >
-          <dictLabel v-model="row.department" dictName="DEPARTMENT_LIST" />
+          {{ allDictData['DEPARTMENT_LIST']?.O[row.department] || '--' }}
         </TreeEditItem>
       </template>
       <template #department-edit="{ row }">
@@ -503,7 +503,7 @@
           :editMode="editMode"
           :icon="icon"
         >
-          <dictLabel v-model="row.section" dictName="SECTION_LIST" />
+          {{ allDictData['SECTION_LIST']?.O[row.section] || '--' }}
         </TreeEditItem>
       </template>
       <template #section-edit="{ row }">
@@ -517,7 +517,7 @@
           :editMode="editMode"
           :icon="icon"
         >
-          <dictLabel v-model="row.group" dictName="GROUP_LIST" />
+          {{ allDictData['GROUP_LIST']?.O[row.group] || '--' }}
         </TreeEditItem>
       </template>
       <template #group-edit="{ row }">

src/views/competenceCenter/condition/components/taskPool.vue

@@ -106,6 +106,7 @@
         :loading="loading"
         :editMode="false"
         :showCheckBox="false"
+        :showExpandSelect="false"
         @settingConfirm="onListTableSettingConfirmFun"
         @filterReset="onListTableFilterResetFun"
         @filterConfirm="onListTableFilterConfirmFun"