Переглянути джерело

fix: 修复问题整改和检查单页面逻辑,调整上报页面默认值

修复问题整改页面中判断条件缺少isResponsiblePerson的问题
检查单页面添加debugger用于调试
上报页面将硬编码的默认值改为空字符串和'无'
统一上报页面submitterRole为'SEIZURE_REPORT_DEFAULT'
huoyi 4 місяців тому
батько
коміт
fc5648ad32

+ 1 - 0
src/pages/checklist/index.vue

@@ -455,6 +455,7 @@ export default {
455
             let newText = text.split('/')
455
             let newText = text.split('/')
456
             this.$set(this.formData, 'checkedBrigadeName', newText[newText.length - 1].trim());
456
             this.$set(this.formData, 'checkedBrigadeName', newText[newText.length - 1].trim());
457
             this.$set(this.formData, 'checkedDeptId', value);
457
             this.$set(this.formData, 'checkedDeptId', value);
458
+            debugger
458
             this.$set(this.formData, 'checkedDeptName', newText[newText.length - 1].trim());
459
             this.$set(this.formData, 'checkedDeptName', newText[newText.length - 1].trim());
459
             this.$set(this.formData, 'checkedDepartmentId', value);
460
             this.$set(this.formData, 'checkedDepartmentId', value);
460
             this.$set(this.formData, 'checkedDepartmentName', newText[newText.length - 1].trim());
461
             this.$set(this.formData, 'checkedDepartmentName', newText[newText.length - 1].trim());

+ 1 - 1
src/pages/problemRect/index.vue

@@ -291,7 +291,7 @@ export default {
291
             let res2 = this.formData.checkedLevel == 'TEAM_LEVEL' && this.nodeCode == 'GROUP_LEADER_RECTIFY';
291
             let res2 = this.formData.checkedLevel == 'TEAM_LEVEL' && this.nodeCode == 'GROUP_LEADER_RECTIFY';
292
             //个人
292
             //个人
293
             let res3 = this.formData.checkedLevel == 'PERSONNEL_LEVEL' && this.nodeCode == 'PROBLEM_USER_RECTIFY';
293
             let res3 = this.formData.checkedLevel == 'PERSONNEL_LEVEL' && this.nodeCode == 'PROBLEM_USER_RECTIFY';
294
-            return res1 || res2 || res3
294
+            return res1 || res2 || res3 || this.isResponsiblePerson
295
         },
295
         },
296
     },
296
     },
297
     data() {
297
     data() {

+ 9 - 9
src/pages/seizedReported/index.vue

@@ -320,20 +320,20 @@ export default {
320
         images: [],
320
         images: [],
321
 
321
 
322
         //暂时不要
322
         //暂时不要
323
-        attendanceId: 111111,
324
-        attendanceTeamId: 111111,
323
+        attendanceId: '',
324
+        attendanceTeamId: '',
325
         attendanceTeamName: '无',
325
         attendanceTeamName: '无',
326
-        attendanceDepartmentId: 111111,
326
+        attendanceDepartmentId:  '',
327
         attendanceDepartmentName: '无',
327
         attendanceDepartmentName: '无',
328
-        attendanceStationId: 111111,
328
+        attendanceStationId:  '',
329
         attendanceStationName: '无',
329
         attendanceStationName: '无',
330
-        regionalCode: 111111,
330
+        regionalCode:  '',
331
         regionalName: '无',
331
         regionalName: '无',
332
-        terminlCode: 111111,
332
+        terminlCode: '',
333
         terminlName: '无',
333
         terminlName: '无',
334
-        inspectTeamId: 111111,
334
+        inspectTeamId: '',
335
         inspectTeamName: '无',
335
         inspectTeamName: '无',
336
-        inspectDepartmentId: 111111,
336
+        inspectDepartmentId: '',
337
         inspectDepartmentName: '无',
337
         inspectDepartmentName: '无',
338
         checkMethodDesc: '无',
338
         checkMethodDesc: '无',
339
         passengerCard: '',
339
         passengerCard: '',
@@ -1007,7 +1007,7 @@ export default {
1007
           formData: payload,
1007
           formData: payload,
1008
           submitterId: this.currentUser.id,
1008
           submitterId: this.currentUser.id,
1009
           submitterName: this.currentUser.name,
1009
           submitterName: this.currentUser.name,
1010
-          submitterRole: this.currentUser.roles.includes('banzuzhang') ? 'SEIZURE_REPORT_LEADER' : this.currentUser.roles.includes('SecurityCheck') ? 'SEIZURE_REPORT_STAFF' : '',
1010
+          submitterRole: 'SEIZURE_REPORT_DEFAULT',
1011
         }
1011
         }
1012
 
1012
 
1013
 
1013