feat(考核指标): 新增考核指标分类和指标管理功能

添加考核指标分类和指标管理的API接口及前端页面
实现分类和指标的增删改查、导入导出功能
优化前端页面展示和交互逻辑

src/api/system/classificationAssess.js

@@ -0,0 +1,88 @@
+import request from '@/utils/request'
+
+// 查询考核指标列表
+// @param query 查询参数
+// @returns {*}
+export function listIndicator(query) {
+  return request({
+    url: '/system/indicator/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 导出考核指标列表
+// @param query 查询参数
+// @returns {*}
+export function exportIndicator(query) {
+  return request({
+    url: '/system/indicator/export',
+    method: 'post',
+    // data: query,
+    responseType: 'blob'
+  })
+}
+
+// 获取考核指标详细信息
+// @param id 考核指标ID
+// @returns {*}
+export function getIndicator(id) {
+  return request({
+    url: `/system/indicator/${id}`,
+    method: 'get'
+  })
+}
+
+// 新增考核指标
+// @param data 考核指标数据
+// @returns {*}
+export function addIndicator(data) {
+  return request({
+    url: '/system/indicator',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改考核指标
+// @param data 考核指标数据
+// @returns {*}
+export function updateIndicator(data) {
+  return request({
+    url: '/system/indicator',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除考核指标
+// @param ids 考核指标ID，多个用逗号分隔
+// @returns {*}
+export function delIndicator(ids) {
+  return request({
+    url: `/system/indicator/${ids}`,
+    method: 'delete'
+  })
+}
+
+// 导入考核指标数据
+// @param data 导入数据
+// @returns {*}
+export function importIndicator(data) {
+  return request({
+    url: '/system/indicator/importData',
+    method: 'post',
+    data: data,
+    
+  })
+}
+
+// 获取导入模板
+// @returns {*}
+export function getImportTemplate() {
+  return request({
+    url: '/system/indicator/importTemplate',
+    method: 'get',
+    responseType: 'blob'
+  })
+}

src/api/system/classificationAssessIndicator.js

@@ -0,0 +1,48 @@
+import request from '@/utils/request'
+//查询考核指标分类列表
+export function queryAssessCategoryList(query) {
+    return request({
+        url: '/system/performanceIndicatorCategory/list',
+        method: 'get',
+        params: query
+    })
+}
+//获取考核指标分类详细信息
+export function queryAssessCategoryDetail(categoryId) {
+    return request({
+        url: `/system/performanceIndicatorCategory/${categoryId}`,
+        method: 'get',
+
+    })
+}
+//新增考核指标分类
+export function addAssessCategory(data) {
+    return request({
+        url: '/system/performanceIndicatorCategory',
+        method: 'post',
+        data
+    })
+}
+//修改考核指标分类
+export function updateAssessCategory(data) {
+    return request({
+        url: '/system/performanceIndicatorCategory',
+        method: 'put',
+        data
+    })
+}
+//删除考核指标分类
+export function deleteAssessCategory(ids) {
+    return request({
+        url: `/system/performanceIndicatorCategory/${ids}`,
+        method: 'delete',
+    })
+}
+//查询考核指标分类列表树形结构
+export function queryAssessCategoryTree(query) {
+    return request({
+        url: '/system/performanceIndicatorCategory/listTree',
+        method: 'get',
+        params: query
+    })
+}

src/views/system/classificationAssess/index.vue

@@ -25,10 +25,10 @@
         <el-button type="primary" plain icon="Plus" @click="handleAdd"
           v-hasPermi="['system:project:add']">新增</el-button>
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
           v-hasPermi="['system:project:edit']">修改</el-button>
-      </el-col>
+      </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>
@@ -37,10 +37,14 @@
         <el-button type="warning" plain icon="Download" @click="handleExport"
           v-hasPermi="['system:project: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>
+      </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading" :data="indicatorList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="编码" align="center" prop="code" />
       <el-table-column label="考核指标名称" align="center" prop="name" />
@@ -77,15 +81,15 @@
     <!-- 添加或修改考核指标对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="projectRef" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="编码" prop="code" v-if="form.id">
-          <el-input v-model="form.code" placeholder="请输入编码" disabled />
-        </el-form-item>
+        <!-- <el-form-item label="编码" prop="code">
+          <el-input v-model="form.code" placeholder="请输入编码"  />
+        </el-form-item> -->
         <el-form-item label="考核指标名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入考核指标名称" />
         </el-form-item>
         <el-form-item label="所属分类" prop="categoryCode">
           <el-tree-select v-model="form.categoryCode" :data="enableCategoryOptions"
-            :props="{ value: 'code', label: 'label', children: 'children' }" value-key="id" placeholder="请选择所属分类"
+            :props="{ value: 'code', label: 'name', children: 'children' }" value-key="id" placeholder="请选择所属分类"
             @node-click="handleNodeClick" />
         </el-form-item>
         <el-form-item label="分值" prop="score">
@@ -101,8 +105,9 @@
 
         <el-form-item label="事病假" prop="leaveType">
           <el-select v-model="form.leaveType" placeholder="请选择事病假" style="width: 100%">
-            <el-option label="是" value="1" />
-            <el-option label="否" value="0" />
+            <el-option label="事假" value="事假" />
+            <el-option label="病假" value="病假" />
+            <el-option label="无" value="无" />
           </el-select>
         </el-form-item>
         <!-- <el-form-item label="重要程度" prop="importance">
@@ -123,17 +128,44 @@
         </div>
       </template>
     </el-dialog>
+
+    <!-- 导入对话框 -->
+    <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+      <el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
+        :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+        <div class="el-upload__text">
+          将文件拖到此处，或<em>点击上传</em>
+        </div>
+        <template #tip>
+          <div class="el-upload__tip">
+            <!-- <el-checkbox v-model="upload.updateSupport" /> -->
+            <!-- 是否更新已经存在的考核指标数据 -->
+             <span>仅允许导入xls、xlsx格式文件。</span>
+            <el-link type="primary" :underline="false" style="font-size:12px;vertical-align: baseline;"
+              @click="importTemplate">下载模板</el-link>
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="Project">
-import { listProject, getProject, delProject, addProject, updateProject } from "@/api/system/project"
-import { treeSelectByType } from "@/api/system/common"
-
+import { listIndicator, getIndicator, delIndicator, addIndicator, updateIndicator, exportIndicator, importIndicator, getImportTemplate } from "@/api/system/classificationAssess"
+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 projectList = ref([])
+const indicatorList = ref([])
 const open = ref(false)
 const loading = ref(true)
 const showSearch = ref(true)
@@ -145,20 +177,31 @@ const title = ref("")
 const base_check_status = ref([{ "value": "0", "label": "启用" }, { "value": "1", "label": "停用" }])
 const enableCategoryOptions = ref(undefined)
 
+// 导入参数
+const upload = reactive({
+  // 是否显示弹出层
+  open: false,
+  // 弹出层标题
+  title: "",
+  // 是否禁用上传
+  isUploading: false,
+  // 是否更新已经存在的考核指标数据
+  updateSupport: 0,
+  // 设置上传的请求头部
+  headers: { Authorization: "Bearer " + getToken() },
+  // 上传的地址
+  url: import.meta.env.VITE_APP_BASE_API + "/system/indicator/importData"
+})
+
+const uploadRef = ref()
+
 const data = reactive({
   form: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
     name: null,
-    categoryCode: null,
-    checkStandard: null,
-    checkMethod: null,
-    importance: null,
-    status: null,
-    categoryName: null,
     code: null,
-    importanceDesc: null
   },
   rules: {
     name: [
@@ -190,8 +233,8 @@ const { queryParams, form, rules } = toRefs(data)
 /** 查询考核指标列表 */
 function getList() {
   loading.value = true
-  listProject(queryParams.value).then(response => {
-    projectList.value = response.rows
+  listIndicator(queryParams.value).then(response => {
+    indicatorList.value = response.rows
     total.value = response.total
     loading.value = false
   })
@@ -257,7 +300,7 @@ function handleAdd() {
 function handleUpdate(row) {
   reset()
   const _id = row.id || ids.value
-  getProject(_id).then(response => {
+  getIndicator(_id).then(response => {
     form.value = {
       ...response.data,
       checkLevel: response.data?.checkLevel?.split(","),
@@ -271,6 +314,11 @@ function handleUpdate(row) {
 function submitForm() {
   proxy.$refs["projectRef"].validate(valid => {
     if (valid) {
+      // 根据categoryCode获取categoryName
+      if (form.value.categoryCode) {
+        form.value.categoryName = getCategoryNameByCode(form.value.categoryCode)
+      }
+      
       // 名称转换
       if (form.value.importance) {
         form.value.importanceDesc = base_check_importance.value.find(item => item.value === form.value.importance).label;
@@ -281,13 +329,13 @@ function submitForm() {
         checkLevel: form.value.checkLevel && form.value.checkLevel.join(","),
       }
       if (form.value.id != null) {
-        updateProject(res).then(response => {
+        updateIndicator(res).then(response => {
           proxy.$modal.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        addProject(res).then(response => {
+        addIndicator(res).then(response => {
           proxy.$modal.msgSuccess("新增成功")
           open.value = false
           getList()
@@ -301,7 +349,7 @@ function submitForm() {
 function handleDelete(row) {
   const _ids = row.id || ids.value
   proxy.$modal.confirm('是否确认删除数据项？').then(function () {
-    return delProject(_ids)
+    return delIndicator(_ids)
   }).then(() => {
     getList()
     proxy.$modal.msgSuccess("删除成功")
@@ -310,19 +358,78 @@ function handleDelete(row) {
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download('system/project/export', {
-    ...queryParams.value
-  }, `project_${new Date().getTime()}.xlsx`)
+  // 过滤掉值为null的参数，但保留分页参数
+  const filteredParams = Object.fromEntries(
+    Object.entries(queryParams.value).filter(([key, value]) => {
+      // 保留分页参数
+      if (key === 'pageNum' || key === 'pageSize') return true
+      // 过滤掉其他为null的参数
+      return value !== null
+    })
+  )
+ 
+  proxy.download('/system/indicator/export', filteredParams, `indicator_${new Date().getTime()}.xlsx`)
 }
 /** 查询分类下拉树结构 */
 function getCategoryTree() {
-  treeSelectByType("CHECK_CATEGORY", 2).then(response => {
+  queryAssessCategoryTree().then(response => {
     enableCategoryOptions.value = response.data
   })
 }
 
 function handleNodeClick(data) {
-  form.value.categoryName = data.label;
+  form.value.categoryName = data.name;
+}
+
+/** 根据categoryCode获取categoryName */
+function getCategoryNameByCode(categoryCode) {
+  if (!categoryCode || !enableCategoryOptions.value) return ''
+  
+  const findCategory = (categories) => {
+    for (const category of categories) {
+      if (category.code === categoryCode) {
+        return category.name
+      }
+      if (category.children && category.children.length > 0) {
+        const result = findCategory(category.children)
+        if (result) return result
+      }
+    }
+    return ''
+  }
+  
+  return findCategory(enableCategoryOptions.value)
+}
+
+/** 导入按钮操作 */
+function handleImport() {
+  upload.title = "考核指标导入"
+  upload.open = true
+}
+
+/** 下载模板操作 */
+function importTemplate() {
+  proxy.download('/system/indicator/importTemplate', {
+  }, `考核指标导入模板_${new Date().getTime()}.xlsx`)
+}
+
+/** 文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true
+}
+
+/** 文件上传成功处理 */
+const handleFileSuccess = (response, file, fileList) => {
+  upload.open = false
+  upload.isUploading = false
+  uploadRef.value.handleRemove(file)
+  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
+  getList()
+}
+
+/** 提交上传文件 */
+function submitFileForm() {
+  uploadRef.value.submit()
 }
 
 getCategoryTree()

src/views/system/classificationAssessIndicator/index.vue

@@ -40,15 +40,15 @@
     <el-table
       v-if="refreshTable"
       v-loading="loading"
-      :data="checkCategoryList"
+      :data="assessCategoryList"
       row-key="id"
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
-      <el-table-column label="编码" align="center" prop="code" />
+      <el-table-column label="序号" align="center" prop="code" />
       <el-table-column label="指标名称" align="center" prop="name" />
       <el-table-column label="显示顺序" align="center" prop="orderNum" />
-      <el-table-column label="分值" align="center" prop="score" />
+      <!-- <el-table-column label="分值" align="center" prop="score" /> -->
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
@@ -62,10 +62,10 @@
     <!-- 添加或修改指标对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="checkCategoryRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="序号" prop="orderNum">
+        <!-- <el-form-item label="序号" prop="code">
       
-          <el-input v-model="form.orderNum" placeholder="请输入序号" />
-        </el-form-item>
+          <el-input v-model="form.code" placeholder="请输入序号" />
+        </el-form-item> -->
         <el-form-item label="指标名称" prop="name">
          
           <el-input v-model="form.name" placeholder="请输入指标名称" />
@@ -74,24 +74,20 @@
         
           <el-tree-select
             v-model="form.parentId"
-            :data="checkCategoryOptions"
+            :data="assessCategoryOptions"
             :props="{ value: 'id', label: 'name', children: 'children' }"
             value-key="id"
             placeholder="顶级节点"
             check-strictly
           />
         </el-form-item>
-        <el-form-item label="分值/单位" prop="scoreUnit">
+        <!-- <el-form-item label="分值/单位" prop="scoreUnit">
           <div style="display: flex; align-items: center; gap: 8px; width: 100%;">
             <el-input v-model="form.score" placeholder="" style="flex: 1;" />
             <span>/</span>
-            <el-select v-model="form.unit" placeholder="下拉菜单" style="flex: 1;">
-              <el-option label="分" value="分" />
-              <el-option label="次" value="次" />
-              <el-option label="项" value="项" />
-            </el-select>
+            <el-input v-model="form.unit" placeholder="请输入单位" style="flex: 1;" />
           </div>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -107,12 +103,12 @@
 </template>
 
 <script setup name="CheckCategory">
-import { listCheckCategory, getCheckCategory, delCheckCategory, addCheckCategory, updateCheckCategory } from "@/api/system/checkCategory"
+import { queryAssessCategoryList, queryAssessCategoryDetail, addAssessCategory, updateAssessCategory, deleteAssessCategory } from "@/api/system/classificationAssessIndicator"
 
 const { proxy } = getCurrentInstance()
 
-const checkCategoryList = ref([])
-const checkCategoryOptions = ref([])
+const assessCategoryList = ref([])
+const assessCategoryOptions = ref([])
 const open = ref(false)
 const loading = ref(true)
 const showSearch = ref(true)
@@ -125,7 +121,7 @@ const data = reactive({
   queryParams: {
     name: null,
     parentId: null,
-    orderNum: null,
+    code: null,
     code: null,
     score: null,
     unit: null,
@@ -137,7 +133,7 @@ const data = reactive({
     parentId: [
       { required: true, message: "上级位置不能为空", trigger: "blur" }
     ],
-    orderNum: [
+    code: [
       { required: true, message: "序号不能为空", trigger: "blur" }
     ],
   }
@@ -145,22 +141,22 @@ const data = reactive({
 
 const { queryParams, form, rules } = toRefs(data)
 
-/** 查询检查项分类列表 */
+/** 查询考核指标分类列表 */
 function getList() {
   loading.value = true
-  listCheckCategory(queryParams.value).then(response => {
-    checkCategoryList.value = proxy.handleTree(response.data, "id", "parentId")
+  queryAssessCategoryList(queryParams.value).then(response => {
+    assessCategoryList.value = proxy.handleTree(response.data, "id", "parentId")
     loading.value = false
   })
 }
 
-/** 查询检查项分类下拉树结构 */
+/** 查询考核指标分类下拉树结构 */
 function getTreeselect() {
-  listCheckCategory().then(response => {
-    checkCategoryOptions.value = []
+  queryAssessCategoryList().then(response => {
+    assessCategoryOptions.value = []
     const data = { id: 0, name: '顶级节点', children: [] }
     data.children = proxy.handleTree(response.data, "id", "parentId")
-    checkCategoryOptions.value.push(data)
+    assessCategoryOptions.value.push(data)
   })
 }
 	
@@ -184,7 +180,7 @@ function reset() {
     parentId: null,
     ancestors: null,
     level: null,
-    orderNum: null,
+    code: null,
     code: null,
     score: null,
     unit: null,
@@ -208,6 +204,7 @@ function resetQuery() {
 function handleAdd(row) {
   reset()
   getTreeselect()
+  
   if (row != null && row.id) {
     form.value.parentId = row.id
   } else {
@@ -233,7 +230,7 @@ async function handleUpdate(row) {
   if (row != null) {
     form.value.parentId = row.parentId
   }
-  getCheckCategory(row.id).then(response => {
+  queryAssessCategoryDetail(row.id).then(response => {
     form.value = response.data
     open.value = true
     title.value = "修改指标"
@@ -245,13 +242,13 @@ function submitForm() {
   proxy.$refs["checkCategoryRef"].validate(valid => {
     if (valid) {
       if (form.value.id != null) {
-        updateCheckCategory(form.value).then(response => {
+        updateAssessCategory(form.value).then(response => {
           proxy.$modal.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        addCheckCategory(form.value).then(response => {
+        addAssessCategory(form.value).then(response => {
           proxy.$modal.msgSuccess("新增成功")
           open.value = false
           getList()
@@ -264,7 +261,7 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   proxy.$modal.confirm('是否确认删除数据项？').then(function() {
-    return delCheckCategory(row.id)
+    return deleteAssessCategory(row.id)
   }).then(() => {
     getList()
     proxy.$modal.msgSuccess("删除成功")