Explorar el Código

Merge branch 'info-edit' into dev

huoyi hace 1 mes
padre
commit
4d63a40c27
Se han modificado 1 ficheros con 7 adiciones y 3 borrados
  1. 7 3
      src/pages/seizedReported/index.vue

+ 7 - 3
src/pages/seizedReported/index.vue

@@ -469,7 +469,7 @@ export default {
469
       await this.loadDepartmentUsers();
469
       await this.loadDepartmentUsers();
470
     }
470
     }
471
     
471
     
472
-    if (this.type == 'add') {
472
+    if (this.type == 'add' && !this.isKezhang) {
473
       this.invokerGetLocationsbyTime()
473
       this.invokerGetLocationsbyTime()
474
     }
474
     }
475
 
475
 
@@ -859,8 +859,10 @@ export default {
859
 
859
 
860
         if (response && response.code === 200) {
860
         if (response && response.code === 200) {
861
           this.departmentUserOptions = (response.rows || []).map(user => ({
861
           this.departmentUserOptions = (response.rows || []).map(user => ({
862
+            ...user,
862
             value: user.userId,
863
             value: user.userId,
863
-            text: user.nickName || user.userName
864
+            text: user.nickName || user.userName,
865
+      
864
           }));
866
           }));
865
         }
867
         }
866
       } catch (error) {
868
       } catch (error) {
@@ -1074,6 +1076,8 @@ export default {
1074
       this.formData.inspectUserId = arr[arr.length - 1]?.value || '';
1076
       this.formData.inspectUserId = arr[arr.length - 1]?.value || '';
1075
       this.formData.inspectUserName = arr.map(item => item.text).join('/');
1077
       this.formData.inspectUserName = arr.map(item => item.text).join('/');
1076
       
1078
       
1079
+      this.formData.reportTeam = this.departmentUserOptions.find(item => item.userId === this.formData.inspectUserId)?.deptId;
1080
+      this.formData.reportTeamText = this.teams.find(item => item.value === this.formData.reportTeam)?.text;
1077
       // 切换查获人员后,重新初始化岗位和选项数据
1081
       // 切换查获人员后,重新初始化岗位和选项数据
1078
       if (this.formData.inspectUserId) {
1082
       if (this.formData.inspectUserId) {
1079
         await this.initPositionAndOptions();
1083
         await this.initPositionAndOptions();
@@ -1171,7 +1175,7 @@ export default {
1171
 
1175
 
1172
 
1176
 
1173
 
1177
 
1174
-      this.formData.inspectUserName = this.userInfo.nickName
1178
+      
1175
       const payload = {
1179
       const payload = {
1176
         ...this.formData,
1180
         ...this.formData,
1177
         itemSeizureItemsList: [item],
1181
         itemSeizureItemsList: [item],