2 Commits 6155dd0ca0 ... 204c01f1f0

Author SHA1 Message Date
  huoyi 204c01f1f0 Merge branch 'needNew-0723' into dev 3 days ago
  huoyi ed2b7275a4 fix: 修复提交时用户名包含空格及安检员名称未赋值的问题 3 days ago

+ 2 - 2
src/pages/attendance/components/AddAttendancePersonnelModal.vue

@@ -436,7 +436,7 @@ export default {
436 436
           postRecordList = this.getSelectArea.map(ele => {
437 437
             return {
438 438
               userId: item.userId,
439
-              userName: item.nickName || item.userName,
439
+              userName: (item.nickName || item.userName).replace(/\s/g, ''),
440 440
               checkInTime: formatTime(currentTime, 'YYYY-MM-DD hh:mm:ss'),
441 441
               // 🔥 重要:上通道时传入默认下岗时间(2000年1月1日0点)
442 442
               checkOutTime: '2000-01-01 00:00:00',
@@ -462,7 +462,7 @@ export default {
462 462
           //如果是班组长走单选逻辑
463 463
           postRecordList = [{
464 464
             userId: item.userId,
465
-            userName: item.nickName || item.userName,
465
+            userName: (item.nickName || item.userName).replace(/\s/g, ''),
466 466
             checkInTime: formatTime(currentTime, 'YYYY-MM-DD hh:mm:ss'),
467 467
             // 🔥 重要:上通道时传入默认下岗时间(2000年1月1日0点)
468 468
             checkOutTime: '2000-01-01 00:00:00',

+ 1 - 0
src/pages/attendance/components/WorkingGroup.vue

@@ -267,6 +267,7 @@ export default {
267 267
         res = [{
268 268
           // 基本字段
269 269
           ...curUserRecordInfo,
270
+          userName: (curUserRecordInfo.userName || '').replace(/\s/g, ''),
270 271
           isCheckIn: undefined,
271 272
           revision: (curUserRecordInfo.revision || 1) + 1,
272 273
           // 时间相关

+ 1 - 2
src/pages/seizedReported/index.vue

@@ -34,7 +34,6 @@
34 34
                 <view class="teamInfo" v-else>
35 35
                   <view>安检员</view>
36 36
                   <view class="team">
37
-
38 37
                     <view v-if="userInfo.stationName">
39 38
                       {{ userInfo.stationName }}
40 39
                     </view>
@@ -1338,7 +1337,7 @@ export default {
1338 1337
       this.$refs.form.validate().then(res => {
1339 1338
         uni.showLoading({ title: '提交中...', mask: true });
1340 1339
         let payload = this.formatData()
1341
-
1340
+        payload.inspectUserName = this.userInfo.nickName
1342 1341
         let params = {
1343 1342
           businessType: 'SEIZURE_REPORT',
1344 1343
           title: '查获物品上报审批流程',