feat: 添加大队级别检查功能并支持Electron桌面应用

refactor(utils): 新增大队级别选项构建函数
feat(api): 添加查询部门指定角色人员接口
feat(pages): 在问题整改和检查单页面支持大队级别检查
feat(electron): 新增Electron桌面应用支持
build: 添加electron-builder配置和打包脚本
style(login): 调整验证码输入框布局
chore: 更新.gitignore忽略electron打包目录

.gitignore

@@ -3,6 +3,7 @@ node_modules/
 unpackage/
 dist/
 dist.zip
+dist_electron
 CLAUDE.md
 # local env files
 .env.local

electron-builder.json

@@ -0,0 +1,44 @@
+{
+  "appId": "com.meilan.app",
+  "productName": "美兰机场应用",
+  "directories": {
+    "output": "dist_electron",
+    "buildResources": "build"
+  },
+  "files": [
+    "dist/build/h5/**/*",
+    "electron/**/*",
+    "!**/node_modules/**/*"
+  ],
+  "extraResources": [
+    {
+      "from": "dist/build/h5",
+      "to": "app/dist/build/h5",
+      "filter": ["**/*"]
+    }
+  ],
+  "mac": {
+    "category": "public.app-category.productivity",
+    "icon": "dist/build/h5/static/pc.png"
+  },
+  "win": {
+    "target": [
+      {
+        "target": "nsis",
+        "arch": ["x64"]
+      }
+    ],
+    "icon": "dist/build/h5/static/pc.png"
+  },
+  "nsis": {
+    "oneClick": false,
+    "allowToChangeInstallationDirectory": true,
+    "createDesktopShortcut": true,
+    "createStartMenuShortcut": true,
+    "shortcutName": "美兰机场应用"
+  },
+  "publish": {
+    "provider": "generic",
+    "url": "http://your-update-server.com/updates"
+  }
+}

electron/main.js

