Merge branch 'personnelPerformance'

# Conflicts:
#	src/api/system/user.js

src/api/examManage/monthlyAssessPerformance.js

@@ -0,0 +1,28 @@
+import request from '@/utils/request'
+
+// 查询月考成绩列表
+export function listMonthlyScore(query) {
+  return request({
+    url: '/exam/monthlyScore/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 下载导入模板
+export function downloadTemplate() {
+  return request({
+    url: '/exam/monthlyScore/importTemplate',
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+
+// 导入月考成绩数据
+export function importData(data) {
+  return request({
+    url: '/exam/monthlyScore/importData',
+    method: 'post',
+    data: data
+  })
+}

src/api/performance/monthlyAssess.js

@@ -0,0 +1,74 @@
+import request from '@/utils/request'
+
+// 查询干部月度考核列表
+export function listCadreAssessment(query) {
+  return request({
+    url: '/personnel/cadre-assessment/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 生成本月考核数据
+export function generateCadreAssessment(data) {
+  return request({
+    url: '/personnel/cadre-assessment/generate',
+    method: 'post',
+    data: data
+  })
+}
+
+//查询非干部月度考核列表
+export function listNonCadreAssessment(query) {
+  return request({
+    url: '/personnel/assessment/list',
+    method: 'get',
+    params: query
+  })
+}
+//新增非干部月度考核
+export function addNonCadreAssessment(data) {
+  return request({
+    url: '/personnel/assessment',
+    method: 'post',
+    data: data
+  })
+}
+//修改非干部月度考核
+export function updateNonCadreAssessment(data) {
+  return request({
+    url: '/personnel/assessment',
+    method: 'put',
+    data: data
+  })
+}
+//删除非干部月度考核
+export function deleteNonCadreAssessment(ids) {
+  return request({
+    url: `/personnel/assessment/${ids}`,
+    method: 'delete',
+  })
+}
+//导出非干部月度考核列表
+export function exportNonCadreAssessment(data) {
+  return request({
+    url: '/personnel/assessment/export',
+    method: 'post',
+    data: data
+  })
+}
+//获取非干部月度考核详细信息
+export function getNonCadreAssessment(id) {
+  return request({
+    url: `/personnel/assessment/${id}`,
+    method: 'get'
+  })
+}
+
+//自动生成指定月份非干部月度考核数据
+export function generateNonCadreAssessment(query) {
+  return request({
+    url: `/personnel/assessment/autoGenerate/${query.month}`,
+    method: 'get',
+  })
+}

src/api/performance/monthlyAssessSum.js

@@ -0,0 +1,113 @@
+import request from '@/utils/request'
+
+export function getScoreDistribution(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/score-distribution',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getDeptParticipation(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/dept-participation',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getDeptScoreDistribution(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/dept-score-distribution',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getAssessmentSummary(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/assessment-summary',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getActualImprovementDistribution(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/actual-improvement-distribution',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getActualIncompetentDistribution(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/actual-incompetent-distribution',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getAssessmentTeamImprovementDistribution(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/assessment-team-improvement-distribution',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getAssessmentTeamIncompetentDistribution(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/assessment-team-incompetent-distribution',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getDeptAssessmentTeamStatistics(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/dept-assessment-team-statistics',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getBrigadeImprovementDistribution(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/brigade-improvement-distribution',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getBrigadeIncompetentDistribution(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/brigade-incompetent-distribution',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getFunctionalDeptSummary(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/functional-dept-summary',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getFunctionalDeptPersonnelDistribution(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/functional-dept-personnel-distribution',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getFunctionalDeptDistributionPie(query) {
+  return request({
+    url: '/personnel/non-cadre-assessment/score-summary/functional-dept-distribution-pie',
+    method: 'get',
+    params: query
+  })
+}

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,56 @@
+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
+    })
+}
+//获取分类树及关联指标（支持模糊查询）
+export function queryAssessCategoryTreeAndIndicator(data) {
+    return request({
+        url: '/system/performanceIndicatorCategory/getCategoryTreeWithIndicatorList',
+        method: 'post',
+        data
+    })
+}

src/api/system/user.js

@@ -159,4 +159,13 @@ export function selectUserLeaderListByCondition(data) {
     method: 'post',
     data: data
   })
+}
+
+//查询人事绩效用户列表
+export function listUserPerformance(data) {
+  return request({
+    url: '/system/user/selectPersonnelUserList',
+    method: 'post',
+    data: data
+  })
 }

src/views/examManage/monthlyAssessPerformance/index.vue

@@ -0,0 +1,191 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item label="年月" prop="yearMonth">
+        <el-date-picker v-model="queryParams.yearMonth" type="month" placeholder="请选择年月" value-format="YYYY-MM" style="width: 200px" />
+      </el-form-item>
+      <el-form-item label="姓名" prop="studentName">
+        <el-input v-model="queryParams.studentName" placeholder="请输入姓名" clearable style="width: 200px" />
+      </el-form-item>
+      <el-form-item label="科队" prop="team">
+        <el-select v-model="queryParams.team" placeholder="请选择科队" clearable style="width: 200px">
+          <el-option v-for="dict in exam_team" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="岗位" prop="jobPosition">
+        <el-input v-model="queryParams.jobPosition" placeholder="请输入岗位" clearable style="width: 200px" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="Upload" @click="handleImport">导入</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="trainingPerformanceList" >
+      <el-table-column label="年月" align="center" prop="yearMonth" />
+      <el-table-column label="学生" align="center" prop="studentName" />
+      <el-table-column label="科队" align="center" prop="team">
+        <template #default="scope">
+          <dict-tag :options="exam_team" :value="scope.row.team" />
+        </template>
+      </el-table-column>
+      <el-table-column label="岗位" align="center" prop="jobPosition">
+       
+      </el-table-column>
+      <el-table-column label="综合成绩" align="center" prop="comprehensiveScore" />
+      <el-table-column label="综合用时" align="center" prop="comprehensiveTime" />
+      <el-table-column label="专项成绩" align="center" prop="specialScore" />
+      <el-table-column label="专项用时" align="center" prop="specialTime" />
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 导入对话框 -->
+    <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 text-center">
+              <span>仅允许导入xls、xlsx格式文件。</span>
+              <el-link type="primary" :underline="false" style="font-size:16px;vertical-align: baseline;" @click="handleDownloadTemplate">下载模板</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="TrainingPerformance">
+import { listMonthlyScore, downloadTemplate, importData } from "@/api/examManage/monthlyAssessPerformance"
+import request from '@/utils/request'
+import { getToken } from "@/utils/auth"
+import { addDateRange, parseTime } from "@/utils/ruoyi"
+import { UploadFilled } from '@element-plus/icons-vue'
+
+const { proxy } = getCurrentInstance()
+const { exam_team, post } = proxy.useDict('exam_team', 'post')
+
+const trainingPerformanceList = ref([])
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+const dateRange = ref([])
+
+// 导入参数
+const upload = reactive({
+  // 是否显示弹出层
+  open: false,
+  // 弹出层标题
+  title: "",
+  // 是否禁用上传
+  isUploading: false,
+  // 是否更新已经存在的用户数据
+  updateSupport: 0,
+  // 设置上传的请求头部
+  headers: { Authorization: "Bearer " + getToken() },
+  // 上传的地址
+  url: import.meta.env.VITE_APP_BASE_API + "/exam/monthlyScore/importData"
+})
+
+const data = reactive({
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    yearMonth: undefined,
+    studentName: undefined,
+    team: undefined,
+    position: undefined
+  }
+})
+
+const { queryParams } = toRefs(data)
+
+/** 查询月考成绩列表 */
+function getList() {
+  loading.value = true;
+  let params = {
+    ...queryParams.value,
+  }
+  listMonthlyScore(params).then(response => {
+    trainingPerformanceList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  dateRange.value = []
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+/** 多选框选中数据 */
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 导入按钮操作 */
+function handleImport() {
+  upload.title = "导入"
+  upload.open = true
+}
+
+/** 下载模板操作 */
+function handleDownloadTemplate() {
+  proxy.download("/exam/monthlyScore/importTemplate", {}, `monthly_score_template_${new Date().getTime()}.xlsx`, 'post')
+}
+
+/**文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true
+}
+
+/** 文件上传成功处理 */
+const handleFileSuccess = (response, file, fileList) => {
+  upload.open = false
+  upload.isUploading = false
+  proxy.$refs["uploadRef"].handleRemove(file)
+  if (response.code === 200) {
+    proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true })
+    getList()
+  } else {
+    proxy.$modal.msgError(response.msg)
+  }
+}
+
+/** 提交上传文件 */
+function submitFileForm() {
+  proxy.$refs["uploadRef"].submit()
+}
+
+getList()
+</script>

src/views/system/classificationAssess/index.vue

@@ -0,0 +1,453 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="编码" prop="code">
+        <el-input v-model="queryParams.code" placeholder="请输入编码" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+      <el-form-item label="考核指标名称" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入考核指标名称" clearable @keyup.enter="handleQuery" />
+      </el-form-item>
+
+      <!-- <el-form-item label="重要程度" prop="categoryName"> -->
+      <!-- <el-select v-model="queryParams.importance" placeholder="请选择重要程度" clearable style="width: 180px;">
+          <el-option v-for="dict in base_check_importance" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select> -->
+      <!-- <el-input v-model="queryParams.categoryName" placeholder="请输入所属分类名称" clearable @keyup.enter="handleQuery" />
+      </el-form-item> -->
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd"
+          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"
+          v-hasPermi="['system:project:edit']">修改</el-button>
+      </el-col> -->
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+          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:indicator:export']">导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="Upload" @click="handleImport"
+          v-hasPermi="['system:indicator:import']">导入</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <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" />
+      <el-table-column label="一级分类" align="center" prop="categoryNameOne" />
+      <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">
+        <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">
+        <template #default="scope">
+          <dict-tag :options="base_check_importance" :value="scope.row.importance" />
+        </template>
+</el-table-column> -->
+      <!-- <el-table-column label="状态" align="center" prop="status" >
+        <template #default="scope">
+          <dict-tag :options="base_check_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column> -->
+      <!-- <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:indicator:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['system:indicator:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
+
+    <!-- 添加或修改考核指标对话框 -->
+    <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">
+          <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: 'name', children: 'children' }" value-key="id" placeholder="请选择二级分类"
+            @node-click="handleNodeClick" />
+        </el-form-item>
+        <el-form-item label="分值" prop="score">
+          <el-input-number v-model="form.score"  :precision="2" placeholder="请输入分值" style="width: 100%" />
+        </el-form-item>
+
+
+
+
+        <el-form-item label="单位" prop="unit">
+          <el-input v-model="form.unit" placeholder="请输入单位" />
+        </el-form-item>
+
+        <el-form-item label="事病假" prop="leaveType">
+          <el-select v-model="form.leaveType" placeholder="请选择事病假" style="width: 100%">
+            <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">
+          <el-select v-model="form.importance" placeholder="请选择重要程度">
+            <el-option v-for="dict in base_check_importance" :key="dict.value" :label="dict.label"
+              :value="dict.value"></el-option>
+          </el-select>
+        </el-form-item> -->
+
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </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 { 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, 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)
+const loading = ref(true)
+const showSearch = ref(true)
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+const total = ref(0)
+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,
+    code: null,
+  },
+  rules: {
+    name: [
+      { required: true, message: "考核指标名称不能为空", trigger: "blur" }
+    ],
+    categoryCode: [
+      { required: true, message: "分类编码不能为空", trigger: "blur" }
+    ],
+    // importance: [
+    //   { required: true, message: "重要程度不能为空", trigger: "change" }
+    // ],
+    status: [
+      { required: true, message: "状态不能为空", trigger: "change" }
+    ],
+    categoryName: [
+      { required: true, message: "分类名称不能为空", trigger: "blur" }
+    ],
+    code: [
+      { required: true, message: "编码不能为空", trigger: "blur" }
+    ],
+    // importanceDesc: [
+    //   { required: true, message: "重要程度名称不能为空", trigger: "blur" }
+    // ]
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询考核指标列表 */
+function getList() {
+  loading.value = true
+  listIndicator(queryParams.value).then(response => {
+    indicatorList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    tenantId: null,
+    revision: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    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
+  }
+  proxy.resetForm("projectRef")
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = "添加考核指标"
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getIndicator(_id).then(response => {
+    form.value = {
+      ...response.data,
+      checkLevel: response.data?.checkLevel?.split(","),
+    }
+    open.value = true
+    title.value = "修改考核指标"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["projectRef"].validate(valid => {
+    if (valid) {
+      // 根据categoryCode获取categoryName和一级分类信息
+      if (form.value.categoryCode) {
+        const categoryInfo = getCategoryInfoByCode(form.value.categoryCode)
+        form.value.categoryName = categoryInfo.categoryName
+        form.value.categoryCodeOne = categoryInfo.categoryCodeOne
+        form.value.categoryNameOne = categoryInfo.categoryNameOne
+      }
+      
+      // 名称转换
+      if (form.value.importance) {
+        form.value.importanceDesc = base_check_importance.value.find(item => item.value === form.value.importance).label;
+      }
+      // form.value.checkLevelDesc = check_level.value.find(item => item.value === form.value.checkLevel).label;
+      let res = {
+        ...form.value,
+        checkLevel: form.value.checkLevel && form.value.checkLevel.join(","),
+      }
+      if (form.value.id != null) {
+        updateIndicator(res).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addIndicator(res).then(response => {
+          proxy.$modal.msgSuccess("新增成功")
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal.confirm('是否确认删除数据项？').then(function () {
+    return delIndicator(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => { })
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  // 过滤掉值为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() {
+  queryAssessCategoryTree().then(response => {
+    enableCategoryOptions.value = response.data
+  })
+}
+
+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和categoryCodeOne, categoryNameOne */
+function getCategoryInfoByCode(categoryCode) {
+  if (!categoryCode || !enableCategoryOptions.value) return { categoryName: '', categoryCodeOne: '', categoryNameOne: '' }
+  
+  const findCategory = (categories, parent = null) => {
+    for (const category of categories) {
+      if (category.code === categoryCode) {
+        return {
+          categoryName: category.name,
+          categoryCodeOne: parent ? parent.code : '',
+          categoryNameOne: parent ? parent.name : ''
+        }
+      }
+      if (category.children && category.children.length > 0) {
+        const result = findCategory(category.children, category)
+        if (result) return result
+      }
+    }
+    return { categoryName: '', categoryCodeOne: '', categoryNameOne: '' }
+  }
+  
+  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()
+getList()
+</script>

src/views/system/classificationAssessIndicator/index.vue

@@ -0,0 +1,272 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      
+      <el-form-item label="指标名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入指标名称"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['system:performanceIndicatorCategory:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="Sort"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :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="name" />
+      <el-table-column label="显示顺序" align="center" prop="orderNum" />
+      <!-- <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">
+          <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>
+
+    <!-- 添加或修改指标对话框 -->
+    <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="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="parentId">
+        
+          <el-tree-select
+            v-model="form.parentId"
+            :data="assessCategoryOptions"
+            :props="{ value: 'id', label: 'name', children: 'children' }"
+            value-key="id"
+            placeholder="顶级节点"
+            check-strictly
+          />
+        </el-form-item>
+        <!-- <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-input v-model="form.unit" placeholder="请输入单位" style="flex: 1;" />
+          </div>
+        </el-form-item> -->
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="CheckCategory">
+import { queryAssessCategoryList, queryAssessCategoryDetail, addAssessCategory, updateAssessCategory, deleteAssessCategory } from "@/api/system/classificationAssessIndicator"
+
+const { proxy } = getCurrentInstance()
+
+const assessCategoryList = ref([])
+const assessCategoryOptions = ref([])
+const open = ref(false)
+const loading = ref(true)
+const showSearch = ref(true)
+const title = ref("")
+const isExpandAll = ref(true)
+const refreshTable = ref(true)
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    name: null,
+    parentId: null,
+    code: null,
+    code: null,
+    score: null,
+    unit: null,
+  },
+  rules: {
+    name: [
+      { required: true, message: "指标名称不能为空", trigger: "blur" }
+    ],
+    parentId: [
+      { required: true, message: "上级位置不能为空", trigger: "blur" }
+    ],
+    code: [
+      { required: true, message: "序号不能为空", trigger: "blur" }
+    ],
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询考核指标分类列表 */
+function getList() {
+  loading.value = true
+  queryAssessCategoryList(queryParams.value).then(response => {
+    assessCategoryList.value = proxy.handleTree(response.data, "id", "parentId")
+    loading.value = false
+  })
+}
+
+/** 查询考核指标分类下拉树结构 */
+function getTreeselect() {
+  queryAssessCategoryList().then(response => {
+    assessCategoryOptions.value = []
+    const data = { id: 0, name: '顶级节点', children: [] }
+    data.children = proxy.handleTree(response.data, "id", "parentId")
+    assessCategoryOptions.value.push(data)
+  })
+}
+	
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    tenantId: null,
+    revision: null,
+    createBy: null,
+    createTime: null,
+    updateBy: null,
+    updateTime: null,
+    id: null,
+    name: null,
+    parentId: null,
+    ancestors: null,
+    level: null,
+    code: null,
+    code: null,
+    score: null,
+    unit: null,
+    remark: null
+  }
+  proxy.resetForm("checkCategoryRef")
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+/** 新增按钮操作 */
+function handleAdd(row) {
+  reset()
+  getTreeselect()
+  
+  if (row != null && row.id) {
+    form.value.parentId = row.id
+  } else {
+    form.value.parentId = 0
+  }
+  open.value = true
+  title.value = "添加指标"
+}
+
+/** 展开/折叠操作 */
+function toggleExpandAll() {
+  refreshTable.value = false
+  isExpandAll.value = !isExpandAll.value
+  nextTick(() => {
+    refreshTable.value = true
+  })
+}
+
+/** 修改按钮操作 */
+async function handleUpdate(row) {
+  reset()
+  await getTreeselect()
+  if (row != null) {
+    form.value.parentId = row.parentId
+  }
+  queryAssessCategoryDetail(row.id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改指标"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["checkCategoryRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateAssessCategory(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addAssessCategory(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功")
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  proxy.$modal.confirm('是否确认删除数据项？').then(function() {
+    return deleteAssessCategory(row.id)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+getList()
+</script>

src/views/system/dept/index.vue

@@ -137,6 +137,14 @@
                   </el-form-item>
                </el-col>
                <el-col :span="12">
+                  <el-form-item label="职能部门" prop="isFunctionalDept">
+                     <el-select v-model="form.isFunctionalDept" placeholder="请选择">
+                        <el-option :label="'是'" :value="'1'" />
+                        <el-option :label="'否'" :value="'0'" />
+                     </el-select>
+                  </el-form-item>
+               </el-col>
+               <el-col :span="12">
                   <el-form-item label="显示排序" prop="orderNum">
                      <el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
                   </el-form-item>