Merge branch 'personnelPerformance'

src/api/performance/monthlyAssess.js

@@ -72,3 +72,11 @@ export function generateNonCadreAssessment(query) {
     method: 'get',
   })
 }
+
+//删除干部月度考核
+export function deleteCadreAssessment(ids) {
+  return request({
+    url: `/personnel/cadre-assessment/${ids}`,
+    method: 'delete',
+  })
+}

src/views/performanceManage/monthlyAssess/index.vue

@@ -55,21 +55,24 @@
       <!-- 非干部操作按钮 -->
       <div v-if="currentTab === 'non-cadre'" class="left-buttons">
         <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+        <el-button type="danger" plain icon="Delete" :disabled="selectedIds.length === 0"
+          @click="handleBatchDelete">删除</el-button>
         <el-button type="warning" plain icon="Download" @click="handleExport">导出</el-button>
       </div>
       <!-- 干部模式时显示空白占位 -->
       <div v-else class="left-buttons"></div>
 
       <div class="right-buttons">
-        <el-button type="primary" :disabled="!queryParams.assessmentMonth" @click="generateMonthlyAssessment">生成本月考核表</el-button>
+        <el-button type="primary" :disabled="!queryParams.assessmentMonth"
+          @click="generateMonthlyAssessment">生成本月考核表</el-button>
       </div>
     </div>
 
     <!-- 非干部数据表格 -->
     <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="brigadeName" align="center" min-width="100" />
+        style="width: 100%; margin-top: 20px;" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="用工形式" prop="employmentType" align="center" min-width="100">
           <template #default="scope">
             <dict-tag :options="employment_type" :value="scope.row.employmentType" />
@@ -155,7 +158,8 @@
     <!-- 干部数据表格 -->
     <div v-else>
       <el-table v-loading="loading" :data="cadreList" border fit highlight-current-row
-        style="width: 100%; margin-top: 20px;">
+        style="width: 100%; margin-top: 20px;" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="姓名" prop="name" align="center" min-width="120" />
         <el-table-column label="部门" prop="deptName" align="center" min-width="120" />
         <el-table-column label="岗位" prop="post" align="center" min-width="120">
@@ -193,10 +197,10 @@
 
     <!-- 编辑/新增弹窗 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="80%" :close-on-click-modal="false"
-      destroy-on-close >
+      destroy-on-close>
       <!-- 非干部表单 -->
-      <el-form v-loading="dialog.loading" v-if="dialog.type === 'non-cadre'" :model="nonCadreForm" ref="formRef" :rules="nonCadreRules"
-        label-width="380px" class="form-container">
+      <el-form v-loading="dialog.loading" v-if="dialog.type === 'non-cadre'" :model="nonCadreForm" ref="formRef"
+        :rules="nonCadreRules" label-width="380px" class="form-container">
         <!-- 第一部分：基础信息 -->
         <el-row :gutter="20">
           <el-col :span="8">
@@ -287,9 +291,11 @@
             <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" v-if="item.categoryNameOne != '红线指标'">{{item.score>0?'+':''}}{{ item.score }}/次</div>
+              <div class="indicator-value" v-if="item.categoryNameOne != '红线指标'">{{ item.score > 0 ? '+' : '' }}{{ item.score
+                }}/次
+              </div>
               <div class="indicator-count">{{ item.occurCount }}次</div>
-              <div class="indicator-total">{{item.scoreResult>0?'+':''}}{{ item.scoreResult }}</div>
+              <div class="indicator-total">{{ item.scoreResult > 0 ? '+' : '' }}{{ item.scoreResult }}</div>
               <div class="indicator-actions">
                 <el-button type="primary" link icon="Edit" @click="editIndicator(groupIndex, itemIndex)"></el-button>
                 <el-button type="danger" link icon="Delete" @click="deleteIndicator(groupIndex, itemIndex)"></el-button>
@@ -336,7 +342,8 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="其他指标中的安全指标（仅含SOC/站品控检查扣分）分值">
-                <el-input v-model="nonCadreForm.otherIndexSafetyScoreWithSocStationQcDeduction" disabled placeholder="不可编辑，各个明细的集合" />
+                <el-input v-model="nonCadreForm.otherIndexSafetyScoreWithSocStationQcDeduction" disabled
+                  placeholder="不可编辑，各个明细的集合" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -368,7 +375,8 @@
           <el-row :gutter="20">
             <el-col :span="12">
               <el-form-item label="SOC/站品控检查的涉及核心、安全指标扣分">
-                <el-input v-model="nonCadreForm.socStationQcInvolvedCoreSafetyDeduction" disabled placeholder="不可编辑，各个明细的集合" />
+                <el-input v-model="nonCadreForm.socStationQcInvolvedCoreSafetyDeduction" disabled
+                  placeholder="不可编辑，各个明细的集合" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -514,7 +522,8 @@
 
         <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>0?'+':''}}{{ indicatorDialog.form.score }}/次</span>
+            <span style="font-size: 24px; font-weight: bold;">{{ indicatorDialog.form.score > 0 ? '+' : '' }}{{
+              indicatorDialog.form.score }}/次</span>
 
           </div>
         </el-form-item>
@@ -592,7 +601,7 @@ import { ref, reactive, onMounted, getCurrentInstance, watch, nextTick } from 'v
 import { ElMessage, ElMessageBox } from 'element-plus'
 
 // API导入（需要根据实际API路径调整）
-import { listCadreAssessment, generateCadreAssessment, listNonCadreAssessment, addNonCadreAssessment, updateNonCadreAssessment, deleteNonCadreAssessment, exportNonCadreAssessment, generateNonCadreAssessment, getNonCadreAssessment } from '@/api/performance/monthlyAssess.js'
+import { listCadreAssessment, generateCadreAssessment, listNonCadreAssessment, addNonCadreAssessment, updateNonCadreAssessment, deleteNonCadreAssessment, exportNonCadreAssessment, generateNonCadreAssessment, getNonCadreAssessment, deleteCadreAssessment } 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'
@@ -606,6 +615,7 @@ const total = ref(0)
 const queryFormRef = ref()
 const formRef = ref()
 const currentTab = ref('non-cadre')
+const selectedIds = ref([])
 
 // 监听tab切换
 watch(() => currentTab.value, () => {
@@ -1109,6 +1119,32 @@ const resetQuery = () => {
   getList()
 }
 
+// 批量选择
+const handleSelectionChange = (selection) => {
+  selectedIds.value = selection.map(item => item.id)
+}
+
+// 批量删除
+const handleBatchDelete = () => {
+  if (selectedIds.value.length === 0) {
+    return
+  }
+  proxy.$modal.confirm(`是否确认删除选中的 ${selectedIds.value.length} 条数据？`).then(async () => {
+    try {
+      if (currentTab.value === 'non-cadre') {
+        await deleteNonCadreAssessment(selectedIds.value.join(','))
+      } else {
+        await deleteCadreAssessment(selectedIds.value.join(','))
+      }
+      ElMessage.success('删除成功')
+      selectedIds.value = []
+      getList()
+    } catch (error) {
+      console.error('删除失败:', error)
+    }
+  }).catch(() => { })
+}
+
 // 新增
 const handleAdd = () => {
   dialog.visible = true