feat(attendance): 添加上下班打卡按钮状态查询功能

fix(attendance): 修复人员选择数据字段错误问题
fix(checklist): 修正不合格项人员名称空格处理
fix(attendance): 调整上通道按钮禁用逻辑
feat(attendance): 增加考勤权限控制功能
fix(checklist): 完善表单验证字段和规则
fix(attendance): 优化维护区域/人员弹窗交互
fix(seizedReport): 修正查获位置和班组显示问题
fix(config): 更新接口地址配置

src/api/attendance/attendance.js

@@ -105,3 +105,11 @@ export function queryLastTime (data) {
     data: data
   })
 }
+
+//查询上班打卡和下班打卡是否可以点击
+export function queryClickAble () {
+  return request({
+    url: '/attendance/v1/getRecordType',
+    method: 'get',
+  })
+}

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://airport.samsundot.com:9021/prod-api',
+     baseUrl:'http://airport.samsundot.com:9021/prod-api',
   // 应用信息
   appInfo: {
     // 应用名称

src/pages/attendance/components/AddAttendancePersonnelModal.vue

@@ -217,7 +217,7 @@ export default {
               attendanceDate: moment().format('YYYY-MM-DD')
             }).then(res => {
               console.log(res.rows, "res.rows")
-              this.selectedUser = res.rows || []
+              this.selectedUser = res.data || []
 
             })
             return

src/pages/attendance/components/AttendanceControl.vue

@@ -1,7 +1,7 @@
 <template>
   <view>
     <view class="attendance-control">
-      <view class="control-btn" :class="{ disable: !result }" @click="clockIn(1)">
+      <view class="control-btn" :class="{ disable: !result || checkAbleType != '1' }" @click="clockIn(1)">
         <text class="control-btn-text">上班打卡</text>
       </view>
       <view class="attendance-info">
@@ -24,7 +24,7 @@
           </view>
         </view>
       </view>
-      <view class="control-btn" :class="{ disable: !result }" @click="clockIn(2)">
+      <view class="control-btn" :class="{ disable: !result || checkAbleType != '2' }" @click="clockIn(2)">
         <text class="control-btn-text">下班打卡</text>
       </view>
     </view>
@@ -47,6 +47,7 @@
 
 <script>
 import { isInRangeOptimized, wgs84ToGcj02 } from '@/utils/handler'
