feat(approve): 添加部门检查批量审批功能并优化界面显示

- 新增部门检查的批量审批通过和驳回接口
- 调整待办列表中复选框显示逻辑，支持部门检查任务
- 修改检查表单中的部门选择标签显示
- 优化文件选择器样式和权限判断逻辑

src/api/approve/approve.js

@@ -59,4 +59,21 @@ export const getApproveList = (data) => {
         method: 'get',
         data
     })
+}
+
+//整改审批通过
+export const rectifyApprovePass = (data) => {
+    return request({
+        url: `/check/checkCorrection/approveTaskBatch`,
+        method: 'post',
+        data
+    })
+}
+//整改审批驳回
+export const rectifyApproveReject = (data) => {
+    return request({
+        url: `/check/checkCorrection/rejectTaskBatch`,
+        method: 'post',
+        data
+    })
 }

src/pages/checklist/index.vue

@@ -24,10 +24,10 @@
                                     :disabled="true" />
                             </uni-forms-item>
                             <uni-forms-item :label="getCheckLabel" :name="getCheckFieldName" required>
-                                <uni-data-picker v-if="getCheckLabel == '被检查科'" :localdata="departments"
+                                <uni-data-picker v-if="getCheckLabel == '被检查主管'" :localdata="departments"
                                     :popup-title="`请选择${getCheckLabel}`" v-model="formData.checkedDepartmentId"
                                     @change="handlecheckedDepartmentIdChange" :readonly="formDisabled" />
-                                <uni-data-picker v-if="getCheckLabel == '被检查主管'" :localdata="brigades"
+                                <uni-data-picker v-if="getCheckLabel == '被检查大队'" :localdata="brigades"
                                     :popup-title="`请选择${getCheckLabel}`" v-model="formData.checkedBrigadeId"
                                     @change="handlecheckedBrigadeIdChange" :readonly="formDisabled" />
                                 <uni-data-picker v-if="getCheckLabel == '被检查班组'" :localdata="teams"
@@ -142,7 +142,7 @@ import TextSwitch from "@/components/text-switch/text-switch.vue"
 import { checkedLevelEnums } from "@/utils/enums.js"
 import UnqualifiedPersonnel from "./components/unqualified.vue"
 import { treeSelectByType } from "@/api/system/common"
-import { buildTeamOptions, buildDepartmentOptions, buildBrigadeOptions } from '@/utils/common'
+import { buildTeamOptions, buildDepartmentOptions, buildBrigadeOptions,buildManagerOptions } from '@/utils/common'
 import useDictMixin from '@/utils/dict'
 import { getDeptRoleUser } from "@/api/check/checklist.js"
 import { addDraftInspection, submitInspection, getInspectionListById } from '@/api/check/checkReward.js'
@@ -199,10 +199,10 @@ export default {
                 return '被检查人'
             }
             if (this.formData.checkedLevel == checkedLevelEnums.DEPARTMENT_LEVEL) {
-                return '被检查科'
+                return '被检查主管'
             }
             if (this.formData.checkedLevel == checkedLevelEnums.BRIGADE_LEVEL) {
-                return '被检查主管'
+                return '被检查大队'
             }
         },
         // 获取验证字段名
