Merge branch 'personnelPerformance' into dev

src/api/system/classificationAssessIndicator.js

@@ -46,3 +46,11 @@ export function queryAssessCategoryTree(query) {
         params: query
     })
 }
+//获取分类树及关联指标（支持模糊查询）
+export function queryAssessCategoryTreeAndIndicator(data) {
+    return request({
+        url: '/system/performanceIndicatorCategory/getCategoryTreeWithIndicatorList',
+        method: 'post',
+        data
+    })
+}

src/views/performanceManage/monthlyAssess/index.vue

@@ -47,7 +47,7 @@
     <div v-if="currentTab === 'non-cadre'">
       <el-table v-loading="loading" :data="nonCadreList" border fit highlight-current-row
         style="width: 100%; margin-top: 20px;">
-        <el-table-column label="大队" prop="brigade" align="center" min-width="100" />
+        <el-table-column label="大队" prop="brigadeName" align="center" min-width="100" />
         <el-table-column label="用工形式" prop="employmentType" align="center" min-width="100">
           <template #default="scope">
             <dict-tag :options="employment_type" :value="scope.row.employmentType" />
@@ -188,7 +188,7 @@
           <el-col :span="8">
             <el-form-item label="考核月份" prop="assessmentMonth" label-width="100px">
               <el-date-picker v-model="nonCadreForm.assessmentMonth" type="month" placeholder="请选择考核月份"
-                value-format="YYYY-MM" style="width: 100%" />
+                value-format="YYYY-MM" style="width: 100%" @change="handleAssessmentMonthChange" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -259,15 +259,14 @@
         </el-row>
 
         <!-- 考核指标区域 -->
-        <div class="section-title blue" style="cursor: pointer;" @click="addIndicator">考核指标</div>
+        <div class="section-title blue" style="cursor: pointer;" @click="addIndicator">考核指标+</div>
         <div class="indicators-box" v-if="nonCadreForm.indicatorGroups.length > 0">
           <div v-for="(group, groupIndex) in nonCadreForm.indicatorGroups" :key="groupIndex" class="indicator-group">
             <div class="indicator-group-title">{{ group.title }}</div>
             <div v-for="(item, itemIndex) in group.items" :key="itemIndex" class="indicator-item">
               <div class="indicator-name">{{ item.indicatorName }}</div>
-              <div class="indicator-value">{{ item.score }}/次</div>
+              <div class="indicator-value" v-if="item.categoryNameOne != '红线指标'">{{ item.score }}/次</div>
               <div class="indicator-count">{{ item.occurCount }}次</div>
-
               <div class="indicator-total">{{ item.scoreResult }}</div>
               <div class="indicator-actions">
                 <el-button type="primary" link icon="Edit" @click="editIndicator(groupIndex, itemIndex)"></el-button>
@@ -290,7 +289,7 @@
               <el-form-item label="红线指标依据">
                 <span class="detail-link"
                   @click="showDetailModal('红线指标依据', formatAccordList(nonCadreForm.redLineIndexAccordList))">
-                  {{ formatAccordList(nonCadreForm.redLineIndexAccordList) || '查看详情' }}
+                  查看详情
                 </span>
               </el-form-item>
             </el-col>
@@ -306,7 +305,7 @@
               <el-form-item label="核心指标依据">
                 <span class="detail-link"
                   @click="showDetailModal('核心指标依据', formatAccordList(nonCadreForm.coreIndexAccordList))">
-                  {{ formatAccordList(nonCadreForm.coreIndexAccordList) || '查看详情' }}
+                  查看详情
                 </span>
               </el-form-item>
             </el-col>
@@ -322,7 +321,7 @@
               <el-form-item label="其他指标中的安全指标（仅含SOC/站品控检查扣分）依据">
                 <span class="detail-link"
                   @click="showDetailModal('其他指标中的安全指标依据', formatAccordList(nonCadreForm.otherIndexSafetyScoreWithSocStationQcAccordList))">
