报修列表和详情

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.4.171",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/services/main.service.ts

@@ -510,7 +510,7 @@ export class MainService {
   }
   //查报修列表
   listWxIncident(data) {
-    return this.http.post(host.host + "/itsm/listWxIncident", data, {
+    return this.http.post(host.host + "/itsm/fetchDataList/incident", data, {
       headers: this.headers,
     });
   }
@@ -520,12 +520,6 @@ export class MainService {
       headers: this.headers,
     });
   }
-  //查报修流程时间
-  getProcessTime(data,processInstanceId) {
-    return this.http.post(host.host + "/itsm/bpm/flowTracing/"+processInstanceId, data, {
-      headers: this.headers,
-    });
-  }
   //查列表
   fetchListBx(type, data) {
     return this.http.post(host.host + "/itsm/fetchDataList/" + type, data, {

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

@@ -5,258 +5,48 @@
     <div class="content">
       <div class="top" *ngIf="amplificationShow">
         <div class="num">
-          <span class="left">报修编号：{{orderInfo.bxcode}}</span>
-          <span class="right">{{orderInfo.incidentState?orderInfo.incidentState.name:''}}</span>
+          <span class="left">工单单号：{{orderInfo.incidentsign}}</span>
+          <span class="right">{{orderInfo.state?orderInfo.state.name:''}}</span>
         </div>
         <div class="info" nz-row>
           <div nz-col nzSpan="8">报修类别：{{orderInfo.category?orderInfo.category.category:''}}</div>
-          <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="8">报修地址：<ng-container *ngIf="orderInfo.place">{{ orderInfo.place.area.area }} {{ orderInfo.place.place }} {{ orderInfo.houseNumber }}</ng-container></div>
+          <div nz-col nzSpan="24">报修内容：{{orderInfo.description}}</div>
           <div nz-col nzSpan="24">报修图片：
             <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 nz-col nzSpan="8">维修人：<ng-container *ngIf="orderInfo.handlingPersonnelUser">{{ orderInfo.handlingPersonnelUser.name }}</ng-container></div>
+          <div nz-col nzSpan="8">维修人电话：<ng-container *ngIf="orderInfo.handlingPersonnelUser">{{ orderInfo.handlingPersonnelUser.phone }}</ng-container></div>
+          <div nz-col nzSpan="8">维修总金额：{{orderInfo.rsPrice === undefined ? '无' : orderInfo.rsPrice + '元'}}</div>
         </div>
       </div>
       <div class="center" *ngIf="amplificationShow">
         <div class="box">
           <!-- 流程图 start -->
           <div class="processBox">
-            <div
-              class="process"
-              *ngIf="
-                processData == '不受理' ||
-                  processData == '结束' ||
-                  processData == '已撤回' ||
-                  processData == '重复事件'
-              "
-            >
-              <div class="status">
-                {{ processMessage[4] ? processMessage[4].name : "" }}
-              </div>
-              <div class="ico">
-                <i class="icon_transport transport-icon_liucheng last"></i>
-              </div>
-              <div class="time">
-                <ng-container *ngIf="processTime[4]">
-                  {{processTime[4].startTime | date:"MM-dd HH:mm:ss"}}
-                </ng-container>
-              </div>
-            </div>
-            <div
-              class="processCont"
-              *ngIf="
-                processData == '不受理' ||
-                  processData == '结束' ||
-                  processData == '已撤回' ||
-                  processData == '重复事件'
-              "
-            >
-              <div class="status"></div>
-              <div
-                class="conents"
-                [innerHTML]="processMessage[4] ? processMessage[4].desc : ''"
-              ></div>
-            </div>
-            <div
-              class="process"
-              *ngIf="
-                processData == '评价' ||
-                  (processData == '结束' && processData != '重复事件')
-              "
-            >
-              <div class="status">
-                {{ processMessage[3] ? processMessage[3].name : "" }}
-              </div>
-              <div class="ico">
-                <i
-                  class="icon_transport transport-icon_liucheng green now"
-                  *ngIf="processData == '评价'"
-                ></i>
-                <i
-                  class="icon_transport transport-icon_liucheng last"
-                  *ngIf="processData != '评价'"
-                ></i>
-              </div>
-              <div class="time">
-                <ng-container *ngIf="processTime[3]">
-                  {{processTime[3].startTime | date:"MM-dd HH:mm:ss"}}
-                </ng-container>
-              </div>
-            </div>
-            <div
-              class="processCont"
-              *ngIf="
-                processData == '评价' ||
-                  (processData == '结束' && processData != '重复事件')
-              "
-            >
-              <div class="status"></div>
-              <div
-                class="conents"
-                [innerHTML]="processMessage[3] ? processMessage[3].desc : ''"
-              ></div>
-            </div>
-            <!-- 处理日志 start -->
-            <ng-container *ngIf="orderInfo.incident">
-              <div *ngFor="let item of orderInfo.incident.handlerLogs;let i = index;">
-                <div
-                  class="process"
-                  *ngIf="
-                    processData == '处理' ||
-                      processData == '评价' ||
-                      (processData == '结束' && processData != '重复事件')
-                  "
-                >
-                  <div class="status">
-                    {{ processMessage[2] ? processMessage[2].name : "" }}
-                  </div>
-                  <div class="ico">
-                    <i
-                      class="icon_transport transport-icon_liucheng green now"
-                      *ngIf="processData == '处理' && i === 0"
-                    ></i>
-                    <i
-                      class="icon_transport transport-icon_liucheng last"
-                      *ngIf="!(processData == '处理' && i === 0)"
-                    ></i>
-                  </div>
-                  <div class="time">
-                    {{ item.opTime | date:"MM-dd HH:mm:ss"}}，{{ item.userName }}
-                  </div>
+            <ng-container *ngFor="let item of progressInfo;let last = last;">
+              <div class="process">
+                <div class="status">
+                  {{ item.logType ? item.logType.name : '' }}
                 </div>
-                <div
-                  class="processCont"
-                  *ngIf="
-                    processData == '处理' ||
-                      processData == '评价' ||
-                      (processData == '结束' && processData != '重复事件')
-                  "
-                >
-                  <div class="status"></div>
-                  <div class="conents"><span *ngIf="item.repairType && item.expectedDate">{{item.repairType.name}}{{item.expectedDate|date:'MM月dd日前完成'}}</span> {{ item.opValue }}</div>
+                <div class="ico">
+                  <i class="icon_transport transport-icon_liucheng last"></i>
+                </div>
+                <div class="time">
+                    {{ item.startTime | date:"MM-dd HH:mm:ss" }}
+                    <span *ngIf="item.appointorName">
+                      ，{{ item.appointorName }}
+                    </span>
                 </div>
               </div>
-            </ng-container>
-            <!-- 处理日志 end -->
-            <div
-              class="process"
-              *ngIf="
-                processData == '处理' ||
-                  processData == '评价' ||
-                  (processData == '结束' && processData != '重复事件')
-              "
-            >
-              <div class="status">
-                {{ processMessage[2] ? processMessage[2].name : "" }}
-              </div>
-              <div class="ico">
-                <i
-                  class="icon_transport transport-icon_liucheng green now"
-                  *ngIf="processData == '处理' && orderInfo.incident && !orderInfo.incident.handlerLogs"
-                ></i>
-                <i
-                  class="icon_transport transport-icon_liucheng last"
-                  v-else
-                ></i>
-              </div>
-              <div class="time">
-                <ng-container *ngIf="processTime[2]">
-                  {{processTime[2].startTime | date:"MM-dd HH:mm:ss"}}
-                </ng-container>
-              </div>
-            </div>
-            <div
-              class="processCont"
-              *ngIf="
-                processData == '处理' ||
-                  processData == '评价' ||
-                  (processData == '结束' && processData != '重复事件')
-              "
-            >
-              <div class="status"></div>
-              <div
-                class="conents"
-                [innerHTML]="processMessage[2] ? processMessage[2].desc : ''"
-              ></div>
-            </div>
-            <div
-              class="process"
-              *ngIf="
-                processData == '受理' ||
-                  processData == '处理' ||
-                  processData == '评价' ||
-                  (processData == '结束' && processData != '重复事件')
-              "
-            >
-              <div class="status">
-                {{ processMessage[1] ? processMessage[1].name : "" }}
-              </div>
-              <div class="ico">
-                <i
-                  class="icon_transport transport-icon_liucheng green now"
-                  *ngIf="processData == '受理'"
-                ></i>
-                <i
-                  class="icon_transport transport-icon_liucheng last"
-                  *ngIf="processData != '受理'"
-                ></i>
-              </div>
-              <div class="time">
-                <ng-container *ngIf="processTime[1]">
-                  {{processTime[1].startTime | date:'MM-dd HH:mm:ss'}}
-                </ng-container>
-              </div>
-            </div>
-            <div
-              class="processCont"
-              *ngIf="
-                processData == '受理' ||
-                  processData == '处理' ||
-                  processData == '评价' ||
-                  (processData == '结束' && processData != '重复事件')
-              "
-            >
-              <div class="status"></div>
-              <div
-                class="conents"
-                [innerHTML]="processMessage[1] ? processMessage[1].desc : ''"
-              ></div>
-            </div>
-            <div class="process">
-              <div class="status">
-                {{ processMessage[0] ? processMessage[0].name : "" }}
-              </div>
-              <div class="ico">
-                <i
-                  class="icon_transport transport-icon_liucheng green now"
-                  *ngIf="processData == '申请'"
-                ></i>
-                <i
-                  class="icon_transport transport-icon_liucheng last"
-                  *ngIf="processData != '申请'"
-                ></i>
-              </div>
-              <div class="time">
-                <ng-container *ngIf="processTime[0]">
-                  {{processTime[0].startTime | date:"MM-dd HH:mm:ss"}}
-                </ng-container>
+              <div class="processCont">
+                <div class="status"></div>
+                <div class="conents" [ngClass]="{lastContent: last}" [innerHTML]="item.remark"></div>
               </div>
-            </div>
-            <div class="processCont">
-              <div class="status"></div>
-              <div
-                class="conents lastConents"
-                [innerHTML]="processMessage[0] ? processMessage[0].desc : ''"
-              ></div>
-            </div>
+            </ng-container>
           </div>
           <!-- 流程图 end -->
         </div>
@@ -285,7 +75,7 @@
     </div>
   </overlay-scrollbars>
   <div class="btns display_flex justify-content_flex-center">
-    <button nz-button nzType="primary" (click)="goToSummary()" *ngIf="orderInfo.incident.duty && orderInfo.incident.duty.addSummary == 1">维修单</button>
+    <button nz-button nzType="primary" (click)="goToSummary()" *ngIf="orderInfo.duty && orderInfo.duty.addSummary == 1">维修单</button>
     <button class=" btn cancel" nz-button nzType="default" (click)="close()">取消</button>
   </div>
 </div>
@@ -326,6 +116,6 @@
   [info]="promptInfo" (closeModel)="close()">
   <!-- 2.父组件调用子组件时绑定到这个事件属性，并在事件发生时作出回应。(closeModel)="close()" -->
 </app-prompt-modal>
-<app-incident-details *ngIf="isShowIncidentDetails" (close)="closeIncidentDetails()" [incidentId]="orderInfo.incident.id"></app-incident-details>
+<app-incident-details *ngIf="isShowIncidentDetails" (close)="closeIncidentDetails()" [incidentId]="orderInfo.id"></app-incident-details>
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>

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

@@ -84,9 +84,11 @@
     padding: 4px 0;
     padding-left: 5%;
     border-left: 1px #999999 solid;
-    line-height: 15[x];
     word-break: break-all;
   }
+  .processCont .conents.lastContent {
+    border-left: none;
+  }
   .processCont .lastConents {
     border-left: none;
   }

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

@@ -24,9 +24,8 @@ export class DetailBxComponent implements OnInit {
     private tool: ToolService,
     private mainService: MainService
   ) {}
-  processTime = [];
+  progressInfo = [];
   processData = "";
-  processMessage = [];
   imgs_wechatRequesterIncident = [];
   imgs_incident = [];
 
@@ -70,33 +69,9 @@ export class DetailBxComponent implements OnInit {
       this.logList = res[0]["data"];
       // getDetail
       this.orderInfo = res[1]["data"];
-      this.getProcessTime();
-      this.getProcessMessageData();
+      this.getProgressInfo();
       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 == "不受理") {
-        this.processData = "不受理";
-      } else if (this.orderInfo.incidentState.name == "未受理") {
-        this.processData = "申请";
-      } else if (this.orderInfo.incidentState.name == "处理中") {
-        this.processData = "处理";
-      } else if (this.orderInfo.incidentState.name == "待评价") {
-        this.processData = "评价";
-      } else if (this.orderInfo.incidentState.name == "已解决") {
-        this.processData = "结束";
-      } else if (this.orderInfo.incidentState.name == "已撤回") {
-        this.processData = "已撤回";
-      }
     });
   }
 