@@ -240,14 +240,14 @@ export default {
             if (this.formData.checkedLevel == checkedLevelEnums.DEPARTMENT_LEVEL) {
                 changeRule = {
                     checkedDepartmentId: {
-                        rules: [{ required: true, errorMessage: '请选择被检查科' }]
+                        rules: [{ required: true, errorMessage: '请选择被检查主管' }]
                     }
                 }
             }
             if (this.formData.checkedLevel == checkedLevelEnums.BRIGADE_LEVEL) {
                 changeRule = {
                     checkedBrigadeId: {
-                        rules: [{ required: true, errorMessage: '请选择被检查主管' }]
+                        rules: [{ required: true, errorMessage: '请选择被检查大队' }]
                     }
                 }
             }
@@ -290,7 +290,7 @@ export default {
     data() {
         return {
             teams: [],//被检查班组选项
-            departments: [],//被检查科选项
+            departments: [],//被检查主管选项
             userOptions: [],//全部的人
             brigades: [],
             checkcheckedTeamIdOptions: [],
@@ -505,7 +505,7 @@ export default {
             const deptTree = await getDeptList();
             this.deptTree = deptTree.data || [];
             this.teams = buildTeamOptions(deptTree.data || []);
-            this.departments = buildDepartmentOptions(deptTree.data || []);
+            this.departments = buildManagerOptions(deptTree.data || []);
             this.brigades = buildBrigadeOptions(deptTree.data || []);
             console.log(this.departments, "this.departments")
             const [positionRes] = await Promise.all([

src/pages/myToDoList/index.vue

@@ -12,7 +12,7 @@
                     <list-card v-for="item in filteredList" :key="item.id" :showChecked="true"
                         @click="navigateToDetail(item)">
                         <template #checkbox
-                            v-if="item.instance && item.instance.businessType === 'SEIZURE_REPORT' && currentTab === 'todo'">
+                            v-if="canShowCheckbox(item)">
                             <u-checkbox style="margin-top: 6rpx;" :checked="item.checked" :key="item.id"
                                 @change="itemChange(item)" />
                         </template>
@@ -111,7 +111,7 @@
 import HomeContainer from "@/components/HomeContainer.vue";
 import HTabs from "@/components/h-tabs/h-tabs.vue";
 import { listCheckApprovalCcDetails, listCheckPendingTasks, listCheckFinishedTasks, updateCheckApprovalCcDetails } from "@/api/myToDoList/myToDoList.js"
-import { approvePassBatch, approveRejectBatch } from "@/api/approve/approve.js";
+import { approvePassBatch, approveRejectBatch,rectifyApprovePass,rectifyApproveReject } from "@/api/approve/approve.js";
 import { showMessageTabRedDot } from "@/utils/common.js"
 export default {
     components: { HomeContainer, HTabs },
@@ -136,6 +136,9 @@ export default {
         }
     },
     computed: {
+        userInfoRoles() {
+            return this.$store.state.user && this.$store.state.user.roles
+        },
         tabList() {
             return [
                 {
@@ -153,12 +156,41 @@ export default {
                     title: '已办'
                 }
             ];
+        },
+        // 判断是否显示复选框的条件
+        showCheckboxCondition(item) {
+            return this.canShowCheckbox(item);
         }
     },
     watch: {
 
     },
     methods: {
+        // 判断是否显示复选框的条件
+        canShowCheckbox(item) {
+      
+            return ((item.instance && item.instance.businessType === 'SEIZURE_REPORT') || 
+                   (item.instance && item.instance.businessType === 'DEPARTMENT_CHECK' && 
+                    this.userInfoRoles.includes('jingli'))) && 
+                   this.currentTab === 'todo';
+        },
+
+        // 根据任务类型分组
+        groupTasksByType(selectedItems) {
+            const seizureTaskIds = [];
+            const departmentTaskIds = [];
+
+            selectedItems.forEach(item => {
+                if (item.instance && item.instance.businessType === 'SEIZURE_REPORT') {
+                    seizureTaskIds.push(item.id);
+                } else if (item.instance && item.instance.businessType === 'DEPARTMENT_CHECK' && 
+                          this.userInfoRoles.includes('jingli')) {
+                    departmentTaskIds.push(item.id);
+                }
+            });
+
+            return { seizureTaskIds, departmentTaskIds };
+        },
         async getUnreadCount() {
             try {
                 const query = {
@@ -233,7 +265,7 @@ export default {
             return ''
         },
         navigateToDetail(row) {
-            
+
             let type = 'view'; // 默认查看模式
             if (this.currentTab == 'msg') {
                 const { businessType, businessId, instanceId } = row;
@@ -254,6 +286,7 @@ export default {
                 });
                 return;
             }
+
             const { instance, id, nodeDefinition } = row;
             const { businessId = "", businessType = "", id: instanceId } = instance || {};
             const { nodeCode = "" } = nodeDefinition || {};
@@ -278,7 +311,7 @@ export default {
                 url = `/pages/seizedReported/index?params=${encodeURIComponent(JSON.stringify(obj))}`;
             }
             // 巡检对应个人 班组  科室
-            if (['PERSONAL_CHECK', 'GROUP_CHECK', 'SECTION_CHECK', 'BRIGADE_CHECK'].includes(businessType) || this.currentTab == 'msg') {
+            if (['PERSONAL_CHECK', 'GROUP_CHECK', 'SECTION_CHECK', 'BRIGADE_CHECK', 'DEPARTMENT_CHECK'].includes(businessType) || this.currentTab == 'msg') {
                 url = `/pages/problemRect/index?params=${encodeURIComponent(JSON.stringify(obj))}`;
             }
             if (url) {
@@ -315,8 +348,8 @@ export default {
             this.$nextTick(() => {
                 this.filteredList = this.filteredList.map(item => ({
                     ...item,
-                    //只有查获可以批量审批
-                    ...(item.instance && item.instance.businessType === 'SEIZURE_REPORT' ? { checked: e } : {}),
+                    //查获和部门检查可以批量审批
+                    ...(this.canShowCheckbox(item) ? { checked: e } : {}),
                 }));
                 this.selectedItems = this.filteredList.filter(item => item.checked);
             })
@@ -332,11 +365,22 @@ export default {
             }
 
             try {
-                // 提取选中项的任务ID数组
-                const taskIds = this.selectedItems.map(item => item.id);
+                // 根据任务类型分组
+                const { seizureTaskIds, departmentTaskIds } = this.groupTasksByType(this.selectedItems);
+
+                // 分别调用不同的驳回接口
+                const promises = [];
+                
+                if (seizureTaskIds.length > 0) {
+                    promises.push(approveRejectBatch(seizureTaskIds));
+                }
+                
+                if (departmentTaskIds.length > 0) {
+                    promises.push(rectifyApproveReject({taskIdList: departmentTaskIds}));
+                }
 
-                // 调用批量驳回接口
-                await approveRejectBatch(taskIds);
+                // 等待所有接口调用完成
+                await Promise.all(promises);
 
                 uni.showToast({
                     title: '批量驳回成功',
@@ -371,11 +415,22 @@ export default {
             }
 
             try {
-                // 提取选中项的任务ID数组
-                const taskIds = this.selectedItems.map(item => item.id);
-
-                // 调用批量通过接口
-                await approvePassBatch(taskIds);
+                // 根据任务类型分组
+                const { seizureTaskIds, departmentTaskIds } = this.groupTasksByType(this.selectedItems);
+
+                // 分别调用不同的通过接口
+                const promises = [];
+                
+                if (seizureTaskIds.length > 0) {
+                    promises.push(approvePassBatch(seizureTaskIds));
+                }
+                
+                if (departmentTaskIds.length > 0) {
+                    promises.push(rectifyApprovePass({ taskIdList: departmentTaskIds }));
+                }
+debugger
+                // 等待所有接口调用完成
+                await Promise.all(promises);
 
                 uni.showToast({
                     title: '批量通过成功',

src/utils/common.js

@@ -167,6 +167,8 @@ export function buildDepartmentOptions(tree = [], includeFullData = false) {
 }
 
 /**
+ *
+/**
  * 找出deptType为BRIGADE的节点
  * @param {Array} tree - 树形结构数据
  * @param {boolean} includeFullData - 是否包含节点的完整数据，默认false