-                  {{ formatAccordList(nonCadreForm.otherIndexSafetyScoreWithSocStationQcAccordList) || '查看详情' }}
+                  查看详情
                 </span>
               </el-form-item>
             </el-col>
@@ -338,7 +337,7 @@
               <el-form-item label="其他指标中的非安全指标依据">
                 <span class="detail-link"
                   @click="showDetailModal('其他指标中的非安全指标依据', formatAccordList(nonCadreForm.otherIndexNonSafetyAccordList))">
-                  {{ formatAccordList(nonCadreForm.otherIndexNonSafetyAccordList) || '查看详情' }}
+                  查看详情
                 </span>
               </el-form-item>
             </el-col>
@@ -354,7 +353,7 @@
               <el-form-item label="SOC/站品控检查的涉及核心、安全指标扣分依据">
                 <span class="detail-link"
                   @click="showDetailModal('SOC/站品控检查的涉及核心、安全指标扣分依据', formatAccordList(nonCadreForm.socStationQcInvolvedCoreSafetyAccordList))">
-                  {{ formatAccordList(nonCadreForm.socStationQcInvolvedCoreSafetyAccordList) || '查看详情' }}
+                  查看详情
                 </span>
               </el-form-item>
             </el-col>
@@ -391,7 +390,7 @@
               <el-form-item label="奖励明细">
                 <span class="detail-link"
                   @click="showDetailModal('奖励明细', formatAccordList(nonCadreForm.rewardAccordList))">
-                  {{ formatAccordList(nonCadreForm.rewardAccordList) || '查看详情' }}
+                  查看详情
                 </span>
               </el-form-item>
             </el-col>
@@ -399,7 +398,7 @@
               <el-form-item label="惩罚明细">
                 <span class="detail-link"
                   @click="showDetailModal('惩罚明细', formatAccordList(nonCadreForm.punishmentAccordList))">
-                  {{ formatAccordList(nonCadreForm.punishmentAccordList) || '查看详情' }}
+                  查看详情
                 </span>
               </el-form-item>
             </el-col>
@@ -484,16 +483,14 @@
       <el-form label-width="150px" class="indicator-form" :model="indicatorDialog.form" :rules="indicatorDialog.rules">
         <el-form-item label="指标名称" prop="indicatorId" required>
 
-          <el-select v-model="indicatorDialog.form.indicatorId" placeholder="搜索指标名称" filterable remote reserve-keyword
-            :remote-method="searchIndicators" :loading="indicatorDialog.loading" style="flex: 1;"
-            @change="onIndicatorNameChange">
-            <el-option v-for="item in indicatorDialog.indicatorOptions" :key="item.id" :label="item.name"
-              :value="item.id" />
-          </el-select>
+          <el-cascader v-model="indicatorDialog.form.indicatorId" placeholder="搜索指标名称" filterable clearable
+            :options="indicatorDialog.cascaderOptions" :props="indicatorDialog.cascaderProps" style="flex: 1;"
+            @change="onIndicatorCascaderChange">
+          </el-cascader>
 
         </el-form-item>
 
-        <el-form-item label="分值/单位">
+        <el-form-item label="分值/单位" v-if="indicatorDialog.form.categoryNameOne != '红线指标'">
           <div style="display: flex; align-items: center; gap: 10px;">
             <span style="font-size: 24px; font-weight: bold;">{{ indicatorDialog.form.score }}/次</span>
 
@@ -569,13 +566,14 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, getCurrentInstance, watch } from 'vue'
+import { ref, reactive, onMounted, getCurrentInstance, watch, nextTick } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 
 // API导入（需要根据实际API路径调整）
 import { listCadreAssessment, generateCadreAssessment, listNonCadreAssessment, addNonCadreAssessment, updateNonCadreAssessment, deleteNonCadreAssessment, exportNonCadreAssessment, generateNonCadreAssessment, getNonCadreAssessment } from '@/api/performance/monthlyAssess.js'
 import { selectUserLeaderListByCondition, listUserPerformance } from '@/api/system/user.js'
 import { listIndicator } from '@/api/system/classificationAssess.js'
