Merge branch 'personnelPerformance' into dev

src/views/system/classificationAssess/index.vue

@@ -23,7 +23,7 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
-          v-hasPermi="['system:project:add']">新增</el-button>
+          v-hasPermi="['system:indicator:add']">新增</el-button>
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
@@ -31,15 +31,15 @@
       </el-col> -->
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['system:project:remove']">删除</el-button>
+          v-hasPermi="['system:indicator:remove']">删除</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="Download" @click="handleExport"
-          v-hasPermi="['system:project:export']">导出</el-button>
+          v-hasPermi="['system:indicator:export']">导出</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="info" plain icon="Upload" @click="handleImport"
-          v-hasPermi="['system:project:import']">导入</el-button>
+          v-hasPermi="['system:indicator:import']">导入</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -69,9 +69,9 @@
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:project:edit']">修改</el-button>
+            v-hasPermi="['system:indicator:edit']">修改</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['system:project:remove']">删除</el-button>
+            v-hasPermi="['system:indicator:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -259,11 +259,13 @@ function reset() {
     id: null,
     name: null,
     categoryCode: null,
+    categoryCodeOne: null,
     checkStandard: null,
     checkMethod: null,
     importance: null,
     status: null,
     categoryName: null,
+    categoryNameOne: null,
     remark: null,
     code: null,
     importanceDesc: null
@@ -315,9 +317,12 @@ function handleUpdate(row) {
 function submitForm() {
   proxy.$refs["projectRef"].validate(valid => {
     if (valid) {
-      // 根据categoryCode获取categoryName
+      // 根据categoryCode获取categoryName和一级分类信息
       if (form.value.categoryCode) {
-        form.value.categoryName = getCategoryNameByCode(form.value.categoryCode)
+        const categoryInfo = getCategoryInfoByCode(form.value.categoryCode)
+        form.value.categoryName = categoryInfo.categoryName
+        form.value.categoryCodeOne = categoryInfo.categoryCodeOne
+        form.value.categoryNameOne = categoryInfo.categoryNameOne
       }
       
       // 名称转换
@@ -380,23 +385,31 @@ function getCategoryTree() {
 
 function handleNodeClick(data) {
   form.value.categoryName = data.name;
+  // 根据选中的二级分类获取一级分类信息
+  const categoryInfo = getCategoryInfoByCode(data.code)
+  form.value.categoryCodeOne = categoryInfo.categoryCodeOne
+  form.value.categoryNameOne = categoryInfo.categoryNameOne
 }
 
-/** 根据categoryCode获取categoryName */
-function getCategoryNameByCode(categoryCode) {
-  if (!categoryCode || !enableCategoryOptions.value) return ''
+/** 根据categoryCode获取categoryName和categoryCodeOne, categoryNameOne */
+function getCategoryInfoByCode(categoryCode) {
+  if (!categoryCode || !enableCategoryOptions.value) return { categoryName: '', categoryCodeOne: '', categoryNameOne: '' }
   
-  const findCategory = (categories) => {
+  const findCategory = (categories, parent = null) => {
     for (const category of categories) {
       if (category.code === categoryCode) {
-        return category.name
+        return {
+          categoryName: category.name,
+          categoryCodeOne: parent ? parent.code : '',
+          categoryNameOne: parent ? parent.name : ''
+        }
       }
       if (category.children && category.children.length > 0) {
-        const result = findCategory(category.children)
+        const result = findCategory(category.children, category)
         if (result) return result
       }
     }
-    return ''
+    return { categoryName: '', categoryCodeOne: '', categoryNameOne: '' }
   }
   
   return findCategory(enableCategoryOptions.value)

src/views/system/classificationAssessIndicator/index.vue

@@ -23,7 +23,7 @@
           plain
           icon="Plus"
           @click="handleAdd"
-          v-hasPermi="['system:checkCategory:add']"
+          v-hasPermi="['system:performanceIndicatorCategory:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -52,9 +52,9 @@
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:checkCategory:edit']">修改</el-button>
-          <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:checkCategory:add']">新增</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:checkCategory:remove']">删除</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:performanceIndicatorCategory:edit']">修改</el-button>
+          <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:performanceIndicatorCategory:add']">新增</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:performanceIndicatorCategory:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>