浏览代码

bug修复

seimin 10 月之前
父节点
当前提交
5d62b336b3

+ 2 - 2
src/app/share/dialog-bx/dialog-bx.component.html

@@ -19,11 +19,11 @@
19
         <div class="right" nz-col nzSpan="12">
19
         <div class="right" nz-col nzSpan="12">
20
           <div class="item display_flex  justify-content_space-between align-items_flex-start">
20
           <div class="item display_flex  justify-content_space-between align-items_flex-start">
21
             <span>楼栋</span>
21
             <span>楼栋</span>
22
-            <span>{{deptDto.place?.area?.area}}</span>
22
+            <span>{{extraData.place?.area?.area}}</span>
23
           </div>
23
           </div>
24
           <div class="item display_flex  justify-content_space-between align-items_flex-start">
24
           <div class="item display_flex  justify-content_space-between align-items_flex-start">
25
             <span>楼层</span>
25
             <span>楼层</span>
26
-            <span>{{deptDto.place?.place}}</span>
26
+            <span>{{extraData.place?.place}}</span>
27
           </div>
27
           </div>
28
         </div>
28
         </div>
29
       </div>
29
       </div>

+ 2 - 0
src/app/share/dialog-bx/dialog-bx.component.ts

@@ -15,11 +15,13 @@ export class DialogBxComponent implements OnInit {
15
   @Input() cancelTxt: string = "否";
15
   @Input() cancelTxt: string = "否";
16
   @Input() deptDto: object = {};
16
   @Input() deptDto: object = {};
17
   @Input() validateBxForm: object = {};
17
   @Input() validateBxForm: object = {};
18
+  @Input() extraData: object = {};
18
   constructor() {}
19
   constructor() {}
19
 
20
 
20
   officeInfo:any = {}
21
   officeInfo:any = {}
21
 
22
 
22
   ngOnInit() {
23
   ngOnInit() {
24
+    console.log(this.extraData);
23
     console.log(this.deptDto);
25
     console.log(this.deptDto);
24
     console.log(this.validateBxForm);
26
     console.log(this.validateBxForm);
25
   }
27
   }

+ 2 - 7
src/app/views/hushijiandan/hushijiandan.component.html

@@ -2141,13 +2141,7 @@
2141
                           </td>
2141
                           </td>
2142
                           <td>{{ data.state?data.state.name:'无' }}</td>
2142
                           <td>{{ data.state?data.state.name:'无' }}</td>
2143
                           <td>
2143
                           <td>
2144
-                            {{
2145
-                              data.incident
2146
-                                ? data.incident.handlingPersonnelUser
2147
-                                  ? data.incident.handlingPersonnelUser.name + (data.incident.handlingPersonnelUser.phone?'('+ data.incident.handlingPersonnelUser.phone +')':'')
2148
-                                  : "无"
2149
-                                : "无"
2150
-                            }}
2144
+                            {{ data.handlingPersonnelUser ? data.handlingPersonnelUser.name + (data.handlingPersonnelUser.phone?'('+ data.handlingPersonnelUser.phone +')':'') : "无"}}
2151
                           </td>
2145
                           </td>
2152
                           <td>
2146
                           <td>
2153
                             <!-- <button (click)="viewBx(data)">查看</button> -->
2147
                             <!-- <button (click)="viewBx(data)">查看</button> -->
@@ -3672,6 +3666,7 @@
3672
   [btnLoading]="btnLoading"
3666
   [btnLoading]="btnLoading"
3673
   [cancenlLoading]="cancenlLoading"
3667
   [cancenlLoading]="cancenlLoading"
3674
   [deptDto]="deptDto"
3668
   [deptDto]="deptDto"
3669
+  [extraData]="extraData"
3675
   [validateBxForm]="validateBxForm"
3670
   [validateBxForm]="validateBxForm"
3676
   (confirmDelEvent)="confirmReq()"
3671
   (confirmDelEvent)="confirmReq()"
3677
   (cancelDelEvent)="cancelReq()"
3672
   (cancelDelEvent)="cancelReq()"

+ 2 - 0
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -3988,7 +3988,9 @@ export class HushijiandanComponent implements OnInit {
3988
   }
3988
   }
3989
   // 报修提示框
3989
   // 报修提示框
3990
   reqModal: boolean = false;
3990
   reqModal: boolean = false;
3991
+  extraData:any = {};
3991
   showReqModal() {
3992
   showReqModal() {
3993
+    this.extraData.place = this.floors.find(v => v.id == this.validateBxForm.value.floor);
3992
     this.reqModal = true;
3994
     this.reqModal = true;
3993
   }
3995
   }
3994
   confirmReq() {
3996
   confirmReq() {