@@ -0,0 +1,176 @@
+const { app, BrowserWindow, Menu } = require('electron')
+const path = require('path')
+const isDev = process.env.NODE_ENV === 'development'
+
+// 保持对窗口对象的全局引用，避免被垃圾回收
+let mainWindow
+
+function createWindow() {
+  // 创建浏览器窗口
+  mainWindow = new BrowserWindow({
+    width: 600,
+    height: 800,
+    minWidth: 100,
+    minHeight: 300,
+    webPreferences: {
+      nodeIntegration: false,
+      contextIsolation: true,
+      webSecurity: false, // 禁用webSecurity以允许跨域请求
+      allowRunningInsecureContent: true, // 允许不安全内容
+      enableRemoteModule: false, // 禁用远程模块，提高安全性
+      webgl: true,
+      images: true
+    },
+    icon: path.join(__dirname, '../../dist/build/h5/static/pc.png'), // 应用图标
+    show: false // 先隐藏窗口，等加载完成再显示
+  })
+
+  // 设置Content Security Policy
+  mainWindow.webContents.session.webRequest.onHeadersReceived((details, callback) => {
+    callback({
+      responseHeaders: {
+        ...details.responseHeaders,
+        'Content-Security-Policy': [
+          "default-src * 'unsafe-inline' 'unsafe-eval' data: blob:; " +
+          "script-src * 'unsafe-inline' 'unsafe-eval'; " +
+          "connect-src * 'unsafe-inline'; " +
+          "img-src * data: blob: 'unsafe-inline'; " +
+          "frame-src *; " +
+          "style-src * 'unsafe-inline'; " +
+          "font-src * data:; " +
+          "media-src *"
+        ]
+      }
+    })
+  })
+
+  // 加载应用
+  if (isDev) {
+    // 开发环境：加载本地H5开发服务器
+    mainWindow.loadURL('http://localhost:9090')
+    // 打开开发者工具
+    mainWindow.webContents.openDevTools()
+  } else {
+    // 生产环境：加载打包后的文件
+    const fs = require('fs')
+    let indexPath
+    
+    // 尝试多种可能的路径
+    const possiblePaths = [
+      // 打包后路径1：resources/app/dist/build/h5
+      process.resourcesPath ? path.join(process.resourcesPath, 'app', 'dist', 'build', 'h5', 'index.html') : null,
+      // 打包后路径2：resources/app
+      process.resourcesPath ? path.join(process.resourcesPath, 'app', 'index.html') : null,
+      // 打包后路径3：直接位于应用目录
+      path.join(__dirname, '..', 'dist', 'build', 'h5', 'index.html'),
+      // 开发环境路径
+      path.join(__dirname, '..', '..', 'dist', 'build', 'h5', 'index.html'),
+      // 备用路径
+      path.join(__dirname, 'dist', 'build', 'h5', 'index.html')
+    ].filter(Boolean)
+    
+    // 查找存在的文件
+    for (const testPath of possiblePaths) {
+      console.log('Testing path:', testPath)
+      if (fs.existsSync(testPath)) {
+        indexPath = testPath
+        console.log('Found index file at:', indexPath)
+        break
+      }
+    }
+    
+    if (indexPath && fs.existsSync(indexPath)) {
+      // 使用 loadFile 方法加载文件
+      mainWindow.loadFile(indexPath)
+      console.log('Successfully loaded index file from:', indexPath)
+    } else {
+      console.error('Index file not found in any of the following paths:')
+      possiblePaths.forEach(p => console.error('  -', p))
+      
+      // 显示详细的错误信息
+      const errorHtml = `
+        <html>
+          <head><title>应用加载失败</title></head>
+          <body style="font-family: Arial, sans-serif; padding: 20px;">
+            <h1>应用文件加载失败</h1>
+            <p>无法找到 index.html 文件，请检查以下路径：</p>
+            <ul>
+              ${possiblePaths.map(p => `<li>${p}</li>`).join('')}
+            </ul>
+            <p>请重新安装应用或联系技术支持。</p>
+          </body>
+        </html>
+      `
+      mainWindow.loadURL(`data:text/html,${encodeURIComponent(errorHtml)}`)
+    }
+  }
+
+  // 窗口准备好后显示
+  mainWindow.once('ready-to-show', () => {
+    mainWindow.show()
+  })
+
+  // 窗口关闭时触发
+  mainWindow.on('closed', () => {
+    mainWindow = null
+  })
+
+  // 设置菜单（可选）
+  const template = [
+    {
+      label: '文件',
+      submenu: [
+        {
+          label: '退出',
+          accelerator: process.platform === 'darwin' ? 'Cmd+Q' : 'Ctrl+Q',
+          click() {
+            app.quit()
+          }
+        }
+      ]
+    },
+    {
+      label: '视图',
+      submenu: [
+        { role: 'reload', label: '重新加载' },
+        { role: 'forceReload', label: '强制重新加载' },
+        { role: 'toggleDevTools', label: '开发者工具' },
+        { type: 'separator' },
+        { role: 'resetZoom', label: '实际大小' },
+        { role: 'zoomIn', label: '放大' },
+        { role: 'zoomOut', label: '缩小' },
+        { type: 'separator' },
+        { role: 'togglefullscreen', label: '切换全屏' }
+      ]
+    }
+  ]
+
+  const menu = Menu.buildFromTemplate(template)
+  Menu.setApplicationMenu(menu)
+}
+
+// Electron 初始化完成时触发
+app.whenReady().then(createWindow)
+
+// 所有窗口关闭时退出应用（macOS除外）
+app.on('window-all-closed', () => {
+  if (process.platform !== 'darwin') {
+    app.quit()
+  }
+})
+
+// macOS 应用激活时重新创建窗口
+app.on('activate', () => {
+  if (BrowserWindow.getAllWindows().length === 0) {
+    createWindow()
+  }
+})
+
+// 安全设置：阻止新窗口创建
+app.on('web-contents-created', (event, contents) => {
+  contents.on('new-window', (event, navigationUrl) => {
+    event.preventDefault()
+    // 在默认浏览器中打开外部链接
+    require('electron').shell.openExternal(navigationUrl)
+  })
+})

