报修及图片优化

src/app/services/main.service.ts

@@ -515,8 +515,8 @@ export class MainService {
     });
   }
   //获取附件图片
-  wechatRequesterIncident(id) {
-    return this.http.get(host.host + "/itsm/common/listAttachment/wechatRequesterIncident/" + id, {
+  listAttachment(type, id) {
+    return this.http.get(host.host + "/itsm/common/listAttachment/" + type + "/" + id, {
       headers: this.headers,
     });
   }

src/app/share/detail-bx/detail-bx.component.html

@@ -13,15 +13,14 @@
           <div nz-col nzSpan="8">报修地址：<ng-container *ngIf="orderInfo.place">{{ orderInfo.place.area.area }} {{ orderInfo.place.place }} {{ orderInfo.address }}</ng-container></div>
           <div nz-col nzSpan="24">报修内容：{{orderInfo.incidentDescription}}</div>
           <div nz-col nzSpan="24">报修图片：
-            <!-- <div class="imgViewHelp">
-              <ul id="ljImgViewerId" class="list">
-                <img class="mr8" *ngFor="let img of imgs;let i = index;" width="100px" [src]="img" alt="" />
-              </ul>
-            </div> -->
-            <app-image-viewer [imageUrl]="imgs" *ngIf="imgs.length"></app-image-viewer>
+            <app-image-viewer [imageUrl]="imgs_wechatRequesterIncident" *ngIf="imgs_wechatRequesterIncident.length"></app-image-viewer>
+          </div>
+          <div nz-col nzSpan="24">处理图片：
+            <app-image-viewer [imageUrl]="imgs_incident" *ngIf="imgs_incident.length"></app-image-viewer>
           </div>
           <div nz-col nzSpan="8">维修人：<ng-container *ngIf="orderInfo.incident&&orderInfo.incident.handlingPersonnelUser">{{ orderInfo.incident.handlingPersonnelUser.name }}</ng-container></div>
           <div nz-col nzSpan="8">维修人电话：<ng-container *ngIf="orderInfo.incident&&orderInfo.incident.handlingPersonnelUser">{{ orderInfo.incident.handlingPersonnelUser.phone }}</ng-container></div>
+          <div nz-col nzSpan="8" *ngIf="orderInfo.incident&&orderInfo.incident.repairSummaryDTO">维修总金额：{{ orderInfo.incident.repairSummaryDTO.totalMaintenancePrice }}元</div>
           <div nz-col nzSpan="24" *ngIf="processData == '已撤回'">撤回原因：{{ orderInfo.retractReason }}</div>
           <div nz-col nzSpan="24" *ngIf="processData == '不受理'">不受理原因：{{ orderInfo.rejectRemark }}</div>
         </div>
@@ -142,7 +141,7 @@
                   "
                 >
                   <div class="status"></div>
-                  <div class="conents">{{ item.opValue }}</div>
+                  <div class="conents"><span *ngIf="item.repairType && item.expectedDate">{{item.repairType.name}}{{item.expectedDate|date:'MM月dd日前完成'}}</span> {{ item.opValue }}</div>
                 </div>
               </div>
             </ng-container>
@@ -289,7 +288,7 @@
     <button class=" btn cancel" nz-button nzType="default" (click)="close()">取消</button>
   </div>
 </div>
-  
+
 <!-- 撤回工单 -->
 <div class="recallOrder" *ngIf="recallOrderShow">
   <div class="modalBody">
@@ -328,4 +327,3 @@
 </app-prompt-modal>
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>
-  

src/app/share/detail-bx/detail-bx.component.ts

@@ -27,7 +27,8 @@ export class DetailBxComponent implements OnInit {
   processTime = [];
   processData = "";
   processMessage = [];
-  imgs = [];
+  imgs_wechatRequesterIncident = [];
+  imgs_incident = [];
 
   id: number; //工单id
   orderInfo: any; //工单详情信息
@@ -69,12 +70,16 @@ export class DetailBxComponent implements OnInit {
       this.orderInfo = res[1]["data"];
       this.getProcessTime();
       this.getProcessMessageData();
-      this.getImgsData();
-      if (this.orderInfo.incident && !this.orderInfo.incident.handlerLogs) {
-        this.orderInfo.incident.handlerLogs = [];
-      } else {
-        this.orderInfo.incident.handlerLogs.reverse();
+      this.getImgsData('wechatRequesterIncident');
+      this.getImgsData('incident');
+      if(this.orderInfo.incident){
+        if (!this.orderInfo.incident.handlerLogs) {
+          this.orderInfo.incident.handlerLogs = [];
+        } else {
+          this.orderInfo.incident.handlerLogs.reverse();
+        }
       }
+
       if (this.orderInfo.incident && this.orderInfo.incident.repeat) {
         this.processData = "重复事件";
       } else if (this.orderInfo.incidentState.name == "不受理") {
@@ -94,13 +99,24 @@ export class DetailBxComponent implements OnInit {
   }
 
   // 获取图片信息
-  getImgsData() {
+  getImgsData(type) {
+    let id;
+    if(type === 'wechatRequesterIncident'){
+      id = this.orderInfo.id;
+    } else if(type === 'incident'){
+      if(this.orderInfo.incident){
+        id = this.orderInfo.incident.processInstanceId;
+      } else {
+        this['imgs_' + type] = [];
+        return;
+      }
+    }
     this.mainService
-      .wechatRequesterIncident(this.orderInfo.id)
+      .listAttachment(type, id)
       .subscribe((res:any)=> {
         // this.imgs = ['https://img2.woyaogexing.com/2022/08/19/1f5e056b1d076920!400x400.jpg','https://img2.woyaogexing.com/2022/08/19/359346943c3c489f!400x400.jpg']
         for (var i = 0; i < res.data.length; i++) {
-          this.imgs.push(res.data[i].previewUrl);
+          this['imgs_' + type].push(location.origin + '/file' + res.data[i].relativeFilePath);
         }
       });
   }

src/app/views/hushijiandan/hushijiandan.component.html

@@ -2102,8 +2102,8 @@
                         [(ngModel)]="incidentStateId"
                       >
                         <nz-option
-                          nzLabel="{{ data.name }}"
-                          nzValue="{{ data.id }}"
+                          [nzLabel]="data.name"
+                          [nzValue]="data.id"
                           *ngFor="let data of incidentStateList"
                         ></nz-option>
                       </nz-select>

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -1125,19 +1125,7 @@ export class HushijiandanComponent implements OnInit {
       }
     });
   }
-  // 获取事件状态
-  incidentStateId = undefined;
-  incidentStateList = [];
-  getIncidentState() {
-    let postData = { type: "list", key: "wxincident_state" };
-    this.iLoading = true;
-    this.mainService.getDictionaryByITSM(postData).subscribe((data: any) => {
-      this.iLoading = false;
-      if (data.status == 200) {
-        this.incidentStateList = data.data || [];
-      }
-    });
-  }
+
   // 获取星级
   degrees = [];
   getDegrees() {
@@ -3384,7 +3372,7 @@ export class HushijiandanComponent implements OnInit {
       this.getHistoryDrugsbag();
     } else if (type === "bxlb" && this.isShowBx && this.coopBtns.repairList) {
       this.getBxlb();
-      this.getIncidentState();
+      // this.getIncidentState();
       this.getDegrees();
     } else if (type === "kjbx" && this.isShowBx && this.coopBtns.quickReportForRepair) {
       // this.getQuickBxlb();
@@ -3598,6 +3586,19 @@ export class HushijiandanComponent implements OnInit {
         this.historyDrugsbagListLength = data.totalNum || 0;
       });
   }
+  // 获取事件状态
+  incidentStateId = undefined;
+  incidentStateList = [];
+  // getIncidentState() {
+  //   let postData = { type: "list", key: "wxincident_state" };
+  //   this.iLoading = true;
+  //   this.mainService.getDictionaryByITSM(postData).subscribe((data: any) => {
+  //     this.iLoading = false;
+  //     if (data.status == 200) {
+  //       this.incidentStateList = data.data || [];
+  //     }
+  //   });
+  // }
   // 报修列表查询表格数据
   bxlbList: any = [];
   bxlbPageIndex: number = 1; //表格当前页码
@@ -3608,25 +3609,37 @@ export class HushijiandanComponent implements OnInit {
   processing: number = 0; //处理中的数量
   bxlbLoading = false;
   getBxlb(idx?) {
-    if (idx) {
-      this.bxlbPageIndex = 1;
-    }
-    let current = JSON.parse(localStorage.getItem("user"));
-    this.bxlbLoading = true;
-    this.mainService
-      .listWxIncident({
-        deptId: current.user.dept.id,
-        // assignee: current.user.account,
-        state: this.incidentStateId?parseInt(this.incidentStateId):undefined,
-        idx: this.bxlbPageIndex - 1,
-        sum: this.bxlbPageSize,
-      })
-      .subscribe((data: any) => {
-        this.bxlbLoading = false;
-        this.bxlbList = data.data || [];
-        this.bxlbListLength = data.resultCount || 0;
-        this.processing = data.resultCount || 0;
-      });
+    // 获取事件状态
+    let postData = { type: "list", key: "wxincident_state" };
+    this.iLoading = true;
+    this.mainService.getDictionaryByITSM(postData).subscribe((data: any) => {
+      this.iLoading = false;
+      if (data.status == 200) {
+        this.incidentStateList = data.data || [];
+        let valueObj2 = this.incidentStateList.find(v => v.value == 2);
+        this.incidentStateId = valueObj2 ? valueObj2.id : undefined;
+        // 报修列表查询表格数据
+        if (idx) {
+          this.bxlbPageIndex = 1;
+        }
+        let current = JSON.parse(localStorage.getItem("user"));
+        this.bxlbLoading = true;
+        this.mainService
+          .listWxIncident({
+            deptId: current.user.dept.id,
+            // assignee: current.user.account,
+            state: this.incidentStateId ? this.incidentStateId : undefined,
+            idx: this.bxlbPageIndex - 1,
+            sum: this.bxlbPageSize,
+          })
+          .subscribe((data: any) => {
+            this.bxlbLoading = false;
+            this.bxlbList = data.data || [];
+            this.bxlbListLength = data.resultCount || 0;
+            this.processing = data.resultCount || 0;
+          });
+      }
+    });
   }
 
   //快速报修列表

src/app/views/nucleic-acid-collection/nucleic-acid-collection.component.ts

@@ -44,7 +44,7 @@ export class NucleicAcidCollectionComponent implements OnInit {
       this.isPreview = false;
       this.mainService.getPreviewImage('specimenPhotos', data.id).subscribe((result:any)=>{
         if (result.status == 200) {
-          this.imgs = result.data.map((v) => v.previewUrl);
+          this.imgs = result.data.map((v) => location.origin + '/file' + v.relativeFilePath);
           this.isPreview = true;
         } else {
           this.imgs = [];