Merge branch 'needNew-0723' into dev

src/pages/attendance/components/AddAttendancePersonnelModal.vue

@@ -160,7 +160,8 @@ export default {
       isSubmittingPost: false,
       currentTime: undefined,
       errModalShow: false,
-      errModalContent: ''
+      errModalContent: '',
+      selectedLocationPath: [] // 存储完整的三级路径数据
     }
   },
   computed: {
@@ -169,37 +170,44 @@ export default {
     },
     //单选获取的区域
     positions() {
-      return this.notkezhang ? {
+      // 解析三级路径数据
+      const path = this.selectedLocationPath
+      const result = {
+        terminlCode: '',
+        terminlName: '',
         regionalCode: '',
         regionalName: '',
-        channelCode: this.channelOrRegional,
-        channelName: this.channelOrRegionalName
-      } : {
-        regionalCode: this.channelOrRegional,
-        regionalName: this.channelOrRegionalName,
         channelCode: '',
         channelName: ''
       }
+
+      if (path.length >= 1) {
+        result.terminlCode = path[0].terminlCode || path[0].value
+        result.terminlName = path[0].terminlName || path[0].text
+      }
+      if (path.length >= 2) {
+        result.regionalCode = path[1].regionalCode || path[1].value
+        result.regionalName = path[1].regionalName || path[1].text
+      }
+      if (path.length >= 3) {
+        result.channelCode = path[2].channelCode || path[2].value
+        result.channelName = path[2].channelName || path[2].text
+      }
+
+      return result
     },
     //多选获得的区域
     getSelectArea() {
       let area = []
       this.selectedAreas.forEach(item => {
         item.children.forEach(child => {
-          area.push(this.notkezhang ? {
-            regionalCode: '',
-            regionalName: '',
-            channelCode: child.code,
-            channelName: child.label,
-            terminlCode: item.code,
-            terminlName: item.label
-          } : {
-            regionalCode: child.code,
-            regionalName: child.label,
-            channelCode: '',
-            channelName: '',
-            terminlCode: item.code,
-            terminlName: item.label
+          area.push({
+            terminlCode: child.terminlCode || item.code,
+            terminlName: child.terminlName || item.label,
+            regionalCode: child.regionalCode || (this.notkezhang ? '' : child.code),
+            regionalName: child.regionalName || (this.notkezhang ? '' : child.label),
+            channelCode: child.channelCode || (this.notkezhang ? child.code : ''),
+            channelName: child.channelName || (this.notkezhang ? child.label : '')
           })
         })
       })
@@ -268,7 +276,14 @@ export default {
       return list.map(node => ({
         text: node.label,
         value: node.code,
-        children: node.children ? this.convertTree(node.children) : null
+        children: node.children ? this.convertTree(node.children) : null,
+        // 保留原始数据字段
+        terminlName: node.terminlName,
+        terminlCode: node.terminlCode,
+        regionalName: node.regionalName,
+        regionalCode: node.regionalCode,
+        channelName: node.channelName,
+        channelCode: node.channelCode
       }))
     },
     invokerDataConfigTree(level) {
@@ -281,6 +296,8 @@ export default {
     onLocationChange({ detail }) {
       const { value } = detail
       this.channelOrRegionalName = value.map(item => item.text).join('/')
+      // 存储完整的三级路径数据
+      this.selectedLocationPath = value
     },
     openModal() {
       if (this.disabled || (this.selectedMember.length === 0 && this.notkezhang)) return
@@ -383,12 +400,12 @@ export default {
         });
         return;
       }
-      debugger
+      
       const checkUserStatusALL = this.selectedUser.map(item => {
         return this.checkUserStatus(item)
       })
       uni.showLoading({ title: '正在查询人员状态...' });
-      debugger
+      
       Promise.all(checkUserStatusALL).then((res) => {
         const checkResult = res.filter(Boolean)
         if (checkResult.length) {
@@ -468,7 +485,7 @@ export default {
           }];
         }
         console.log(postRecordList, "postRecordList")
-        debugger
+        
 
         return addPostRecord(postRecordList)
       });

src/pages/attendance/components/WorkingGroup.vue

@@ -52,7 +52,8 @@
       <!-- {{ selectedMember.length === 0 }}{{ !userInfo.roles.includes('banzuzhang') }}{{ !attendanceInfo.checkInTime }} -->
       <!-- :disabled="!attendanceInfo.checkInTime || checkOutStatus" -->
       <AddAttendancePersonnelModal v-if="index === 0" :disabled="checkOutStatus" :notkezhang="notkezhang"
-        :userInfo="userInfo" @updateRecord="invokerGetPostRecordList" :selectedMember="selectedMember" :attendanceInfo="attendanceInfo">
+        :userInfo="userInfo" @updateRecord="invokerGetPostRecordList" :selectedMember="selectedMember"
+        :attendanceInfo="attendanceInfo">
         <!-- :class="{ disabled: !attendanceInfo.checkInTime }"   没有选人不可以上通道 -->
         <view v-if="authority" class="custom-btn" @click="openModal"
           :class="{ disabled: selectedMember.length === 0 && !userInfo.roles.includes('banzuzhang') || (!attendanceInfo.checkInTime || (attendanceInfo.checkInTime && attendanceInfo.checkOutTime)) }">
@@ -132,8 +133,8 @@ export default {
       if (!this.checkOutStatus) {
         return;
       }
-  
-      
+
+
       this.currentTime = formatTime(new Date())
       this.checkOutWork = true
     },
@@ -181,12 +182,12 @@ export default {
                 checkOutTime: attr.checkOutTime === '2000-01-01 00:00:00' ? '' : formatTime(attr.checkOutTime, 'hh:mm:ss'),
                 userName: formatName(attr.userName),
               }
-              if (attr.userId === this.userInfo.userId) {
-                info = result
-              }
-
+              // if (attr.userId === this.userInfo.userId) {
+              //   info = result
+              // }
+              info = result
               if (index === 0) { // 取最新纪录
-                this.curUserWorkingGroupData = info
+                this.curUserWorkingGroupData = result
                 this.workingGroupId = item.shiftCode
               }
               return result