Merge branch 'personnelPerformance' into dev

src/views/system/classificationAssess/index.vue

@@ -52,7 +52,11 @@
       <el-table-column label="二级分类" align="center" prop="categoryName" />
       <el-table-column label="分值" align="center" prop="score" />
       <el-table-column label="单位" align="center" prop="unit" />
-      <el-table-column label="事病假" align="center" prop="leaveType" />
+      <el-table-column label="事病假" align="center" prop="leaveType">
+        <template #default="scope">
+          <dict-tag :options="base_performance_indicator_leave_type" :value="scope.row.leaveType" />
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="检查标准" align="center" prop="checkStandard" />
       <el-table-column label="检查方法" align="center" prop="checkMethod" /> -->
       <!-- <el-table-column label="重要程度" align="center" prop="importance">
@@ -106,9 +110,7 @@
 
         <el-form-item label="事病假" prop="leaveType">
           <el-select v-model="form.leaveType" placeholder="请选择事病假" style="width: 100%">
-            <el-option label="事假" value="事假" />
-            <el-option label="病假" value="病假" />
-            <el-option label="无" value="无" />
+            <el-option v-for="dict in base_performance_indicator_leave_type" :key="dict.value" :label="dict.label" :value="dict.value" />
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="重要程度" prop="importance">
@@ -164,7 +166,7 @@ import { listIndicator, getIndicator, delIndicator, addIndicator, updateIndicato
 import { queryAssessCategoryTree } from "@/api/system/classificationAssessIndicator"
 import { getToken } from '@/utils/auth'
 const { proxy } = getCurrentInstance()
-const { base_check_importance, check_level, check_checked_level } = proxy.useDict('base_check_importance', 'check_level', 'check_checked_level')
+const { base_check_importance, check_level, check_checked_level, base_performance_indicator_leave_type } = proxy.useDict('base_check_importance', 'check_level', 'check_checked_level', 'base_performance_indicator_leave_type')
 
 const indicatorList = ref([])
 const open = ref(false)