package.json

@@ -1,6 +1,8 @@
 {
   "name": "ruoyi-app-project",
   "version": "1.0.0",
+  "description": "美兰机场移动应用 - 基于uni-app开发的跨平台应用",
+  "author": "美兰机场技术团队",
   "private": true,
   "scripts": {
     "dev": "npm run dev:h5",
@@ -8,6 +10,10 @@
     "build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build",
     "build:custom": "cross-env NODE_ENV=production uniapp-cli custom",
     "build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
+    "electron:dev": "cross-env NODE_ENV=development electron electron/main.js",
+    "electron:build": "npm run build:h5 && electron-builder",
+    "electron:pack": "npm run build:h5 && electron-builder --dir",
+    "electron:dist": "npm run build:h5 && electron-builder --win --x64",
     "build:mp-360": "cross-env NODE_ENV=production UNI_PLATFORM=mp-360 vue-cli-service uni-build",
     "build:mp-alipay": "cross-env NODE_ENV=production UNI_PLATFORM=mp-alipay vue-cli-service uni-build",
     "build:mp-baidu": "cross-env NODE_ENV=production UNI_PLATFORM=mp-baidu vue-cli-service uni-build",
@@ -95,6 +101,8 @@
     "autoprefixer": "^8.0.0",
     "babel-plugin-import": "^1.11.0",
     "cross-env": "^7.0.2",
+    "electron": "^19.0.0",
+    "electron-builder": "^23.0.0",
     "jest": "^25.4.0",
     "postcss-comment": "^2.0.0",
     "postcss-loader": "^8.1.1",
@@ -108,5 +116,39 @@
   ],
   "uni-app": {
     "scripts": {}
+  },
+  "main": "electron/main.js",
+  "homepage": "./",
+  "build": {
+    "appId": "com.meilan.app",
+    "productName": "美兰机场应用",
+    "directories": {
+      "output": "dist_electron"
+    },
+    "electronDownload": {
+      "mirror": "https://npmmirror.com/mirrors/electron/"
+    },
+    "files": [
+      "dist/build/h5/**/*",
+      "electron/**/*"
+    ],
+    "win": {
+      "target": [
+        {
+          "target": "nsis",
+          "arch": [
+            "x64"
+          ]
+        }
+      ],
+      "icon": "dist/build/h5/static/pc.png"
+    },
+    "nsis": {
+      "oneClick": false,
+      "allowToChangeInstallationDirectory": true,
+      "createDesktopShortcut": true,
+      "createStartMenuShortcut": true,
+      "shortcutName": "美兰机场应用"
+    }
   }
 }

src/api/check/checklist.js

@@ -67,4 +67,12 @@ export function getChecklistStatistics(params) {
     method: 'get',
     params: params
   })
+}
+//查询部门指定角色人员
+export function getDeptRoleUser(deptId,data) {
+  return request({
+    url: `/system/dept/deptRole/${deptId}`,
+    method: 'post',
+    data: data
+  })
 }

src/config.js