+import { queryClickAble } from '@/api/attendance/attendance'
 export default {
   props: {
     attendanceInfo: {
@@ -66,6 +67,7 @@ export default {
   data() {
     return {
       result: null,
+      checkAbleType: null,
       position: {
         latitude: 0,
         longitude: 0,
@@ -73,8 +75,15 @@ export default {
     }
   },
   watch: {
+    attendanceInfo: {
+      handler(newValue) {
+        this.getCheckAbleType()
+      },
+      deep: true
+    },
     checkInPosiInfo(newValue) {
       if (newValue && newValue.length) {
+        this.getCheckAbleType()
         if (window.android && typeof window.android.getLocation === 'function') {
           window.android.getLocation()
         } else {
@@ -86,9 +95,10 @@ export default {
     }
   },
   mounted() {
+    this.getCheckAbleType()
     // app 在前台时获取位置信息
     uni.onLocationChange((res) => {
-   
+
       const [latitude, longitude] = wgs84ToGcj02(res.latitude, res.longitude);
 
       this.result = this.checkInPosiInfo.find(item => {
@@ -100,7 +110,7 @@ export default {
     // 暴露回调给原生外壳
     window.locationCallBack = (res) => {
       let resPositionInfo = JSON.parse(res)
-
+      this.getCheckAbleType()
       const [latitude, longitude] = wgs84ToGcj02(resPositionInfo.latitude, resPositionInfo.longitude);
       this.position = {
         latitude: latitude,
@@ -117,6 +127,13 @@ export default {
     this.removeEvent()
   },
   methods: {
+    //获取考勤权限
+    getCheckAbleType() {
+      queryClickAble().then(res => {
+        this.checkAbleType = res.data
+
+      })
+    },
     clockIn(type) {
       if (!this.result) return uni.showToast({ title: '当前未进入考勤范围!', icon: 'none' })
       this.$emit('attendanceHandler', type, this.result)

src/pages/attendance/components/MaintainAreaOrMemberModal.vue

@@ -21,7 +21,8 @@
                     </view>
                 </view>
             </view>
-            <view v-else class="custom-btn" @click="openModal">维护工作区域/班组成员</view>
+            <view v-else :class="{ 'custom-btn': true, 'disabled': !attendanceInfo.checkInTime }" @click="openModal">
+                维护工作区域/班组成员</view>
         </view>
         <u-popup :show="show" mode="center" :round="8">
             <view class="modal-content">
@@ -95,8 +96,13 @@
 
                 <view class="footer-btn">
                     <view v-if="searchViewShow" class="custom-btn-normal" @click="appendWorkUsers"
-                        :class="{ disabled: addWorkUsers.length === 0 }">添加人员</view>
-                    <view v-else class="custom-btn-normal" @click="confirm" :class="{ disabled: !selectedTerminal }">确认
+                        :class="{ disabled: addWorkUsers.length === 0 }">
+                        <text>添加人员</text>
+                    </view>
+                    <view v-else class="custom-btn-normal" @click="confirm"
+                        :class="{ disabled: !selectedTerminal || loading }">
+                        <text v-if="loading">处理中...</text>
+                        <text v-else>确认</text>
                     </view>
                 </view>
             </view>
@@ -116,7 +122,16 @@ export default {
         userInfo: {
             type: Object,
             default: () => { }
-        }
+        },
+        attendanceInfo: {
+            type: Object,
+            default: () => ({
+                attendanceDate: '', // 当前日期
+                checkInTime: '', //上班打卡时间
+                checkOutTime: '', //下班打卡时间
+                items: [], // 打开记录 第一条为最早上班打卡时间 最后一条为最晚下班打卡时间
+            })
+        },
     },
     data() {
         return {
@@ -131,7 +146,8 @@ export default {
             allUsers: [],//所有的人员
             searchViewShow: false,//搜索人员
             addWorkUsers: [], // 额外添加的人员 
-            teamUsers: [],//同组用户
+            teamUsers: [],//同组用户,
+            loading: false // 防止重复点击的loading状态
         }
     },
     computed: {
@@ -149,8 +165,8 @@ export default {
     },
     methods: {
         selectAddUser(selectItem) { // 移除额外添加人员
-            console.log(selectItem, "selectItem",this.addWorkUsers)
-            
+            console.log(selectItem, "selectItem", this.addWorkUsers)
+
             const index = this.addWorkUsers.findIndex(item => item.userId === selectItem.userId)
             if (index >= 0) {
                 this.addWorkUsers.splice(index, 1)
@@ -159,8 +175,7 @@ export default {
             }
         },
         appendWorkUsers() {
-            
-            console.log("appendWorkUsers",this.addWorkUsers,this.teamMembers)
+            console.log("appendWorkUsers", this.addWorkUsers, this.teamMembers)
             if (this.addWorkUsers.length) {
                 this.addWorkUsers.forEach(item => {
                     if (!this.teamMembers.some(member => member.userId === item.userId)) {
@@ -182,7 +197,7 @@ export default {
         },
         //获取默认的teammember
         getTeamMember() {
-            
+
             this.loadTeamUsers().then(() => {
                 // 选中全组人员  
                 this.teamMembers = this.teamUsers
@@ -196,7 +211,8 @@ export default {
                 // 调用用户列表接口，传递deptId获取同组用户
                 const response = await getUserList({
                     deptId: currentUserDeptId, // 🔥 使用从getInfo获取的deptId
-                    status: '0' // 只获取正常状态的用户
+                    status: '0', // 只获取正常状态的用户
+                    pageSize: 100
                 });
 
                 if (response && response.code === 200) {
@@ -221,13 +237,13 @@ export default {
         },
         //回显member
         getSelectedMember() {
-            
+
             memberList({
                 attendanceTeamId: this.userInfo.teamsId,
                 attendanceDate: moment().format('YYYY-MM-DD')
             }).then(res => {
 
-                this.selectedMember = res.rows || []
+                this.selectedMember = res.data || []
                 this.$emit('update-member', this.selectedMember)
             })
 
@@ -241,7 +257,8 @@ export default {
             // 调用用户列表接口，传递deptId获取同组用户
             const response = await getUserList({
                 deptId: currentUserDeptId, // 🔥 使用从getInfo获取的deptId
-                status: '0' // 只获取正常状态的用户
+                status: '0', // 只获取正常状态的用户
+                pageSize: 100
             });
             console.log(response, "response")
             if (response && response.code === 200) {
@@ -291,7 +308,8 @@ export default {
                 // 调用用户搜索接口，不限制部门
                 const response = await getUserList({
                     nickName: keyword,    // 按昵称搜索
-                    status: '0'          // 只获取正常状态的用户
+                    status: '0', // 只获取正常状态的用户
+                    pageSize: 100        // 只获取正常状态的用户
                 });
                 if (response && response.code === 200) {
                     this.allUsers = (response.rows || []).map(item => {
@@ -324,7 +342,8 @@ export default {
             this.selectedTerminal = terminal
         },
         confirm() {
-            if (!this.selectedTerminal) return
+            if (!this.selectedTerminal) return;
+            this.loading = true;
             let selectTerminal = this.channelList.find(item => item.value === this.selectedTerminal)
             let res = this.teamMembers.map(item => {
                 return {
@@ -343,9 +362,15 @@ export default {
                 uni.showToast({ title: '提交成功', icon: 'success' });
                 this.close()
                 this.getSelectedMember()
+                return res;
+            }).finally(() => {
+                this.loading = false
             })
         },
         openModal() {
+            if (!this.attendanceInfo.checkInTime) {
+                return;
+            }
             this.show = true;
             this.initMember()
             this.getTeamMember()
@@ -558,7 +583,7 @@ export default {
         .footer-btn {
             padding: 20rpx 30rpx;
 
-            
+
         }
     }
 }

src/pages/attendance/components/WorkingGroup.vue

@@ -48,12 +48,13 @@
           </view>
         </view>
       </view>
+      <!-- {{ selectedMember.length === 0 }}{{ !userInfo.roles.includes('kezhang') }}{{ !attendanceInfo.checkInTime }} -->
       <!-- :disabled="!attendanceInfo.checkInTime || checkOutStatus" -->
       <AddAttendancePersonnelModal v-if="index === 0" :disabled="checkOutStatus" :notkezhang="notkezhang"
         :userInfo="userInfo" @updateRecord="invokerGetPostRecordList" :selectedMember="selectedMember">
-        <!-- :class="{ disabled: !attendanceInfo.checkInTime }"  不加控制逻辑  科长没有选人可以上通道，但是其他人必须选人才能选人上通道 -->
+        <!-- :class="{ disabled: !attendanceInfo.checkInTime }"   没有选人不可以上通道 -->
         <view v-if="authority" class="custom-btn" @click="openModal"
-          :class="{ disabled: selectedMember.length === 0 && !userInfo.roles.includes('kezhang') }">
+          :class="{ disabled: selectedMember.length === 0 && !userInfo.roles.includes('kezhang') || (!attendanceInfo.checkInTime && attendanceInfo.checkOutTime) }">
           {{ checkOutStatus ? '下通道' : '上通道' }}
         </view>
       </AddAttendancePersonnelModal>

src/pages/attendance/index.vue

@@ -26,7 +26,7 @@
         @attendanceHandler="handleCheckIn" />
       <!-- 工作区域/班组成员 -->
       <MaintainAreaOrMemberModal ref="maintainAreaOrMemberModal" v-if="showMaintain" :userInfo="userInfoAndRoles"
-        @update-member="updateMember" />
+        @update-member="updateMember" :attendanceInfo="attendanceInfo"/>
       <!-- 新界面工作组状态 -->
       <WorkingGroup ref="workingGroup" style="margin: 16px 0 24px 0" :attendanceInfo="attendanceInfo"
         :loadUserInfoOver="loadUserInfoOver" :userInfo="userInfoAndRoles" :selectedMember="selectedMember" />

src/pages/checklist/components/unqualified.vue

@@ -138,7 +138,8 @@ export default {
     emitPersonnelChange() {
       let personnelData = this.localPersonnelData.map(item => ({
         ...item,
-        userName: item.nickName
+        userName:item.nickName.replace(/\s+/g, ''),
+        nickName:item.nickName.replace(/\s+/g, ''), // 去掉nickName中的所有空格
       }))
       const changeData = {
         parentIndex: this.parentIndex,

src/pages/checklist/index.vue

@@ -23,7 +23,7 @@
                                 <uni-easyinput type="textarea" v-model="formData.description" placeholder="请输入任务简介"
                                     :disabled="true" />
                             </uni-forms-item>
-                            <uni-forms-item :label="getCheckLabel" name="checkedDepartmentId" required>
+                            <uni-forms-item :label="getCheckLabel" :name="getCheckFieldName" required>
                                 <uni-data-picker v-if="getCheckLabel == '被检查科'" :localdata="departments"
                                     :popup-title="`请选择${getCheckLabel}`" v-model="formData.checkedDepartmentId"
                                     @change="handlecheckedDepartmentIdChange" :readonly="formDisabled" />
@@ -205,6 +205,21 @@ export default {
                 return '被检查大队'
             }
         },
+        // 获取验证字段名
+        getCheckFieldName() {
+            if (this.formData.checkedLevel == checkedLevelEnums.TEAM_LEVEL) {
+                return 'checkedTeamId'
+            }
+            if (this.formData.checkedLevel == checkedLevelEnums.PERSONNEL_LEVEL) {
+                return 'checkedPersonnelId'
+            }
+            if (this.formData.checkedLevel == checkedLevelEnums.DEPARTMENT_LEVEL) {
+                return 'checkedDepartmentId'
+            }
+            if (this.formData.checkedLevel == checkedLevelEnums.BRIGADE_LEVEL) {
+                return 'checkedBrigadeId'
+            }
+        },
         // 验证规则
         rules() {
             let changeRule = {}
@@ -217,11 +232,25 @@ export default {
             }
             if (this.formData.checkedLevel == checkedLevelEnums.PERSONNEL_LEVEL) {
                 changeRule = {
-                    checkedUserId: {
+                    checkedPersonnelId: {
                         rules: [{ required: true, errorMessage: '请选择被检查人' }]
                     }
                 }
             }
+            if (this.formData.checkedLevel == checkedLevelEnums.DEPARTMENT_LEVEL) {
+                changeRule = {
+                    checkedDepartmentId: {
+                        rules: [{ required: true, errorMessage: '请选择被检查科' }]
+                    }
+                }
+            }
+            if (this.formData.checkedLevel == checkedLevelEnums.BRIGADE_LEVEL) {
+                changeRule = {
+                    checkedBrigadeId: {
+                        rules: [{ required: true, errorMessage: '请选择被检查大队' }]
+                    }
+                }
+            }
             return {
                 ...changeRule,
                 checkLocation: {
@@ -232,6 +261,7 @@ export default {
                         },
                         {
                             validateFunction: (rule, value, data, callback) => {
+                                console.log(value,"value")
                                 if (!value) {
                                     // 检查是否选择了完整的检查地点（终端、区域、通道）
                                     callback('请选择完整的检查地点');
@@ -455,7 +485,7 @@ export default {
             let newText = text.split('/')
             this.$set(this.formData, 'checkedBrigadeName', newText[newText.length - 1].trim());
             this.$set(this.formData, 'checkedDeptId', value);
-            debugger
+            
             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());
@@ -721,6 +751,7 @@ export default {
         // 提交表单
         submitForm() {
             this.$refs.form.validate().then(res => {
+               
                 // 检查所有不合格项是否都填写了相关人员
                 let hasError = false;
                 let errorMessage = '';
@@ -767,6 +798,7 @@ export default {
 
             }).catch(err => {
                 console.log('表单验证失败:', err);
+                uni.showToast({ title: '请填写完整表单信息', icon: 'none' });
             });
         }
 

src/pages/myToDoList/index.vue

@@ -36,7 +36,7 @@
                         <template v-if="item.instance && item.instance.businessType === 'SEIZURE_REPORT'">
                             <view class="list-row">
                                 <view class="list-label">位置：</view>
-                                <view class="list-value">{{ getFormData(item, 'channelName') }}</view>
+                                <view class="list-value">{{ getFormData(item, 'securityLocationText') }}</view>
                             </view>
                             <view class="list-row" style="height: auto;align-items: flex-start;">
                                 <view class="list-label">查获人：</view>

src/pages/seizedReported/index.vue

@@ -62,15 +62,14 @@
               <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.channelName || formData.regionalName" />
+                <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.reportTeamText" />
+                <uni-easyinput v-else :disabled="true" placeholder="请选择查获班组" :value="formData.attendanceTeamName" />
               </uni-forms-item>
             </uni-collapse-item>
           </uni-collapse>
@@ -251,7 +250,7 @@ export default {
       return this.$store.state.user;
     },
     userInfo() {
-   
+
       return (this.$store.state.user && this.$store.state.user.userInfo) ? this.$store.state.user.userInfo : {}
     },
     // 将item_check_method_options转换为字符串数组供uni-combox使用
@@ -323,11 +322,11 @@ export default {
         attendanceId: '',
         attendanceTeamId: '',
         attendanceTeamName: '无',
-        attendanceDepartmentId:  '',
+        attendanceDepartmentId: '',
         attendanceDepartmentName: '无',
-        attendanceStationId:  '',
+        attendanceStationId: '',
         attendanceStationName: '无',
-        regionalCode:  '',
+        regionalCode: '',
         regionalName: '无',
         terminlCode: '',
         terminlName: '无',
@@ -434,20 +433,23 @@ export default {
     }
   },
   async onLoad(options) {
-    
+
     // if (options && options?.params) {
-      let params = {};
-      if (options?.params) {
-        params = JSON.parse(decodeURIComponent(options.params));
-      }
-      this.businessId = params?.businessId;
-      this.instanceId = params?.instanceId;
-      this.id = params?.id;
-      this.nodeCode = params?.nodeCode;
-      this.type = params?.type || 'add';
+    let params = {};
+    if (options?.params) {
+      params = JSON.parse(decodeURIComponent(options.params));
+    }
+    this.businessId = params?.businessId;
+    this.instanceId = params?.instanceId;
+    this.id = params?.id;
+    this.nodeCode = params?.nodeCode;
+    this.type = params?.type || 'add';
     // }
     await this.initPageData();
-    this.invokerGetLocationsbyTime()
+     if (this.type == 'add') {
+      this.invokerGetLocationsbyTime()
+    }
+
     this.invokerCategoryInfo()
     // 如果有路由ID，获取详情信息
     if (this.businessId) {
@@ -575,6 +577,8 @@ export default {
         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}`
       };
 
       this.$nextTick(() => {
@@ -624,8 +628,7 @@ export default {
 
         this.formData.securityLocation = curUserInfo.channelCode || curUserInfo.regionalCode
         this.formData.securityLocationText = curUserInfo.channelName || curUserInfo.regionalName
-        this.formData.channelCode = curUserInfo.channelCode
-        this.formData.channelName = curUserInfo.channelName
+
         this.formData.team = curUserInfo.attendanceTeamId
         this.formData.reportTeam = curUserInfo.attendanceTeamId
         if (curUserInfo.attendanceStationName && curUserInfo.attendanceDepartmentName) {
@@ -633,9 +636,80 @@ export default {
           this.formData.reportTeamText = `${curUserInfo.attendanceStationName} / ${curUserInfo.attendanceDepartmentName} / ${curUserInfo.attendanceTeamName}`
         }
         console.log(this.formData);
-
+        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 = '';
+        }
       })
     },
+    //根据securityLocation,从this.position_options中向上找到前两级别的父级对象和当前级别对象
+    getParentLocation(securityLocation) {
+      if (!securityLocation || !this.position_options || !this.position_options.length) {
+        return null;
+      }
+
+      // 递归查找节点及其父级
+      const findNodeAndParents = (nodes, targetValue, parents = []) => {
+        for (const node of nodes) {
+          if (node.value === targetValue) {
+            return { node, parents };
+          }
+
+          if (node.children && node.children.length) {
+            const result = findNodeAndParents(node.children, targetValue, [...parents, node]);
+            if (result) {
+              return result;
+            }
+          }
+        }
+        return null;
+      };
+
+      const result = findNodeAndParents(this.position_options, securityLocation);
+
+      if (!result) {
+        return null;
+      }
+
+      const { node, parents } = result;
+
+      // 返回当前级别对象和前两级的父级对象（如果存在）
+      if (parents.length >= 2) {
+        return {
+          current: node,                              // 当前级别对象
+          grandParent: parents[parents.length - 2],  // 祖父级
+          parent: parents[parents.length - 1]        // 父级
+        };
+      } else if (parents.length === 1) {
+        return {
+          current: node,                              // 当前级别对象
+          grandParent: null,                         // 没有祖父级
+          parent: parents[0]                         // 只有父级
+        };
+      } else {
+        return {
+          current: node,                              // 当前级别对象
+          grandParent: null,                         // 没有祖父级
+          parent: null                               // 没有父级
+        };
+      }
+    },
     invokerCategoryInfo() {
       categoryInfo(1).then(res => {
         this.commonlyList.forbidden = res.data || []
@@ -775,6 +849,26 @@ export default {
       const arr = e.detail.value || [];
       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 = '';
+        }
     },
 
     // 通用取值：只拿最后一级
@@ -929,8 +1023,8 @@ export default {
       return parseInt(`${timestamp}${random}`.slice(-15)); // 确保总长度不超过15位
     },
     formatData() {
-      this.formData.regionalCode = this.formData.securityLocation
-      this.formData.regionalName = this.formData.securityLocationText
+      // this.formData.regionalCode = this.formData.securityLocation
+      // this.formData.regionalName = this.formData.securityLocationText
       this.formData.channelCode =
         this.formData.channelCode || this.formData.securityLocation || '无'
       this.formData.channelName =
@@ -996,7 +1090,7 @@ export default {
 
     // 提交表单
     submitForm() {
-      console.log("generateNumericID", this.generateNumericID())
+
       this.$refs.form.validate().then(res => {
         uni.showLoading({ title: '提交中...', mask: true });
         let payload = this.formatData()
@@ -1017,10 +1111,12 @@ export default {
             uni.showToast({ title: '提交成功', icon: 'success' });
             //开始流程
             console.log("res0", res)
+
             approvalStart({ ...params, businessId: res.data }).then(res => {
               setTimeout(() => uni.navigateBack(), 1500); // 提交成功后跳转
             })
 
+
           })
           .catch((error) => {
             uni.showToast({ title: '操作失败，请稍后重试！', icon: 'none' }); // 提交失败提示

src/pages/seizedReportedVoice/index.vue

@@ -63,8 +63,7 @@
             <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.channelName || formData.regionalName" />
+              <uni-easyinput v-else :disabled="true" placeholder="请选择查获班组" :value="formData.securityLocationText" />
             </uni-forms-item>
 
             <uni-forms-item label="查获班组" name="reportTeam" required>
@@ -425,7 +424,6 @@ export default {
       this.voiceId = params?.voiceId;
     }
     await this.initPageData();
-    this.invokerGetLocationsbyTime()
     this.invokerCategoryInfo()
     // 如果有路由ID，获取详情信息
     if (this.businessId) {
@@ -433,8 +431,10 @@ export default {
     }
     // 如果有语音ID，获取语音详情信息
     if (this.voiceId) {
-      this.getVoiceDetailInfo();
+      await this.getVoiceDetailInfo();
     }
+    this.invokerGetLocationsbyTime()
+
   },
   methods: {
     // 获取语音详情信息
@@ -855,7 +855,8 @@ export default {
         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}`
       };
 
       this.$nextTick(() => {
@@ -906,8 +907,7 @@ export default {
         console.log(curUserInfo, "curUserInfo")
         this.formData.securityLocation = curUserInfo.channelCode || curUserInfo.regionalCode
         this.formData.securityLocationText = curUserInfo.channelName || curUserInfo.regionalName
-        this.formData.channelCode = curUserInfo.channelCode
-        this.formData.channelName = curUserInfo.channelName
+
         this.formData.team = curUserInfo.attendanceTeamId
         this.formData.reportTeam = curUserInfo.attendanceTeamId
         if (curUserInfo.attendanceStationName && curUserInfo.attendanceDepartmentName) {
@@ -915,9 +915,78 @@ export default {
           this.formData.reportTeamText = `${curUserInfo.attendanceStationName} / ${curUserInfo.attendanceDepartmentName} / ${curUserInfo.attendanceTeamName}`
         }
         console.log(this.formData);
-
+        const locationResult = this.getParentLocation(this.formData.securityLocation)
+        // 安全地处理可能为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 = '';
+        }
       })
     },
+    //根据securityLocation,从this.position_options中向上找到前两级别的父级对象和当前级别对象
+    getParentLocation(securityLocation) {
+      if (!securityLocation || !this.position_options || !this.position_options.length) {
+        return null;
+      }
+
+      // 递归查找节点及其父级
+      const findNodeAndParents = (nodes, targetValue, parents = []) => {
+        for (const node of nodes) {
+          if (node.value === targetValue) {
+            return { node, parents };
+          }
+
+          if (node.children && node.children.length) {
+            const result = findNodeAndParents(node.children, targetValue, [...parents, node]);
+            if (result) {
+              return result;
+            }
+          }
+        }
+        return null;
+      };
+
+      const result = findNodeAndParents(this.position_options, securityLocation);
+
+      if (!result) {
+        return null;
+      }
+
+      const { node, parents } = result;
+
+      // 返回当前级别对象和前两级的父级对象（如果存在）
+      if (parents.length >= 2) {
+        return {
+          current: node,                              // 当前级别对象
+          grandParent: parents[parents.length - 2],  // 祖父级
+          parent: parents[parents.length - 1]        // 父级
+        };
+      } else if (parents.length === 1) {
+        return {
+          current: node,                              // 当前级别对象
+          grandParent: null,                         // 没有祖父级
+          parent: parents[0]                         // 只有父级
+        };
+      } else {
+        return {
+          current: node,                              // 当前级别对象
+          grandParent: null,                         // 没有祖父级
+          parent: null                               // 没有父级
+        };
+      }
+    },
     invokerCategoryInfo() {
       categoryInfo(1).then(res => {
         this.commonlyList.forbidden = res.data || []
@@ -1060,6 +1129,24 @@ export default {
       const arr = e.detail.value || [];
       this.formData.securityLocation = arr[arr.length - 1]?.value || '';
       this.formData.securityLocationText = arr.map(item => item.text).join('/');
+      const locationResult = this.getParentLocation(this.formData.securityLocation)
+      // 安全地处理可能为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 = '';
+      }
     },
 
     // 通用取值：只拿最后一级
@@ -1212,8 +1299,8 @@ export default {
     },
     formatData() {
 
-      this.formData.regionalCode = this.formData.securityLocation
-      this.formData.regionalName = this.formData.securityLocationText
+      // this.formData.regionalCode = this.formData.securityLocation
+      // this.formData.regionalName = this.formData.securityLocationText
       this.formData.channelCode =
         this.formData.channelCode || this.formData.securityLocation || '无'
       this.formData.channelName =