feat: 优化部门树功能并修复多个页面问题

refactor(部门树): 重构部门树选项构建函数，支持包含完整节点数据
fix(违禁品上报): 修复图片上传和显示问题
feat(考勤统计): 添加图表更新前清空功能
style(工作概况): 调整筛选选择器宽度
fix(违禁品统计): 根据用户角色调整部门筛选逻辑
feat(违禁品上报): 添加折叠面板状态控制

src/api/seizureRecord/seizureRecord.js

@@ -55,9 +55,10 @@ export function categoryInfo (type) {
  * @name 对违禁品类进行模糊搜索
  * @param {*} name 查询字符串
 */
-export function categoryList (name) {
+export function categoryList (params) {
   return request({
-    url: `/system/category/list?name=${name}`,
-    method: 'get'
+    url: `/system/category/list`,
+    method: 'get',
+    params
   });
 }

src/api/system/dept/dept.js

@@ -1,13 +1,14 @@
 import request from '@/utils/request'
 
 // 获取组织树形结构
-export function getDeptList() {
+export function getDeptList(params) {
   return request({
     url: '/system/user/deptTree',
     // headers: {
     //   isToken: false
     // },
     method: 'get',
+    params: params
     // params: {deptType: "TEAMS"}
   })
 }

src/pages/attendance/components/MaintainAreaOrMemberModal.vue

@@ -331,6 +331,10 @@ export default {
             }
         },
         close() {
+            if(this.searchViewShow){
+                this.searchViewShow = false;
+                return;
+            }
 
             this.show = false
         },

src/pages/attendanceStatistics/index.vue

@@ -168,6 +168,10 @@ export default {
             });
         },
         updateCharts() {
+            // 在更新图表前先清空所有图表
+            this.pieChart && this.pieChart.clear();
+            this.barChart1 && this.barChart1.clear();
+            this.barChart2 && this.barChart2.clear();
 
             let openRate = 0;
             let openData = 0;
@@ -267,7 +271,17 @@ export default {
             // 通道开放情况正负条形图
             if (this.currentTab === 'all') {
                 this.barChart1 && this.barChart1.setOption({
-                    tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
+                    tooltip: { 
+                        trigger: 'axis', 
+                        axisPointer: { type: 'shadow' },
+                        formatter: function(params) {
+                            let result = params[0].name + '<br/>';
+                            params.forEach(function(item) {
+                                result += item.marker + ' ' + item.seriesName + ': ' + Math.abs(item.value) + '<br/>';
+                            });
+                            return result;
+                        }
+                    },
                     legend: {
                         data: ['开放', '未开放'],
                         top: '15%'
@@ -365,7 +379,17 @@ export default {
             // 人员情况正负条形图
             if (this.currentTab === 'all') {
                 this.barChart2 && this.barChart2.setOption({
-                    tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
+                    tooltip: { 
+                        trigger: 'axis', 
+                        axisPointer: { type: 'shadow' },
+                        formatter: function(params) {
+                            let result = params[0].name + '<br/>';
+                            params.forEach(function(item) {
+                                result += item.marker + ' ' + item.seriesName + ': ' + Math.abs(item.value) + '<br/>';
+                            });
+                            return result;
+                        }
+                    },
                     legend: { data: ['在岗人数', '空闲人数'], top: '15%' },
                     grid: {
                         left: '4%',

src/pages/eikonStatistics/components/topInfo.vue

@@ -1,54 +1,58 @@
 <template>
     <view class="top-info-wrapper">
         <view class="top-info-container">
-        <view class="info-content">
-            <!-- 左侧信息区域 -->
-            <view class="left-info">
-                <!-- 上面：根据角色显示部门信息 -->
-                <view class="department-info">
-                    <text class="department-value">{{ currentDepartmentPath }}</text>
+            <view class="info-content">
+                <!-- 左侧信息区域 -->
+                <view class="left-info">
+                    <!-- 上面：根据角色显示部门信息 -->
+                    <view class="department-info">
+                        <text class="department-value">{{ currentDepartmentPath }}</text>
+                    </view>
+
+                    <!-- 下面：根据是否个人显示不同信息 -->
+                    <view class="user-info">
+                        <text v-if="isPersonal" class="user-name">姓名：{{ currentLevelUserName }}</text>
+                        <text v-else class="stat-count">统计人数：{{ currentLevelUserCount }}</text>
+                    </view>
                 </view>
 
-                <!-- 下面：根据是否个人显示不同信息 -->
-                <view class="user-info">
-                    <text v-if="isPersonal" class="user-name">姓名：{{ currentLevelUserName }}</text>
-                    <text v-else class="stat-count">统计人数：{{ currentLevelUserCount }}</text>
+                <!-- 右侧切换按钮 -->
+                <view v-if="!userRoles.includes('SecurityCheck') && currentTab != 'team'" class="right-switch"
+                    @click="openPopup">
+                    <image src="/static/images/icon/switch.png" mode="aspectFit" class="switch-image" />
                 </view>
             </view>
 
-            <!-- 右侧切换按钮 -->
-            <view v-if="!userRoles.includes('SecurityCheck')&&currentTab != 'team'" class="right-switch" @click="openPopup">
-                <image src="/static/images/icon/switch.png" mode="aspectFit" class="switch-image" />
-            </view>
-        </view>
-
-        <!-- 切换弹窗 -->
-        <uni-popup ref="SelectPopup" type="center" :mask-click="false">
-            <view class="popup-container">
-                <view class="popup-header">
-                    <text class="popup-title">选择</text>
-                    <view class="popup-close" @click="closePopup">×</view>
-                </view>
-
-                <!-- 搜索框 -->
-                <view class="search-section">
-                    <uni-easyinput v-model="searchKeyword" :placeholder="userRoles.includes('banzuzhang') ? '请输入姓名搜索' : '请输入部门名称、姓名搜索'" :clearable="true" />
+            <!-- 切换弹窗 -->
+            <uni-popup ref="SelectPopup" type="center" :mask-click="false">
+                <view class="popup-container">
+                    <view class="popup-header">
+                        <text class="popup-title">选择</text>
+                        <view class="popup-close" @click="closePopup">×</view>
+                    </view>
+
+                    <!-- 搜索框 -->
+                    <view class="search-section">
+                        <uni-easyinput v-model="searchKeyword"
+                            :placeholder="userRoles.includes('banzuzhang') ? '请输入姓名搜索' : '请输入部门名称、姓名搜索'"
+                            :clearable="true" />
+                    </view>
+
+                    <!-- 部门树 -->
+                    <view class="tree-section">
+                        <scroll-view scroll-y="true" class="tree-scroll">
+                            <mix-tree :list="filteredTreeData" :expandAll="!!searchKeyword"
+                                @treeItemClick="handleNodeSelect" />
+                        </scroll-view>
+                    </view>
+
+                    <!-- 按钮区域 -->
+                    <view class="button-section">
+                        <view class="btn-cancel" @click="closePopup">取消</view>
+                        <view class="btn-confirm" @click="confirmSelection">确定</view>
+                    </view>
                 </view>
-
-                <!-- 部门树 -->
-                <view class="tree-section">
-                    <scroll-view scroll-y="true" class="tree-scroll">
-                        <mix-tree :list="filteredTreeData" :expandAll="!!searchKeyword" @treeItemClick="handleNodeSelect" />
-                    </scroll-view>
-                </view>
-
-                <!-- 按钮区域 -->
-                <view class="button-section">
-                    <view class="btn-cancel" @click="closePopup">取消</view>
-                    <view class="btn-confirm" @click="confirmSelection">确定</view>
-                </view>
-            </view>
-        </uni-popup>
+            </uni-popup>
         </view>
     </view>
 </template>
@@ -56,13 +60,13 @@
 <script>
 import { mapState, mapGetters } from 'vuex'
 import mixTree from '@/uni_modules/mix-tree/components/mix-tree/mix-tree.vue'
-import { getDeptUserTree,getUserInfoById } from '@/api/system/user'
+import { getDeptUserTree, getUserInfoById } from '@/api/system/user'
 export default {
     name: 'TopInfo',
     components: {
         mixTree
     },
-    props:{ 
+    props: {
         currentTab: {
             type: String,
             default: ''
@@ -95,7 +99,7 @@ export default {
             if (this.isZhanZhang) return '站'
             return '部门'
         },
-        
+
         // 过滤后的树数据
         filteredTreeData() {
             if (!this.searchKeyword) {
@@ -144,7 +148,7 @@ export default {
                 this.currentLevelUserName = ''
             }
         },
-        
+
         // 打开弹窗
         openPopup() {
             this.$refs.SelectPopup.open();
@@ -210,12 +214,15 @@ export default {
             return fullPath || []
         },
         async getDeptTree() {
-
-
+            // console.log(this.userInfo, "this.userInfo",this.userRoles)
+            
             let params = {}
             if (this.userRoles.includes('test')) {
                 params.deptId = this.userInfo.stationId
             }
+            if (this.userRoles.includes('jingli')) {
+                params.deptId = this.userInfo.brigadeId
+            }
             if (this.userRoles.includes('kezhang')) {
                 params.deptId = this.userInfo.departmentId
             }
@@ -226,9 +233,9 @@ export default {
             this.departmentTree = res.data
         }
     },
-    
-   
-    
+
+
+
     // 监听currentLevelId和isPersonal的变化
     watch: {
         currentLevelId: {
@@ -237,7 +244,7 @@ export default {
             },
             immediate: true
         },
-       
+
     }
 }
 </script>

src/pages/myToDoList/index.vue

@@ -487,7 +487,7 @@ export default {
 
 
 .mytodo-list {
-    height: calc(100vh - 207rpx);
+    height: calc(100vh - 260rpx);
     // overflow: hidden; /* 防止与scroll-view的滚动冲突 */
     margin-bottom: 100rpx;
 

src/pages/seizeStatistics/index.vue

@@ -4,8 +4,10 @@
       <!-- 筛选区域 -->
       <view class="filter-section">
         <view class="filter-row">
-          <uni-data-picker class="filter-select" :localdata="departments" :placeholder="'请选择'"
-            v-model="formData.inspectDepartmentId" @change="handleinspectDepartmentIdChange" :clear-icon="false" />
+          <uni-data-picker
+            v-if="curUserRoles.includes('test') || curUserRoles.includes('jingli') || curUserRoles.includes('xingzheng')"
+            class="filter-select" :localdata="departments" :placeholder="'请选择'" @change="handleinspectDeptIdChange"
+            :clear-icon="false" />
           <text v-if="dateRange.length > 0" class="days-count">共 {{ totalDays }} 天</text>
           <!-- 时间范围选择器 -->
           <uni-datetime-picker v-model="dateRange" type="daterange" rangeSeparator="至" @change="handleDateRangeChange"
@@ -83,7 +85,8 @@
             <uni-data-picker :localdata="item_category_options1" :map="dataTreeOptionMap" popup-title="请选择一级违禁品类别"
               v-model="formData.categoryCodeOne" @change="onCategoryChange" v-if="showForbiddenCategory" />
             <uni-data-picker :localdata="item_category_options2" :map="dataTreeOptionMap" popup-title="请选择二级违禁品类别"
-              v-model="formData.categoryCodeTwo" v-if="showForbiddenCategory" @change="onTypeChange" :readonly="!formData.categoryCodeOne" />
+              v-model="formData.categoryCodeTwo" v-if="showForbiddenCategory" @change="onTypeChange"
+              :readonly="!formData.categoryCodeOne" />
 
             <!-- 安检岗位嵌套环形图 -->
             <!-- <view class="chart-item">
@@ -136,7 +139,7 @@
 
 <script>
 import * as echarts from 'echarts'
-import { buildDepartmentOptions } from '@/utils/common'
+import { buildManagerOptions, buildBrigadeOptions } from '@/utils/common'
 import HomeContainer from "@/components/HomeContainer.vue";
 import SwitchTab from "./components/switch-tab.vue";
 import { getTotalSome, getPost, getPosition, getRank, getTimeSpan, getCategory } from "@/api/seizeStatistics/seizeStatistics";
@@ -152,7 +155,7 @@ export default {
   data() {
     return {
       departments: [
-        { value: null, text: '全站' },
+
       ],
       showForbiddenCategory: true, // 控制违禁品类别的显示
       dateRange: [],
@@ -185,7 +188,7 @@ export default {
       formData: {
         categoryCodeOne: '', // 违禁品类别
         categoryCodeTwo: '', // 违禁品类型
-        inspectDepartmentId: null // 被检查科ID
+        inspectDeptId: null // 被检查科ID
       },
       dataTreeOptionMap: { text: 'label', value: 'id' }, // 级联字段映射关系树结构
       // allPositionData: [],
@@ -193,12 +196,19 @@ export default {
       forbiddenPieData: [],//违禁品类别数据
       levelType: 1,
       secondLevelType: 1,
+      getType: ''
     }
   },
   computed: {
+    currentUser() {
+      return this.$store.state.user;
+    },
+    curUserRoles() {
+      return this.$store.state.user && this.$store.state.user.roles;
+    },
     // 表格列配置
     rankingColumns() {
-      let name = this.defaultActive == 1 ? '科室' : this.defaultActive == 2 ? '班组' : '个人';
+      let name = this.defaultActive == 1 ? '主管' : this.defaultActive == 2 ? '班组' : this.defaultActive == 3 ? '个人' : '大队';
       return [
         { props: 'rank', title: '排名', slot: true },
         { props: 'name', title: name },
@@ -208,15 +218,22 @@ export default {
       ]
     },
     tabList() {
-      if (!this.formData.inspectDepartmentId) {
-        this.defaultActive = 1;
+      if (this.getType === null) {
         return [
-          { label: '按科室', value: 1 },
+          { label: '按大队', value: 4 },
+          { label: '按主管', value: 1 },
           { label: '按班组', value: 2 },
           { label: '按个人', value: 3 }
         ];
-      } else {
-        this.defaultActive = 2;
+      }
+      if (this.getType == "BRIGADE") {
+        return [
+          { label: '按主管', value: 1 },
+          { label: '按班组', value: 2 },
+          { label: '按个人', value: 3 }
+        ];
+      }
+      if (this.getType == "MANAGER" || this.curUserRoles.includes('kezhang')) {
         return [
           { label: '按班组', value: 2 },
           { label: '按个人', value: 3 }
@@ -227,8 +244,6 @@ export default {
   mounted() {
     this.initData()
     this.$nextTick(() => {
-
-
       this.initCharts()
     })
   },
@@ -247,13 +262,18 @@ export default {
     },
 
     // 处理部门选择变化
-    async handleinspectDepartmentIdChange() {
-      // 根据选择的部门调整tabList
-      if (!this.formData.inspectDepartmentId) {
-        // this.activeTab = 1;
+    async handleinspectDeptIdChange(e) {
+      console.log(e, 111, this.departments)
+      let depart = e.detail && e.detail.value[0];
+      this.getType = this.departments.find(item => item.value == depart.value).deptType;
+
+      if (this.getType == null) {
+        this.defaultActive = 4;
+      }
+      if (this.getType == "BRIGADE") {
         this.defaultActive = 1;
-      } else {
-        // this.activeTab = 2;
+      }
+      if (this.getType == "MANAGER") {
         this.defaultActive = 2;
       }
 
@@ -287,13 +307,26 @@ export default {
       if (this.curType === 'concealTotal') {
         obj = { isConceal: 1 }
       }
+      let dept = {};
+
+      if (this.getType == "BRIGADE") {
+        dept = { inspectBrigadeId: this.formData.inspectDeptId || this.currentUser.userInfo.deptId }
+      }
+      if (this.getType == "MANAGER") {
+        dept = { inspectDepartmentId: this.formData.inspectDeptId }
+      }
+      if (this.curUserRoles.includes('kezhang')) {
+        const deptId = this.currentUser.userInfo.deptId;
+        dept = { inspectDepartmentId: deptId }
+      }
 
 
       let params = {
+
         ...obj,
         startDate: startDate,
         endDate: endDate,
-        inspectDepartmentId: this.formData.inspectDepartmentId || null
+        ...dept
       }
 
       return params
@@ -322,6 +355,9 @@ export default {
     },
     // 初始化数据
     async initData() {
+      if (this.curUserRoles.includes('kezhang')) {
+        this.defaultActive = 2
+      }
       // 使用data()中设置的默认今天日期，不再重置dateRange
       this.calculateDays()
 
@@ -337,10 +373,19 @@ export default {
     async getEnumOption() {
       try {
         const itemCategoryRes = await treeSelectByType("ITEM_CATEGORY", 3);
+        //站长先获取所有部门；
         const deptTree = await getDeptList();
-        this.departments = [...this.departments, ...buildDepartmentOptions(deptTree.data || []).map(item => ({
+        //经理和行政先获取登陆角色部门下的部门
+        const deptId = this.currentUser.userInfo && this.currentUser.userInfo.deptId;
+        const subDeptTree = await getDeptList({ parentId: deptId });
+        // console.log(subDeptTree, "subDeptTree")
+        let firstOption = this.curUserRoles.includes('test') ? [{ value: null, deptType: null, text: '全站' }] : this.curUserRoles.includes('jingli') || this.curUserRoles.includes('xingzheng') ? [{ value: deptId, deptType: 'BRIGADE', text: '本队' }] : [];
+        //如果是站长，则获取所有部门的大队，如果是经理或行政，则获取登陆角色部门下的主管
+        let otherOption = this.curUserRoles.includes('test') ? buildBrigadeOptions(deptTree.data || [], true) : buildManagerOptions(subDeptTree.data, true);
+        console.log(otherOption, "this.departments")
+        this.departments = [...firstOption, ...otherOption.map(item => ({
           ...item,
-          text: item.text?.split('/')[1],
+          text: this.curUserRoles.includes('test') ? item.text?.split('/')[1] : item.text,
           value: item.value.toString()
         }))];
         console.log(itemCategoryRes.data, "itemCategoryRes.data")
@@ -380,8 +425,8 @@ export default {
     },
     // 违禁品类型变化
     onTypeChange(e) {
-    
-  
+
+
       this.initTimeLineChart()
       this.loadRankingData();
     },
@@ -1153,7 +1198,9 @@ export default {
       let query = this.getParams();
       query.categoryCodeOne = this.formData.categoryCodeOne;
       query.categoryCodeTwo = this.formData.categoryCodeTwo;
-      query.type = type || this.defaultActive
+      query.type = type || this.defaultActive;
+      console.log(query, "query")
+
       getRank(query).then(res => {
         const newList = res.data.map(el => {
           return {
@@ -1177,6 +1224,7 @@ export default {
       }
     })
   }
+
 }
 </script>
 
@@ -1199,10 +1247,10 @@ export default {
     .filter-row {
       display: flex;
       align-items: center;
-      gap: 24rpx;
+      //gap: 24rpx;
 
       .filter-select {
-        max-width: 180rpx;
+        max-width: 200rpx;
         position: relative;
         top: 4rpx;
 

src/pages/seizedReported/index.vue

@@ -5,75 +5,76 @@
       <uni-forms ref="form" :rules="rules" :modelValue="formData" label-position="top" err-show-type="modal">
         <!-- <scroll-view class="form-scroll" scroll-y> -->
         <!-- 安检员信息分组 (默认折叠) -->
-        <view class="card">
-          <uni-collapse class="collapse" :accordion="false" :value="['group1']">
-            <uni-collapse-item class="collapse-item" title="安检员信息" name="group1" :show-animation="true">
-              <template v-slot:title>
-                <view class="header-section collapse-title userInfo">
-                  <view class="userName">{{ `${type !== 'add' ? '查获人:' : ''}` }}{{ type !==
-                    'add' ? `${formData.inspectUserName}（${formData.createBy}）` :
-                    `${userInfo.nickName}（${userInfo.userName}）`
-                  }}
-                  </view>
-                  <view class="teamInfo" v-if="type !== 'add'">
-                    <view>{{ formData.inspectUserRoleName }}</view>
-                    <view class="team">
-
-                      <view v-if="formData.inspectStationName">
-                        {{ formData.inspectStationName }}
-                      </view>
-                      <view v-if="formData.inspectDepartmentName">
-                        /{{ formData.inspectDepartmentName }}
-                      </view>
-                      <view v-if="formData.inspectTeamName">
-                        /{{ formData.inspectTeamName }}
-                      </view>
+        <!-- <view class="card" style="overflow: visible;"> -->
+        <uni-collapse class="collapse" :class="firstCollapsed.length > 0 ? 'collapse-card' : 'collapse-card-hidden'"
+          :accordion="false" v-model="firstCollapsed" @change="changeCollapse">
+          <uni-collapse-item class="collapse-item" title="安检员信息" name="group1" :show-animation="true">
+            <template v-slot:title>
+              <view class="header-section collapse-title userInfo">
+                <view class="userName">{{ `${type !== 'add' ? '查获人:' : ''}` }}{{ type !==
+                  'add' ? `${formData.inspectUserName}（${formData.createBy}）` :
+                  `${userInfo.nickName}（${userInfo.userName}）`
+                }}
+                </view>
+                <view class="teamInfo" v-if="type !== 'add'">
+                  <view>{{ formData.inspectUserRoleName }}</view>
+                  <view class="team">
+
+                    <view v-if="formData.inspectStationName">
+                      {{ formData.inspectStationName }}
                     </view>
-                  </view>
-                  <view class="teamInfo" v-else>
-                    <view>安检员</view>
-                    <view class="team">
-
-                      <view v-if="userInfo.stationName">
-                        {{ userInfo.stationName }}
-                      </view>
-                      <view v-if="userInfo.departmentName">
-                        /{{ userInfo.departmentName }}
-                      </view>
-                      <view v-if="userInfo.teamsName">
-                        /{{ userInfo.teamsName }}
-                      </view>
+                    <view v-if="formData.inspectDepartmentName">
+                      /{{ formData.inspectDepartmentName }}
+                    </view>
+                    <view v-if="formData.inspectTeamName">
+                      /{{ formData.inspectTeamName }}
                     </view>
                   </view>
-
                 </view>
-              </template>
+                <view class="teamInfo" v-else>
+                  <view>安检员</view>
+                  <view class="team">
 
-              <uni-forms-item label="查获时间" name="seizureTime" required>
-                <uni-datetime-picker :disabled="isDetailMode" type="datetime" :start="startDate" :end="endDate"
-                  v-model="formData.seizureTime" />
-              </uni-forms-item>
-
-              <uni-forms-item label="安检岗位" name="checkMethodText" required>
-                <uni-combox :disabled="isDetailMode" :candidates="checkMethodCandidates" placeholder="请选择安检岗位"
-                  v-model="formData.checkMethodText" @input="onCheckMethodComboxChange" />
-              </uni-forms-item>
-
-              <uni-forms-item label="查获位置" name="securityLocation" required>
-                <uni-data-picker v-if="!isDetailMode" :readonly="isDetailMode" :localdata="position_options"
-                  popup-title="请选择查获位置" v-model="formData.securityLocation" @change="onLocationChange" />
-                <uni-easyinput v-else :disabled="true" placeholder="请选择查获班组" :value="formData.securityLocationText" />
-              </uni-forms-item>
-
-              <uni-forms-item label="查获班组" name="reportTeam" required>
-                <uni-data-picker v-if="!isDetailMode" :readonly="isDetailMode" :localdata="teams" popup-title="请选择查获班组"
-                  v-model="formData.reportTeam" @change="onReportTeamChange" />
+                    <view v-if="userInfo.stationName">
+                      {{ userInfo.stationName }}
+                    </view>
+                    <view v-if="userInfo.departmentName">
+                      /{{ userInfo.departmentName }}
+                    </view>
+                    <view v-if="userInfo.teamsName">
+                      /{{ userInfo.teamsName }}
+                    </view>
+                  </view>
+                </view>
 
-                <uni-easyinput v-else :disabled="true" placeholder="请选择查获班组" :value="formData.attendanceTeamName" />
-              </uni-forms-item>
-            </uni-collapse-item>
-          </uni-collapse>
-        </view>
+              </view>
+            </template>
+
+            <uni-forms-item label="查获时间" name="seizureTime" required>
+              <uni-datetime-picker :disabled="isDetailMode" type="datetime" :start="startDate" :end="endDate"
+                v-model="formData.seizureTime" />
+            </uni-forms-item>
+
+            <uni-forms-item label="安检岗位" name="checkMethodText" required>
+              <uni-combox :disabled="isDetailMode" :candidates="checkMethodCandidates" placeholder="请选择安检岗位"
+                v-model="formData.checkMethodText" @input="onCheckMethodComboxChange" />
+            </uni-forms-item>
+
+            <uni-forms-item label="查获位置" name="securityLocation" required>
+              <uni-data-picker v-if="!isDetailMode" :readonly="isDetailMode" :localdata="position_options"
+                popup-title="请选择查获位置" v-model="formData.securityLocation" @change="onLocationChange" />
+              <uni-easyinput v-else :disabled="true" placeholder="请选择查获班组" :value="formData.securityLocationText" />
+            </uni-forms-item>
+
+            <uni-forms-item label="查获班组" name="reportTeam" required>
+              <uni-data-picker v-if="!isDetailMode" :readonly="isDetailMode" :localdata="teams" popup-title="请选择查获班组"
+                v-model="formData.reportTeam" @change="onReportTeamChange" />
+
+              <uni-easyinput v-else :disabled="true" placeholder="请选择查获班组" :value="formData.attendanceTeamName" />
+            </uni-forms-item>
+          </uni-collapse-item>
+        </uni-collapse>
+        <!-- </view> -->
 
         <!-- 违禁品信息分组 -->
         <view class="card">
@@ -164,7 +165,7 @@
         <view class="card" v-if="!isDetailMode || isDetailMode && formData.images.length > 0">
           <uni-collapse class="collapse" :accordion="false" :value="['group4']">
             <uni-collapse-item class="collapse-item" title="违禁品照片 (可选)" name="group4" :show-animation="true">
-              <view style="padding: 0 15px 15px 15px;">
+              <view style="padding: 0 15px 15px 15px;margin-bottom: 150rpx;">
                 <uni-file-picker :disabled="isDetailMode" v-model="formData.images" limit="8" title="最多上传8张"
                   :image-styles="imageStyles" fileMediatype="image" mode="grid" @select="onSelect" />
               </view>
@@ -429,7 +430,8 @@ export default {
       nodeCode: '',
       id: '',
       type: '',
-      approvalHistory: []
+      approvalHistory: [],
+      firstCollapsed: ["group1"],
     }
   },
   async onLoad(options) {
@@ -446,7 +448,7 @@ export default {
     this.type = params?.type || 'add';
     // }
     await this.initPageData();
-     if (this.type == 'add') {
+    if (this.type == 'add') {
       this.invokerGetLocationsbyTime()
     }
 
@@ -468,6 +470,9 @@ export default {
     //   this.formData.comment = rejectReason
     //   this.handleApproveReject()
     // },
+    changeCollapse(e) {
+      this.firstCollapsed = e
+    },
     //审批通过
     async handleApprovePass() {
       try {
@@ -549,7 +554,10 @@ export default {
     // 填充表单数据
     fillFormData(detailData) {
       if (!detailData) return;
-
+      let files = detailData?.itemSeizureItemsList[0].baseAttachmentList.map(file => ({
+        ...file,
+        url: file.attachmentUrl || file.url,
+      }))
       // 填充基础信息
       this.formData = {
         ...this.formData,
@@ -572,13 +580,13 @@ export default {
         partType: detailData?.itemSeizureItemsList[0].checkPositionCodeTwo,
         partTypeText: detailData?.itemSeizureItemsList[0].checkPositionNameTwo,
         forbiddenName: detailData?.itemSeizureItemsList[0].itemName,
-        images: detailData?.itemSeizureItemsList[0].baseAttachmentList || [],
+        images: files || [],
         location: detailData?.itemSeizureItemsList[0].location,
         isActiveConcealment: String(detailData?.itemSeizureItemsList[0].isActiveConcealment),
         handlingMethodDesc: detailData?.itemSeizureItemsList[0].handlingMethodDesc,
         handlingMethod: detailData?.itemSeizureItemsList[0].handlingMethod,
         // reportTeamText:`${detailData?.inspectStationName}/${detailData?.inspectBrigadeName}/${detailData?.inspectDepartmentName}/${detailData?.inspectTeamName}`,
-        securityLocationText:`${detailData?.terminlName}/${detailData?.regionalName}/${detailData?.channelName}`
+        securityLocationText: `${detailData?.terminlName}/${detailData?.regionalName}/${detailData?.channelName}`
       };
 
       this.$nextTick(() => {
@@ -614,7 +622,7 @@ export default {
     },
 
     searchLoadData(val) {
-      return categoryList(val).then(res => {
+      return categoryList({ name: val, level: 2 }).then(res => {
         return res.data
       })
     },
@@ -803,35 +811,41 @@ export default {
 
     // 选择文件后手动上传
     async onSelect(event) {
+      // 由于限制只能上传1个文件，直接取第一个文件进行上传
+      const files = await this.uploadFile(event);
 
-      const file = await this.uploadFile(event)
-      console.log("file", file)
-      console.log("上传成功====");
-      this.formData.images.push({
+      console.log("上传成功====", files);
+      let fileArr = files.map(file => ({
         url: file.url,
         name: file.newFileName,
         attachmentName: file.newFileName,
         attachmentUrl: file.url,
         extname: file.newFileName.split('.').pop()
-      });
+      }))
+      // 直接替换而不是追加，因为限制只能上传1张
+      this.formData.images = [
+        ...this.formData.images,
+        ...fileArr
+      ];
     },
 
     // 封装上传
     uploadFile(event) {
-      return new Promise((resolve, reject) => {
-        uni.uploadFile({
-          url: `${config.baseUrl}/common/upload`,
-          filePath: event.tempFilePaths[0], // 取第一个文件
-          name: 'file',
-          header: { Authorization: 'Bearer ' + getToken() },
-          formData: {
-            // 可添加其他参数
-          },
-          success: (res) => resolve(JSON.parse(res.data)),
-          fail: reject
+      return Promise.all(event.tempFilePaths.map(filePath => {
+        return new Promise((resolve, reject) => {
+          uni.uploadFile({
+            url: `${config.baseUrl}/common/upload`,
+            filePath: filePath,
+            name: 'file',
+            header: { Authorization: 'Bearer ' + getToken() },
+            formData: {
+              // 可添加其他参数
+            },
+            success: (res) => resolve(JSON.parse(res.data)),
+            fail: reject
+          });
         });
-      });
-
+      }));
     },
 
     formatDateTime(date) {
@@ -850,25 +864,25 @@ export default {
       this.formData.securityLocation = arr[arr.length - 1]?.value || '';
       this.formData.securityLocationText = arr.map(item => item.text).join('/');
       const locationResult = this.getParentLocation(this.formData.securityLocation)
-        console.log(locationResult);
-
-        // 安全地处理可能为null的结果
-        if (locationResult) {
-          this.formData.terminlName = locationResult.grandParent?.text || '';
-          this.formData.terminlCode = locationResult.grandParent?.value || '';
-          this.formData.regionalName = locationResult.parent?.text || '';
-          this.formData.regionalCode = locationResult.parent?.value || '';
-          this.formData.channelName = locationResult.current?.text || '';
-          this.formData.channelCode = locationResult.current?.value || '';
-        } else {
-          // 如果找不到位置信息，清空相关字段
-          this.formData.terminlName = '';
-          this.formData.terminlCode = '';
-          this.formData.regionalName = '';
-          this.formData.regionalCode = '';
-          this.formData.channelName = '';
-          this.formData.channelCode = '';
-        }
+      console.log(locationResult);
+
+      // 安全地处理可能为null的结果
+      if (locationResult) {
+        this.formData.terminlName = locationResult.grandParent?.text || '';
+        this.formData.terminlCode = locationResult.grandParent?.value || '';
+        this.formData.regionalName = locationResult.parent?.text || '';
+        this.formData.regionalCode = locationResult.parent?.value || '';
+        this.formData.channelName = locationResult.current?.text || '';
+        this.formData.channelCode = locationResult.current?.value || '';
+      } else {
+        // 如果找不到位置信息，清空相关字段
+        this.formData.terminlName = '';
+        this.formData.terminlCode = '';
+        this.formData.regionalName = '';
+        this.formData.regionalCode = '';
+        this.formData.channelName = '';
+        this.formData.channelCode = '';
+      }
     },
 
     // 通用取值：只拿最后一级
@@ -1144,11 +1158,34 @@ export default {
     padding: 15px;
   }
 
+  .collapse-card {
+    border-radius: 12px;
+    margin: 15px 0;
+    box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px;
+
+    ::v-deep .uni-collapse-item__wrap {
+      overflow: visible !important;
+      border-radius: 12px;
+    }
+  }
+
+  .collapse-card-hidden {
+    border-radius: 12px;
+    margin: 15px 0;
+    box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px;
+
+    ::v-deep .uni-collapse-item__wrap {
+      overflow: hidden !important;
+      border-radius: 12px;
+    }
+  }
+
+
   .card {
     border-radius: 12px;
     overflow: hidden;
     margin: 15px 0;
-    // overflow: visible;
+
     box-shadow: rgba(0, 0, 0, 0.08) 0px 0px 3px 1px;
 
     .gridWrap {
@@ -1162,9 +1199,7 @@ export default {
       border-radius: 16px;
     }
 
-    // ::v-deep .uni-collapse-item__wrap {
-    //   overflow: visible !important;
-    // }
+
   }
 
   .userInfo {

src/pages/seizedReportedVoice/index.vue

@@ -166,7 +166,7 @@
         <view class="card" v-if="!isDetailMode || isDetailMode && formData.images.length > 0">
           <uni-collapse class="collapse" :accordion="false" :value="['group4']">
             <uni-collapse-item class="collapse-item" title="违禁品照片 (可选)" name="group4" :show-animation="true">
-              <view style="padding: 0 15px 15px 15px;">
+              <view style="padding: 0 15px 15px 15px;margin-bottom: 150rpx;">
                 <uni-file-picker :disabled="isDetailMode" v-model="formData.images" limit="8" title="最多上传8张"
                   :image-styles="imageStyles" fileMediatype="image" mode="grid" @select="onSelect" />
               </view>
@@ -827,7 +827,10 @@ export default {
     // 填充表单数据
     fillFormData(detailData) {
       if (!detailData) return;
-
+      let files = detailData?.itemSeizureItemsList[0].baseAttachmentList.map(file => ({
+        ...file,
+        url: file.attachmentUrl || file.url,
+      }))
       // 填充基础信息
       this.formData = {
         ...this.formData,
@@ -850,7 +853,7 @@ export default {
         partType: detailData?.itemSeizureItemsList[0].checkPositionCodeTwo,
         partTypeText: detailData?.itemSeizureItemsList[0].checkPositionNameTwo,
         forbiddenName: detailData?.itemSeizureItemsList[0].itemName,
-        images: detailData?.itemSeizureItemsList[0].baseAttachmentList || [],
+        images: files || [],
         location: detailData?.itemSeizureItemsList[0].location,
         isActiveConcealment: String(detailData?.itemSeizureItemsList[0].isActiveConcealment),
         handlingMethodDesc: detailData?.itemSeizureItemsList[0].handlingMethodDesc,
@@ -892,7 +895,7 @@ export default {
     },
 
     searchLoadData(val) {
-      return categoryList(val).then(res => {
+      return categoryList({ name: val, level: 2 }).then(res => {
         return res.data
       })
     },
@@ -1082,35 +1085,41 @@ export default {
 
     // 选择文件后手动上传
     async onSelect(event) {
+      // 由于限制只能上传1个文件，直接取第一个文件进行上传
+      const files = await this.uploadFile(event);
 
-      const file = await this.uploadFile(event)
-      console.log("file", file)
-      console.log("上传成功====");
-      this.formData.images.push({
+      console.log("上传成功====", files);
+      let fileArr = files.map(file => ({
         url: file.url,
         name: file.newFileName,
         attachmentName: file.newFileName,
         attachmentUrl: file.url,
         extname: file.newFileName.split('.').pop()
-      });
+      }))
+      // 直接替换而不是追加，因为限制只能上传1张
+      this.formData.images = [
+        ...this.formData.images,
+        ...fileArr
+      ];
     },
 
     // 封装上传
     uploadFile(event) {
-      return new Promise((resolve, reject) => {
-        uni.uploadFile({
-          url: `${config.baseUrl}/common/upload`,
-          filePath: event.tempFilePaths[0], // 取第一个文件
-          name: 'file',
-          header: { Authorization: 'Bearer ' + getToken() },
-          formData: {
-            // 可添加其他参数
-          },
-          success: (res) => resolve(JSON.parse(res.data)),
-          fail: reject
+      return Promise.all(event.tempFilePaths.map(filePath => {
+        return new Promise((resolve, reject) => {
+          uni.uploadFile({
+            url: `${config.baseUrl}/common/upload`,
+            filePath: filePath,
+            name: 'file',
+            header: { Authorization: 'Bearer ' + getToken() },
+            formData: {
+              // 可添加其他参数
+            },
+            success: (res) => resolve(JSON.parse(res.data)),
+            fail: reject
+          });
         });
-      });
-
+      }));
     },
 
     formatDateTime(date) {

src/pages/workProfile/index.vue

@@ -144,11 +144,20 @@ export default {
             userInfo: state => state.user.userInfo,
             userRoles: state => state.user.roles || [],
         }),
+        currentUser() {
+            return this.$store.state.user.userInfo;
+        },
         isSpecialUser() {
-            return this.userRoles.includes('test') || this.userRoles.includes('zhijianke')
+            return this.userRoles.includes('test')
+        },
+        isJingLi() {
+            return this.userRoles.includes('jingli')
         },
         isKeZhang() {
             return this.userRoles.includes('kezhang')
+        },
+        curUserRoles() {
+            return this.$store.state.user && this.$store.state.user.roles;
         }
     },
 
@@ -193,31 +202,51 @@ export default {
                 this.levelRateData = res.data || {};
             })
         },
-        getDept() {
-            return getDeptList().then(res => {
-                const { data } = res
-                let targetObj = data.find(item => item.id == '100' || item.label == '安检站');
+        async getDept() {
+            if (this.isSpecialUser) {
+                getDeptList().then(res => {
+                    const { data } = res
+                    let targetObj = data.find(item => item.id == '100' || item.label == '安检站');
+                    let arr = [
+                        targetObj,
+                        ...targetObj.children
+                    ]
+                    this.levelOptions = arr.map(item => ({
+                        ...item,
+                        value: item.id,
+                        text: item.label
+                    }))
+                    //如果是站长质检科的就赋值安检站
+                    if (this.isSpecialUser) {
+                        this.selectedLevel = arr[0].id
+                        this.handleLevelChange(arr[0].id)
+                    }
+                    // if (this.isKeZhang) {
+
+                    //     this.selectedLevel = this.userInfo.departmentId
+                    //     this.handleLevelChange(this.userInfo.departmentId)
+                    // }
+
+                })
+            }
+            if (this.isJingLi) {
+
+                const deptId = this.currentUser.deptId;
+                const subDeptTree = await getDeptList({ parentId: deptId });
+                console.log(subDeptTree, "subDeptTree", this.currentUser)
                 let arr = [
-                    targetObj,
-                    ...targetObj.children
+                    { id: deptId, label: '本队' },
+                    ...subDeptTree.data
                 ]
                 this.levelOptions = arr.map(item => ({
                     ...item,
                     value: item.id,
                     text: item.label
                 }))
-                //如果是站长质检科的就赋值安检站
-                if (this.isSpecialUser) {
-                    this.selectedLevel = arr[0].id
-                    this.handleLevelChange(arr[0].id)
-                }
-                if (this.isKeZhang) {
-
-                    this.selectedLevel = this.userInfo.departmentId
-                    this.handleLevelChange(this.userInfo.departmentId)
-                }
+                this.selectedLevel = arr[0].id
+                this.handleLevelChange(arr[0].id)
+            }
 
-            })
         },
         //获取总览
         getOverviewData() {
@@ -241,7 +270,7 @@ export default {
             getChannelOpenTrendChart(specialParams).then(res => {
                 this.channelOpenTrendData = res || [];
             })
-            getSeizureTrendChart(this.selectedLevelType == 'department'?params:{}).then(res => {
+            getSeizureTrendChart(this.selectedLevelType == 'department' ? params : {}).then(res => {
                 this.seizureTrendData = res.data || [];
             })
         },
@@ -285,9 +314,10 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.workProfileContainer{
+.workProfileContainer {
     padding: 20rpx;
 }
+
 .page-header {
     margin-bottom: 32rpx;
 
@@ -308,12 +338,12 @@ export default {
     z-index: 999;
     width: 95%;
     padding: 20rpx 20rpx 20rpx 30rpx;
-    
+
 
 
 
     .filter-select {
-        width: 205rpx !important;
+        width: 255rpx !important;
 
         ::v-deep .uni-stat-box {
             background: transparent !important;
@@ -325,7 +355,7 @@ export default {
 
             .uni-select__input-text {
                 font-weight: bold;
-                font-size:38rpx;
+                font-size: 38rpx;
             }
 
             .uni-select--disabled {

src/utils/common.js

@@ -92,17 +92,29 @@ export function serializeData(obj) {
 }
 
 
-export function buildTeamOptions(tree = []) {
+export function buildTeamOptions(tree = [], includeFullData = false) {
   const result = [];
 
   function dfs(node, path = []) {
     const currentPath = [...path, node.label];
     // 如果是 TEAMS 叶子节点
     if (node.deptType === 'TEAMS') {
-      result.push({
-        text: currentPath.join(' / '),
-        value: node.id
-      });
+      if (includeFullData) {
+        // 包含完整节点数据
+        result.push({
+          ...node,
+          text: currentPath.join(' / '),
+          value: node.id,
+          path: currentPath,
+          children: null
+        });
+      } else {
+        // 只包含text和value
+        result.push({
+          text: currentPath.join(' / '),
+          value: node.id
+        });
+      }
     }
     // 继续递归子节点
     if (node.children && Array.isArray(node.children)) {
@@ -117,19 +129,32 @@ export function buildTeamOptions(tree = []) {
 /**
  * 找出deptType为DEPARTMENT的节点
  * @param {Array} tree - 树形结构数据
+ * @param {boolean} includeFullData - 是否包含节点的完整数据，默认false
  * @returns {Array} 包含所有DEPARTMENT节点的数组
  */
-export function buildDepartmentOptions(tree = []) {
+export function buildDepartmentOptions(tree = [], includeFullData = false) {
   const result = [];
 
   function dfs(node, path = []) {
     const currentPath = [...path, node.label];
     // 如果是 DEPARTMENT 节点
     if (node.deptType === 'DEPARTMENT') {
-      result.push({
-        text: currentPath.join(' / '),
-        value: node.id
-      });
+      if (includeFullData) {
+        // 包含完整节点数据
+        result.push({
+          ...node,
+          text: currentPath.join(' / '),
+          value: node.id,
+          path: currentPath,
+          children: null
+        });
+      } else {
+        // 只包含text和value
+        result.push({
+          text: currentPath.join(' / '),
+          value: node.id
+        });
+      }
     }
     // 继续递归子节点
     if (node.children && Array.isArray(node.children)) {
@@ -144,19 +169,72 @@ export function buildDepartmentOptions(tree = []) {
 /**
  * 找出deptType为BRIGADE的节点
  * @param {Array} tree - 树形结构数据
+ * @param {boolean} includeFullData - 是否包含节点的完整数据，默认false
  * @returns {Array} 包含所有BRIGADE节点的数组
  */
-export function buildBrigadeOptions(tree = []) {
+export function buildBrigadeOptions(tree = [], includeFullData = false) {
   const result = [];
 
   function dfs(node, path = []) {
     const currentPath = [...path, node.label];
     // 如果是 DEPARTMENT 节点
     if (node.deptType === 'BRIGADE') {
-      result.push({
-        text: currentPath.join(' / '),
-        value: node.id
-      });
+      if (includeFullData) {
+        // 包含完整节点数据
+        result.push({
+          ...node,
+          text: currentPath.join(' / '),
+          value: node.id,
+          path: currentPath,
+          children: null
+        });
+      } else {
+        // 只包含text和value
+        result.push({
+          text: currentPath.join(' / '),
+          value: node.id
+        });
+      }
+    }
+    // 继续递归子节点
+    if (node.children && Array.isArray(node.children)) {
+      node.children.forEach(child => dfs(child, currentPath));
+    }
+  }
+
+  tree.forEach(root => dfs(root));
+  return result;
+}
+
+/**
+ * 找出deptType为BRIGADE的节点
+ * @param {Array} tree - 树形结构数据
+ * @param {boolean} includeFullData - 是否包含节点的完整数据，默认false
+ * @returns {Array} 包含所有BRIGADE节点的数组
+ */
+export function buildManagerOptions(tree = [], includeFullData = false) {
+  const result = [];
+
+  function dfs(node, path = []) {
+    const currentPath = [...path, node.label];
+    // 如果是 DEPARTMENT 节点
+    if (node.deptType === 'MANAGER') {
+      if (includeFullData) {
+        // 包含完整节点数据
+        result.push({
+          ...node,
+          text: currentPath.join(' / '),
+          value: node.id,
+          path: currentPath,
+          children: null
+        });
+      } else {
+        // 只包含text和value
+        result.push({
+          text: currentPath.join(' / '),
+          value: node.id
+        });
+      }
     }
     // 继续递归子节点
     if (node.children && Array.isArray(node.children)) {
@@ -444,3 +522,5 @@ export function checkRolePermission(role, path) {
   return rolePermissions[role].includes(path);
 }
 
+
+