@@ -1,11 +1,11 @@
 // 应用全局配置
 module.exports = {
    // 接口地址  本地调试使用 http://192.168.3.222:38080  打包使用 /prod-api
-  //  baseUrl: process.env.NODE_ENV === 'development' ? 'http://192.168.3.221:82/prod-api' : '/prod-api', //生产
+ //  baseUrl: process.env.NODE_ENV === 'development' ? 'http://192.168.3.221:82/prod-api' : '/prod-api', //生产
   //  baseUrl: process.env.NODE_ENV === 'development' ? 'http://192.168.3.221:8080' : '/prod-api',
 // baseUrl: process.env.NODE_ENV === 'development' ? 'http://guangxi.qinghe.sundot.cn:8088' : 'http://guangxi.qinghe.sundot.cn:8088/prod-api',
-   baseUrl: 'http://guangxi.qinghe.sundot.cn:8088',
-
+// baseUrl: 'http://guangxi.qinghe.sundot.cn:8088',
+    baseUrl:'http://airport.samsundot.com:9021/prod-api',
   // 应用信息
   appInfo: {
     // 应用名称

src/pages/checklist/index.vue

@@ -27,9 +27,13 @@
                                 <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"
+                                    :popup-title="`请选择${getCheckLabel}`" v-model="formData.checkedBrigadeId"
+                                    @change="handlecheckedBrigadeIdChange" :readonly="formDisabled" />
                                 <uni-data-picker v-if="getCheckLabel == '被检查班组'" :localdata="teams"
                                     :popup-title="`请选择${getCheckLabel}`" v-model="formData.checkedTeamId"
                                     @change="handlecheckedTeamIdChange" :readonly="formDisabled" />
+
                                 <fuzzy-select v-if="getCheckLabel == '被检查人'" v-model="formData.checkedPersonnelId"
                                     :options="userOptions" placeholder="请输入被检查人姓名搜索" data-value="userId"
                                     data-text="nickName" @change="handleCheckedSelect" :disabled="formDisabled" />
@@ -138,8 +142,9 @@ 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, uploadFile, buildDepartmentOptions } from '@/utils/common'
+import { buildTeamOptions, uploadFile, buildDepartmentOptions, buildBrigadeOptions } from '@/utils/common'
 import useDictMixin from '@/utils/dict'
+import { getDeptRoleUser } from "@/api/check/checklist.js"
 import { addDraftInspection, submitInspection, getInspectionListById } from '@/api/check/checkReward.js'
 import SubmitResult from './components/SubmitResult.vue'
 import { selectDeptLeaderByUserId } from '@/api/approve/approve.js'
@@ -196,6 +201,9 @@ export default {
             if (this.formData.checkedLevel == checkedLevelEnums.DEPARTMENT_LEVEL) {
                 return '被检查科'
             }
+            if (this.formData.checkedLevel == checkedLevelEnums.BRIGADE_LEVEL) {
+                return '被检查大队'
+            }
         },
         // 验证规则
         rules() {
@@ -254,6 +262,7 @@ export default {
             teams: [],//被检查班组选项
             departments: [],//被检查科选项
             userOptions: [],//全部的人
+            brigades: [],
             checkcheckedTeamIdOptions: [],
             // 表单数据
             formData: {
@@ -376,10 +385,12 @@ export default {
             this.formData.channelName = res[2]?.text;
             this.formData.channelCode = res[2]?.value;
         },
-        // 检查科/班组选择
+        // 检查班组选择
         handlecheckedTeamIdChange(e) {
             const { text, value } = e.detail.value[0];
             let newText = text.split('/')
+            this.$set(this.formData, 'checkedDeptId', value);
+            this.$set(this.formData, 'checkedDeptName', newText[newText.length - 1].trim());
             this.$set(this.formData, 'checkedTeamName', newText[newText.length - 1]);
 
             // 在树状结构中查找指定id的上一级id
@@ -430,6 +441,8 @@ export default {
             const { text, value } = e.detail.value[0];
 
             let newText = text.split('/')
+            this.$set(this.formData, 'checkedDeptId', value);
+            this.$set(this.formData, 'checkedDeptName', newText[newText.length - 1].trim());
             this.$set(this.formData, 'checkedDepartmentName', newText[newText.length - 1].trim());
             getDeptManager(value).then(res => {
                 console.log(res?.data?.userId, "111res")
@@ -437,6 +450,20 @@ export default {
                 this.$set(this.formData, 'responsibleUserName', res?.data?.nickName || '');
             })
         },
+        handlecheckedBrigadeIdChange(e) {
+            const { text, value } = e.detail.value[0];
+            let newText = text.split('/')
+            this.$set(this.formData, 'checkedBrigadeName', newText[newText.length - 1].trim());
+            this.$set(this.formData, 'checkedDeptId', value);
+            this.$set(this.formData, 'checkedDeptName', newText[newText.length - 1].trim());
+            this.$set(this.formData, 'checkedDepartmentId', value);
+            this.$set(this.formData, 'checkedDepartmentName', newText[newText.length - 1].trim());
+            getDeptRoleUser(value, ['xingzheng']).then(res => {
+
+                this.$set(this.formData, 'responsibleUserId', res?.data[0].userId || '');
+                this.$set(this.formData, 'responsibleUserName', res?.data[0].nickName || '');
+            })
+        },
         // 加载字典数据
         async loadDictData() {
             const user = await listAllUser();
@@ -448,6 +475,7 @@ export default {
             this.deptTree = deptTree.data || [];
             this.teams = buildTeamOptions(deptTree.data || []);
             this.departments = buildDepartmentOptions(deptTree.data || []);
+            this.brigades = buildBrigadeOptions(deptTree.data || []);
             console.log(this.departments, "this.departments")
             const [positionRes] = await Promise.all([
                 treeSelectByType("POSITION", 3),
@@ -654,7 +682,7 @@ export default {
 
             let payload = {
                 ...this.formData,
-                checkedTeamName: (this.formData.checkedTeamName|| '').trim() ,
+                checkedTeamName: (this.formData.checkedTeamName || '').trim(),
                 checkProjectItemList: originalCheckProjectItemList
             };
 
@@ -724,6 +752,7 @@ export default {
                 uni.showLoading({ title: '提交中...', mask: true });
 
                 const payload = this.formateData();
+                debugger
 
                 submitInspection({ ...payload, ...(this.type == 'task' ? {} : { id: this.taskId }) })
                     .then(() => {

src/pages/login.vue

@@ -17,13 +17,17 @@
           <view class="iconfont icon-password icon"></view>
           <input v-model="loginForm.password" type="password" class="input" placeholder="请输入密码" maxlength="20" />
         </view>
-        <view class="input-item flex align-center" style="width: 60%;margin: 0px;" v-if="captchaEnabled">
-          <view class="iconfont icon-code icon"></view>
-          <input v-model="loginForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
+        <view style="display: flex; align-items: center;">
+          <view class="input-item flex align-center" style="flex:1;margin: 0px;" v-if="captchaEnabled">
+            <view class="iconfont icon-code icon"></view>
+            <input v-model="loginForm.code" type="number" class="input" placeholder="请输入验证码" maxlength="4" />
+
+          </view>
           <view class="login-code">
             <image :src="codeUrl" @click="getCode" class="login-code-img"></image>
           </view>
         </view>
+
         <view class="action-btn">
           <button @click="handleLogin" class="login-btn cu-btn block bg-blue lg round">登录</button>
         </view>
@@ -210,7 +214,7 @@ page {
       }
 
       .input {
-        width: 100%;
+    
         font-size: 14px;
         line-height: 20px;
         text-align: left;
@@ -235,12 +239,17 @@ page {
 
     .login-code {
       height: 38px;
-      float: right;
+      margin-left: 10rpx;
+      // position: absolute;
+
+      // left: 470rpx;
+
+
 
       .login-code-img {
         height: 38px;
-        position: absolute;
-        margin-left: 10px;
+
+
         width: 200rpx;
       }
     }

src/pages/myToDoList/index.vue

@@ -212,6 +212,9 @@ export default {
             if (this.getLabel(item.instance && item.instance.businessType) == '人') {
                 return this.getFormData(item, 'checkedPersonnelName');
             }
+            if (this.getLabel(item.instance && item.instance.businessType) == '大队') {
+                return this.getFormData(item, 'checkedBrigadeName');
+            }
             return '';
         },
         getLabel(key) {
@@ -224,9 +227,13 @@ export default {
             if (key === 'SECTION_CHECK') {
                 return '科室'
             }
+            if (key === 'BRIGADE_CHECK') {
+                return '大队'
+            }
             return ''
         },
         navigateToDetail(row) {
+            
             let type = 'view'; // 默认查看模式
             if (this.currentTab == 'msg') {
                 const { businessType, businessId, instanceId } = row;
@@ -271,7 +278,7 @@ export default {
                 url = `/pages/seizedReported/index?params=${encodeURIComponent(JSON.stringify(obj))}`;
             }
             // 巡检对应个人 班组  科室
-            if (['PERSONAL_CHECK', 'GROUP_CHECK', 'SECTION_CHECK'].includes(businessType) || this.currentTab == 'msg') {
+            if (['PERSONAL_CHECK', 'GROUP_CHECK', 'SECTION_CHECK', 'BRIGADE_CHECK'].includes(businessType) || this.currentTab == 'msg') {
                 url = `/pages/problemRect/index?params=${encodeURIComponent(JSON.stringify(obj))}`;
             }
             if (url) {

src/pages/problemRect/index.vue

@@ -23,6 +23,9 @@
                                 <uni-data-picker v-if="getCheckLabel == '被检查科'" :localdata="departments"
                                     :popup-title="`请选择${getCheckLabel}`" v-model="formData.checkedDepartmentId"
                                     :readonly="true" />
+                                <uni-data-picker v-if="getCheckLabel == '被检查大队'" :localdata="brigades"
+                                    :popup-title="`请选择${getCheckLabel}`" v-model="formData.checkedBrigadeId"
+                                    :readonly="true" />
                                 <uni-data-picker v-if="getCheckLabel == '被检查班组'" :localdata="teams"
                                     :popup-title="`请选择${getCheckLabel}`" v-model="formData.checkedTeamId"
                                     :readonly="true" />
@@ -206,7 +209,7 @@ import { listAllUser } from "@/api/system/user.js"
 import { getProblemRectDetail, approvalAgree, approvalReject } from '@/api/problemRect/problemRect.js'
 import { getApprovelHistory } from '@/api/approve/approve.js'
 import { getDeptManager, getDeptDetail } from "@/api/system/dept/dept.js"
-import { buildTeamOptions, buildDepartmentOptions } from "@/utils/common.js"
+import { buildTeamOptions, buildDepartmentOptions,buildBrigadeOptions } from "@/utils/common.js"
 export default {
     components: { HomeContainer, RejectModal },
     mixins: [useDictMixin],
@@ -214,6 +217,13 @@ export default {
         currentUser() {
             return this.$store.state.user;
         },
+        currentUserId() {
+            return this.currentUser && this.currentUser.id;
+        },
+        //表单责任人是当前登陆人
+        isResponsiblePerson() {
+            return this.currentUserId == this.formData.responsibleUserId;
+        },
         userInfo() {
             return (this.$store.state.user && this.$store.state.user.userInfo) ? this.$store.state.user.userInfo : {}
         },
@@ -243,6 +253,9 @@ export default {
             if (this.formData.checkedLevel == checkedLevelEnums.DEPARTMENT_LEVEL) {
                 return '被检查科'
             }
+            if (this.formData.checkedLevel == checkedLevelEnums.BRIGADE_LEVEL) {
+                return '被检查大队'
+            }
         },
         // 动态验证规则
         rules() {
@@ -282,6 +295,7 @@ export default {
             userOptions: [],
             teams: [], // 班组选项数据
             departments: [], // 部门选项数据
+            brigades: [], // 大队选项数据
             // 表单数据
             formData: {
                 // 基本信息
@@ -301,6 +315,10 @@ export default {
                 selectTeamName: '', // 整改班组名称
                 selectTeamLeaderId: '', // 班组长ID
                 selectTeamLeaderName: '', // 班组长姓名
+                
+                // 被检查对象相关字段
+                checkedBrigadeId: '', // 被检查大队ID
+                checkedBrigadeName: '', // 被检查大队名称
 
                 // 整改信息
                 rectificationDetails: '',
@@ -349,6 +367,14 @@ export default {
         handlecheckedDepartmentIdChange(e) {
 
         },
+        
+        // 被检查大队选择
+        handlecheckedBrigadeIdChange(e) {
+            const { text, value } = e.detail.value[0];
+            let newText = text.split('/')
+            this.$set(this.formData, 'checkedBrigadeName', newText[newText.length - 1].trim());
+            this.$set(this.formData, 'checkedBrigadeId', value);
+        },
         async loadDictData() {
             const user = await listAllUser();
             this.userOptions = user.data.map(item => ({
@@ -385,6 +411,7 @@ export default {
                 const deptTree = await getDeptList();
                 this.teams = buildTeamOptions(deptTree.data || []);
                 this.departments = buildDepartmentOptions(deptTree.data || []);
+                this.brigades = buildBrigadeOptions(deptTree.data || []);
                 uni.hideLoading();
             } catch (err) {
                 uni.hideLoading();
@@ -528,7 +555,7 @@ export default {
 
             // 还原checkProjectItemList结构到后端原始格式
             const restoredCheckProjectItemList = this.restoreOriginalCheckProjectItemList();
-
+            
             const payload = {
                 ...this.formData,
                 checkProjectItemList: restoredCheckProjectItemList,
@@ -553,6 +580,22 @@ export default {
 
         // 提交表单
         submitForm() {
+            // 如果当前用户是责任人，校验问题人字段必填
+            if (this.isResponsiblePerson) {
+                const hasEmptyProblemUser = this.formData.checkProjectItemList?.some(problem => 
+                    !problem.checkUserList || !problem.checkUserList.userId
+                );
+                
+                if (hasEmptyProblemUser) {
+                    uni.showToast({ 
+                        title: '请填写所有问题的责任人', 
+                        icon: 'none',
+                        duration: 3000
+                    });
+                    return;
+                }
+            }
+            
             this.$refs.form.validate().then(res => {
                 uni.showLoading({ title: '提交中...', mask: true });
 

src/utils/common.js

@@ -141,6 +141,33 @@ export function buildDepartmentOptions(tree = []) {
   return result;
 }
 
+/**
+ * 找出deptType为BRIGADE的节点
+ * @param {Array} tree - 树形结构数据
+ * @returns {Array} 包含所有BRIGADE节点的数组
+ */
+export function buildBrigadeOptions(tree = []) {
+  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 (node.children && Array.isArray(node.children)) {
+      node.children.forEach(child => dfs(child, currentPath));
+    }
+  }
+
+  tree.forEach(root => dfs(root));
+  return result;
+}
+
 //将数组格式的按照航站楼分成对象格式
 export function getHandleAreaData(data, notkezhang) {
   let louObj = {};

src/utils/enums.js

@@ -1,8 +1,9 @@
 export const checkedLevelEnums = {
     TEAM_LEVEL: 'TEAM_LEVEL',
     PERSONNEL_LEVEL: 'PERSONNEL_LEVEL',
-    DEPARTMENT_LEVEL: 'DEPARTMENT_LEVEL',
-    STATION_LEVEL: 'STATION_LEVEL'
+    DEPARTMENT_LEVEL: 'DEPARTMENT_LEVEL',//主管级别
+    STATION_LEVEL: 'STATION_LEVEL',
+    BRIGADE_LEVEL: 'BRIGADE_LEVEL',//大队级别
 }