@@ -112,17 +87,7 @@ export class DetailBxComponent implements OnInit {
 
   // 获取图片信息
   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;
-      }
-    }
+    let id = this.orderInfo.id;
     this.mainService
       .listAttachment(type, id)
       .subscribe((res:any)=> {
@@ -133,29 +98,19 @@ export class DetailBxComponent implements OnInit {
       });
   }
 
-  //获取流程节点时间
-  getProcessTime() {
-    if (this.orderInfo.incident && this.orderInfo.incident.processInstanceId) {
-      this.mainService
-        .getProcessTime({}, this.orderInfo.incident.processInstanceId)
-        .subscribe((res: any) => {
-          this.processTime = res.data;
-        });
-    }
-  }
-
-  getProcessMessageData() {
-    this.mainService
-      .fetchListBx("dictionary", {
-        idx: 0,
-        sum: 10,
-        dictionary: {
-          key: "wxincident_task_default",
-        },
-      })
-      .subscribe((res: any) => {
-        this.processMessage = res.list;
-      });
+  //获取处理进度
+  getProgressInfo() {
+    this.mainService .fetchListBx("incidentLog", {
+      "idx": 0,
+      "sum": 9999,
+      "incidentLog": {
+          "incidentId": this.orderInfo.id
+      }
+    })
+    .subscribe((res: any) => {
+      console.log(res);
+      this.progressInfo = res.list || [];
+    });
   }
 
   // 放大
@@ -165,7 +120,7 @@ export class DetailBxComponent implements OnInit {
 
   // 获取工单详情
   getDetail() {
-    return this.mainService.fetchDataBx("wXIncident", this.id);
+    return this.mainService.fetchDataBx("incident", this.id);
   }
 
   // 确认加急

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

@@ -2099,7 +2099,6 @@
                         class="formItem"
                         [nzDropdownMatchSelectWidth]="false"
                         [nzShowSearch]="false"
-                        nzAllowClear
                         nzPlaceHolder="请选择状态"
                         [(ngModel)]="incidentStateId"
                       >
@@ -2134,13 +2133,12 @@
                     >
                       <thead>
                         <tr class="thead">
-                          <th nzWidth="7%">序号</th>
-                          <th nzWidth="16%">报修内容</th>
-                          <th nzWidth="16%">报修时间</th>
-                          <th nzWidth="16%">报修科室</th>
-                          <th nzWidth="10%">状态</th>
-                          <th nzWidth="20%">维修人</th>
-                          <th nzWidth="15%"></th>
+                          <th nzWidth="5%">序号</th>
+                          <th nzWidth="19%">报修内容</th>
+                          <th nzWidth="19%">报修时间</th>
+                          <th nzWidth="19%">状态</th>
+                          <th nzWidth="19%">维修人</th>
+                          <th nzWidth="19%"></th>
                         </tr>
                       </thead>
                       <tbody>
@@ -2148,10 +2146,7 @@
                           <td>{{ i + 1 }}</td>
                           <td>{{ data.description || "无" }}</td>
                           <td>
-                            {{ data.createTime | date: "MM-dd HH:mm" }}
-                          </td>
-                          <td>
-                            {{ data.departmentDTO ? data.departmentDTO.dept : "无" }}
+                            {{ data.startDate | date: "yyyy-MM-dd HH:mm" }}
                           </td>
                           <td>{{ data.state?data.state.name:'无' }}</td>
                           <td>
@@ -2166,7 +2161,7 @@
                           <td>
                             <!-- <button (click)="viewBx(data)">查看</button> -->
                             <button class="btn1 mr8 mb8 mt8" (click)="detailBx(data)">查看</button>
-                            <button class="btn1 mr8 mb8 mt8" (click)="showAppraiseBx(data.id)" *ngIf="data.state.name  == '待评价'">评价</button>
+                            <button class="btn1 mr8 mb8 mt8" (click)="showAppraiseBx(data.id)" *ngIf="data.state.value == 'close' && !data.wxdegree">评价</button>
                           </td>
                         </tr>
                       </tbody>

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

@@ -3628,14 +3628,16 @@ export class HushijiandanComponent implements OnInit {
   bxlbLoading = false;
   getBxlb(idx, isInitState = false) {
     // 获取事件状态
-    let postData = { type: "list", key: "wxincident_state" };
+    let postData = { type: "list", key: "incident_status" };
     this.iLoading = true;
     this.mainService.getDictionaryByITSM(postData).subscribe((data: any) => {
       this.iLoading = false;
       if (data.status == 200) {
-        this.incidentStateList = data.data || [];
+        let incidentStateList = data.data || [];
+        incidentStateList.unshift({id: 0, name: '全部', value: 0});
+        this.incidentStateList = incidentStateList;
         if(isInitState){
-          let valueObj2 = this.incidentStateList.find(v => v.value == 2);
+          let valueObj2 = this.incidentStateList.find(v => v.value == 0);
           this.incidentStateId = valueObj2 ? valueObj2.id : undefined;
         }
 
@@ -3647,17 +3649,19 @@ export class HushijiandanComponent implements OnInit {
         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,
+            incident: {
+              // assignee: current.user.account,
+              state: this.incidentStateId ? { id: this.incidentStateId } : undefined,
+              department: { pcode: current.user.dept.pcode },
+            }
           })
           .subscribe((data: any) => {
             this.bxlbLoading = false;
-            this.bxlbList = data.data || [];
-            this.bxlbListLength = data.resultCount || 0;
-            this.processing = data.resultCount || 0;
+            this.bxlbList = data.list || [];
+            this.bxlbListLength = data.totalNum || 0;
+            this.processing = data.totalNum || 0;
           });
       }
     });