Browse Source

代码优化

seimin 5 months ago
parent
commit
6db0cbb605

+ 1 - 1
src/app/share/detail-bx/detail-bx.component.less

@@ -102,7 +102,7 @@
102
     margin-left: 3%;
102
     margin-left: 3%;
103
     font-size: 12px;
103
     font-size: 12px;
104
     color: #666666;
104
     color: #666666;
105
-    padding: 4px 0;
105
+    padding: 4px 0 20px 0;
106
     padding-left: 5%;
106
     padding-left: 5%;
107
     border-left: 1px #999999 solid;
107
     border-left: 1px #999999 solid;
108
     word-break: break-all;
108
     word-break: break-all;

+ 2 - 2
src/app/views/fuwutai/fuwutai.component.html

@@ -456,7 +456,7 @@
456
                 <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
456
                 <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
457
                   <input type="button" *ngIf="data.computedEditFlag" class="top_bot" value="编辑" (click)="edit(data.data)" />
457
                   <input type="button" *ngIf="data.computedEditFlag" class="top_bot" value="编辑" (click)="edit(data.data)" />
458
                   <input type="button" *ngIf="data.computedSubstitutionFlag" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
458
                   <input type="button" *ngIf="data.computedSubstitutionFlag" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
459
-                  <input type="button" *ngIf="data.computedReceiveFlag" class="top_bot" value="接单" (click)="showDelModal($event, data.data,'您确认要接单吗?','接单','receive')" />
459
+                  <!-- <input type="button" *ngIf="data.computedReceiveFlag" class="top_bot" value="接单" (click)="showDelModal($event, data.data,'您确认要接单吗?','接单','receive')" /> -->
460
                   <input type="button" *ngIf="coopBtns.del" class="btm_bot" value="删除" (click)="openDelModal(data.data.id, 'itsm')" />
460
                   <input type="button" *ngIf="coopBtns.del" class="btm_bot" value="删除" (click)="openDelModal(data.data.id, 'itsm')" />
461
                 </div>
461
                 </div>
462
                 <div *ngIf="data.data.overtimePercent <= 100" class="slider sgreen" [ngStyle]="{ width: data.data.overtimePercent + '%' }"></div>
462
                 <div *ngIf="data.data.overtimePercent <= 100" class="slider sgreen" [ngStyle]="{ width: data.data.overtimePercent + '%' }"></div>
@@ -661,7 +661,7 @@
661
                 <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
661
                 <div class="right_bots display_flex col-flex align-items_center justify-content_flex-center gap8">
662
                   <input type="button" *ngIf="data.computedEditFlag" class="top_bot" value="编辑" (click)="edit(data.data)" />
662
                   <input type="button" *ngIf="data.computedEditFlag" class="top_bot" value="编辑" (click)="edit(data.data)" />
663
                   <input type="button" *ngIf="data.computedSubstitutionFlag" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
663
                   <input type="button" *ngIf="data.computedSubstitutionFlag" class="top_bot" value="换人处理" (click)="substitution(data.data)" />
664
-                  <input type="button" *ngIf="data.computedHandleFlag" class="top_bot" value="处理" (click)="handle(data.data)" />
664
+                  <!-- <input type="button" *ngIf="data.computedHandleFlag" class="top_bot" value="处理" (click)="handle(data.data)" /> -->
665
                   <input type="button" *ngIf="coopBtns.del" class="btm_bot" value="删除" (click)="openDelModal(data.data.id, 'itsm')" />
665
                   <input type="button" *ngIf="coopBtns.del" class="btm_bot" value="删除" (click)="openDelModal(data.data.id, 'itsm')" />
666
                 </div>
666
                 </div>
667
                 <div *ngIf="data.data.overtimePercent <= 100" class="slider sgreen" [ngStyle]="{ width: data.data.overtimePercent + '%' }"></div>
667
                 <div *ngIf="data.data.overtimePercent <= 100" class="slider sgreen" [ngStyle]="{ width: data.data.overtimePercent + '%' }"></div>

+ 4 - 1
src/app/views/fuwutai/fuwutai.component.ts

@@ -2288,7 +2288,6 @@ export class FuwutaiComponent implements OnInit {
2288
     this.repairImgs = [];
2288
     this.repairImgs = [];
2289
     this.isRelatedDepartment = true;
2289
     this.isRelatedDepartment = true;
2290
     this.solutionId = undefined;
2290
     this.solutionId = undefined;
2291
-    delete this.incidentModel.incidentsign;
2292
   }
2291
   }
2293
   // 重置新建工单数据-继续建单-编辑-报修转事件
2292
   // 重置新建工单数据-继续建单-编辑-报修转事件
2294
   resetOrderData2(){
2293
   resetOrderData2(){
@@ -3597,6 +3596,10 @@ export class FuwutaiComponent implements OnInit {
3597
         postData.incident.fromWx = true;
3596
         postData.incident.fromWx = true;
3598
       }
3597
       }
3599
       postData.incident = Object.assign({}, this.editOrder, postData.incident);
3598
       postData.incident = Object.assign({}, this.editOrder, postData.incident);
3599
+
3600
+      if(this.buildType !== '继续建单' && this.buildType !== '编辑事件' && this.buildType !== '报修转事件'){
3601
+        delete postData.incident.incidentsign;
3602
+      }
3600
     }
3603
     }
3601
     console.log(postData);
3604
     console.log(postData);
3602
     // return;
3605
     // return;