+import { queryAssessCategoryTreeAndIndicator } from '@/api/system/classificationAssessIndicator.js'
 
 const { proxy } = getCurrentInstance()
 const { post, work_area, employment_type, assessment_team, base_performance_indicator_qc_dept_type } = proxy.useDict('post', 'work_area', 'employment_type', 'assessment_team', 'base_performance_indicator_qc_dept_type')
@@ -712,6 +710,14 @@ const indicatorDialog = reactive({
   itemIndex: null,
   loading: false,
   indicatorOptions: [],
+  cascaderOptions: [],
+  cascaderProps: {
+    value: 'id',
+    label: 'name',
+    children: 'indicatorList',
+    checkStrictly: false,
+    emitPath: false
+  },
   rules: {
     indicatorId: [
       { required: true, message: '请选择指标名称', trigger: 'change' }
@@ -752,6 +758,82 @@ async function searchIndicators(query) {
   }
 }
 
+async function loadIndicatorCascaderOptions() {
+  try {
+    const res = await queryAssessCategoryTreeAndIndicator({})
+    const treeData = res.data || []
+    indicatorDialog.cascaderOptions = transformIndicatorTree(treeData)
+  } catch (error) {
+    console.error('加载指标树失败:', error)
+    indicatorDialog.cascaderOptions = []
+  }
+}
+
+function transformIndicatorTree(treeData) {
+  return treeData.map(node => {
+    const transformed = {
+      id: node.id,
+      name: node.name,
+      indicatorList: []
+    }
+
+    if (node.children && node.children.length > 0) {
+      transformed.indicatorList = node.children.map(child => {
+        const transformedChild = {
+          id: child.id,
+          name: child.name,
+          indicatorList: []
+        }
+
+        if (child.indicatorList && child.indicatorList.length > 0) {
+          transformedChild.indicatorList = child.indicatorList.map(indicator => ({
+            ...indicator, name: indicator.name, id: indicator.code, indicatorId: indicator.id, indicatorName: indicator.name, occurCount: 1, personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList: []
+          }))
+        }
+
+        return transformedChild
+      })
+    }
+
+    if (node.indicatorList && node.indicatorList.length > 0) {
+      transformed.indicatorList = node.indicatorList.map(indicator => ({
+        ...indicator, name: indicator.name, id: indicator.code, indicatorId: indicator.id, indicatorName: indicator.name, occurCount: 1, personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList: []
+      }))
+    }
+
+    return transformed
+  })
+}
+
+function onIndicatorCascaderChange(value) {
+  const selected = findIndicatorById(indicatorDialog.cascaderOptions, value)
+  if (selected) {
+    indicatorDialog.form = {
+      ...selected,
+      name: selected.name,
+      id: selected.code,
+      indicatorId: selected.id,
+      indicatorName: selected.name,
+      occurCount: 1,
+      personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList: []
+    }
+    updateTotal()
+  }
+}
+
+function findIndicatorById(tree, targetId) {
+  for (const node of tree) {
+    if (node.id === targetId) {
+      return node
+    }
+    if (node.indicatorList && node.indicatorList.length > 0) {
+      const found = findIndicatorById(node.indicatorList, targetId)
+      if (found) return found
+    }
+  }
+  return null
+}
+
 
 
 // 弹窗配置
@@ -850,6 +932,7 @@ async function handleUserChange(userId) {
     nonCadreForm.deputySupervisorName = ''
     nonCadreForm.deputyManagerId = ''
     nonCadreForm.deputyManagerName = ''
+    checkAndLoadExistingAssessment()
     return
   }
 
@@ -877,6 +960,72 @@ async function handleUserChange(userId) {
     nonCadreForm.deputyManagerId = ''
     nonCadreForm.deputyManagerName = ''
   }
+
+  checkAndLoadExistingAssessment()
+}
+
+async function handleAssessmentMonthChange() {
+  checkAndLoadExistingAssessment()
+}
+
+async function checkAndLoadExistingAssessment() {
+  if (!nonCadreForm.userId || !nonCadreForm.assessmentMonth) {
+    return
+  }
+
+  try {
+    const assessmentMonth = nonCadreForm.assessmentMonth.replace('-', '')
+    const res = await listNonCadreAssessment({
+      userId: nonCadreForm.userId,
+      assessmentMonth: assessmentMonth
+    })
+
+    const rows = res.rows || []
+    if (rows.length > 0) {
+      const assessmentId = rows[0].id
+      await loadAssessmentDetail(assessmentId)
+    }
+  } catch (error) {
+    console.error('检查已有考核数据失败:', error)
+  }
+}
+
+async function loadAssessmentDetail(id) {
+  try {
+    const res = await getNonCadreAssessment(id)
+    const detailList = res.data.personnelMonthlyAssessmentIndicatorDetailList || []
+    const indicatorGroupsMap = {}
+    detailList.forEach(item => {
+      const categoryKey = item.categoryCodeOne || item.categoryNameOne || '未分类'
+      if (!indicatorGroupsMap[categoryKey]) {
+        indicatorGroupsMap[categoryKey] = {
+          title: item.categoryNameOne || '未分类',
+          items: []
+        }
+      }
+      indicatorGroupsMap[categoryKey].items.push({
+        ...item
+      })
+    })
+    const indicatorGroups = Object.values(indicatorGroupsMap)
+
+    Object.keys(res.data).forEach(key => {
+      if (key === 'assessmentMonth' && res.data[key]) {
+        const val = res.data[key]
+        if (typeof val === 'string' && val.length === 6 && /^\d+$/.test(val)) {
+          nonCadreForm[key] = val.substring(0, 4) + '-' + val.substring(4, 6)
+        } else {
+          nonCadreForm[key] = val
+        }
+      } else if (key !== 'personnelMonthlyAssessmentIndicatorDetailList') {
+        nonCadreForm[key] = res.data[key]
+      }
+    })
+    nonCadreForm.indicatorGroups = indicatorGroups
+  } catch (error) {
+    console.error('获取考核详情失败:', error)
+    ElMessage.error('获取考核详情失败')
+  }
 }
 
 // 获取数据列表
@@ -1031,7 +1180,7 @@ const submitForm = async () => {
       if (submitData.assessmentMonth) {
         submitData.assessmentMonth = submitData.assessmentMonth.replace('-', '')
       }
-      
+
       if (submitData.indicatorGroups && submitData.indicatorGroups.length > 0) {
         submitData.personnelMonthlyAssessmentIndicatorDetailList = submitData.indicatorGroups.flatMap(group =>
           group.items.map(item => ({
@@ -1149,16 +1298,21 @@ const addIndicator = () => {
     amount: 0,
     personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList: []
   }
+  loadIndicatorCascaderOptions()
 }
 
 // 编辑指标 - 打开编辑模态框
-const editIndicator = (groupIndex, itemIndex) => {
+const editIndicator = async (groupIndex, itemIndex) => {
   const item = nonCadreForm.indicatorGroups[groupIndex].items[itemIndex]
   indicatorDialog.visible = true
   indicatorDialog.title = '编辑扣分指标'
   indicatorDialog.mode = 'edit'
   indicatorDialog.groupIndex = groupIndex
   indicatorDialog.itemIndex = itemIndex
+
+  await loadIndicatorCascaderOptions()
+  await nextTick()
+
   indicatorDialog.form = { ...item }
   if (!indicatorDialog.form.personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList) {
     indicatorDialog.form.personnelMonthlyAssessmentIndicatorRewardPunishmentDetailList = []
@@ -1222,9 +1376,9 @@ const saveIndicator = () => {
     return
   }
 
-  const rewardPunishmentType = indicatorDialog.form.score > 0 ? '1' : '0'
+
   list.forEach(detail => {
-    detail.rewardPunishmentType = rewardPunishmentType
+    detail.rewardPunishmentType = indicatorDialog.form.rewardPunishmentType
   })
 
   if (indicatorDialog.mode === 'add') {