Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

src/app/components/incidentManagement/incident-create/incident-create.component.ts

@@ -129,6 +129,14 @@ export class IncidentCreateComponent implements OnInit {
       });
   }
 
+  // 判断工单当前状态
+  compareStateValue(incidentData){
+    if(incidentData.state.value !== 'pending' && incidentData.state.value !== 'handler' && incidentData.state.value !== 'reassign' && incidentData.state.value !== 'close'){
+      this.msg.warning('工单状态异常！请刷新页面再重试');
+      this.newOrderCancel();
+    }
+  }
+
   // 事件详情
   incidentData:any = {};
   getDetail(){
@@ -141,6 +149,7 @@ export class IncidentCreateComponent implements OnInit {
         this.msg.remove(this.maskFlag);
         this.maskFlag = false;
         this.incidentData = result.data || {};
+        this.compareStateValue(this.incidentData);
         this.edit(this.incidentData);
       });
   }
@@ -926,7 +935,7 @@ export class IncidentCreateComponent implements OnInit {
           // this.msg.success('直接解决成功');
           this.isBuildOrderAgaginFn();
         } else {
-          this.msg.error('直接解决失败');
+          this.msg.error(result.msg || '直接解决失败');
         }
       });
   }
@@ -1040,7 +1049,7 @@ export class IncidentCreateComponent implements OnInit {
           // this.msg.success('建单并派单成功');
           this.isBuildOrderAgaginFn();
         } else {
-          this.msg.error('建单并派单失败');
+          this.msg.error(result.msg || '建单并派单失败');
         }
       });
   }
@@ -1114,7 +1123,7 @@ export class IncidentCreateComponent implements OnInit {
           // this.msg.success('暂存成功');
           this.isBuildOrderAgaginFn();
         } else {
-          this.msg.error('暂存失败');
+          this.msg.error(result.msg || '暂存失败');
         }
       });
   }
@@ -1207,7 +1216,7 @@ export class IncidentCreateComponent implements OnInit {
           // this.msg.success('编辑成功');
           this.isBuildOrderAgaginFn();
         } else {
-          this.msg.error('编辑失败');
+          this.msg.error(result.msg || '编辑失败');
         }
       });
   }

src/app/components/incidentManagement/incident-handle-info/incident-handle-info.component.ts

@@ -71,7 +71,7 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
     this.getClosecodes();
     this.getSynergeticList();
     this.getAssetList();
-    this.getIncidentCategoryList();
+    this.getIncidentCategoryList('', true);
   }
 
   // 修改故障现象
@@ -143,7 +143,7 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
   // 获取故障现象
   incidentCategoryList:any[] = [];
   handleInfoLoading:boolean = false;
-  getIncidentCategoryList(keyword = ''){
+  getIncidentCategoryList(keyword = '', isInit = false){
     let { hospital, type } = this.tool.getHospitalOrDuty();
     if(type === 'hospital' || type === 'department'){
       this.incidentCategoryList = [];
@@ -158,9 +158,17 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
         dutyIds: type === 'duty' ? hospital.id.toString()  : undefined,
       },
     };
-    this.handleInfoLoading = true;
+    if(isInit){
+      this.handleInfoLoading = true;
+    }else{
+      this.isLoading = true;
+    }
     this.mainService.incidentPost("listIncidentCategory", postData).subscribe(res => {
-      this.handleInfoLoading = false;
+      if(isInit){
+        this.handleInfoLoading = false;
+      }else{
+        this.isLoading = false;
+      }
       this.incidentCategoryList = res.data || [];
       if(this.incidentDataCopy.category){
         let obj = this.incidentCategoryList.find(v => v.id == this.incidentDataCopy.category);

src/app/components/incidentManagement/incident-handle/incident-handle.component.ts

@@ -103,6 +103,14 @@ export class IncidentHandleComponent implements OnInit {
       });
   }
 
+  // 判断工单当前状态
+  compareStateValue(incidentData){
+    if(incidentData.state.value !== 'handler'){
+      this.message.warning('工单状态异常！请刷新页面再重试');
+      this.hideModal();
+    }
+  }
+
   // 获取详情数据
   incidentData:any;
   maskFlag:any = false;
@@ -117,6 +125,8 @@ export class IncidentHandleComponent implements OnInit {
         this.maskFlag = false;
         this.incidentData = result.data || {};
 
+        this.compareStateValue(this.incidentData);
+
         this.getDictionaryList();
         this.getHospitalConfig();
       });
@@ -290,7 +300,7 @@ export class IncidentHandleComponent implements OnInit {
         if (result.state == 200) {
           this.message.success('处理成功');
         } else {
-          this.message.error('处理失败');
+          this.message.error(result.msg || '处理失败');
         }
       });
     }else if(this.itsmSimpleHandle.value == 1){
@@ -338,7 +348,7 @@ export class IncidentHandleComponent implements OnInit {
         if (result.state == 200) {
           this.message.success('处理成功');
         } else {
-          this.message.error('处理失败');
+          this.message.error(result.msg || '处理失败');
         }
       });
     }

src/app/components/incidentManagement/incident-postpone/incident-postpone.component.ts

@@ -74,6 +74,14 @@ export class IncidentPostponeComponent implements OnInit {
 		})
   }
 
+  // 判断工单当前状态
+  compareStateValue(incidentData){
+    if(incidentData.state.value !== 'handler'){
+      this.message.warning('工单状态异常！请刷新页面再重试');
+      this.hideModal();
+    }
+  }
+
   // 操作权限
   incidentData:any = {};
   getDetail(){
@@ -86,6 +94,7 @@ export class IncidentPostponeComponent implements OnInit {
         this.message.remove(this.maskFlag);
         this.maskFlag = false;
         this.incidentData = result.data || {};
+        this.compareStateValue(this.incidentData);
       });
   }
 
@@ -129,7 +138,7 @@ export class IncidentPostponeComponent implements OnInit {
       if (result.state == 200) {
         this.message.success('操作成功');
       } else {
-        this.message.error('操作失败');
+        this.message.error(result.msg || '操作失败');
       }
     });
   }

src/app/components/incidentManagement/incident-substitution/incident-substitution.component.ts

@@ -61,6 +61,14 @@ export class IncidentSubstitutionComponent implements OnInit {
     this.activeTabValue = item.value;
   }
 
+  // 判断工单当前状态
+  compareStateValue(incidentData){
+    if(incidentData.state.value !== 'pending' && incidentData.state.value !== 'handler' && incidentData.state.value !== 'reassign'){
+      this.message.warning('工单状态异常！请刷新页面再重试');
+      this.hideModal();
+    }
+  }
+
   // 操作权限
   incidentData:any = {};
   maskFlag:any = false;
@@ -75,6 +83,8 @@ export class IncidentSubstitutionComponent implements OnInit {
         this.maskFlag = false;
         this.incidentData = result.data || {};
 
+        this.compareStateValue(this.incidentData);
+
         // 转派
         if(this.incidentData.state.value == 'handler' && this.incidentData.handlingPersonnelUser && this.incidentData.handlingPersonnelUser.id == this.tool.getCurrentUserId() && !this.coopBtns.assign && this.coopBtns.transfer){
           this.tabs.splice(0, 0, {id: 1, name: '转派', value: 'redeploy', num: ''});
@@ -151,7 +161,7 @@ export class IncidentSubstitutionComponent implements OnInit {
         if (result.state == 200) {
           this.message.success('转派成功');
         } else {
-          this.message.error('转派失败');
+          this.message.error(result.msg || '转派失败');
         }
       });
     }else if(this.activeTabValue === 'assign'){
@@ -194,7 +204,7 @@ export class IncidentSubstitutionComponent implements OnInit {
         if (result.state == 200) {
           this.message.success('指派成功');
         } else {
-          this.message.error('指派失败');
+          this.message.error(result.msg || '指派失败');
         }
       });
     }else if(this.activeTabValue === 'reassign'){
@@ -227,7 +237,7 @@ export class IncidentSubstitutionComponent implements OnInit {
         if (result.state == 200) {
           this.message.success('退回成功');
         } else {
-          this.message.error('退回失败');
+          this.message.error(result.msg || '退回失败');
         }
       });
     }

src/app/components/incidentManagement/incident-visit/incident-visit.component.ts

@@ -82,6 +82,14 @@ export class IncidentVisitComponent implements OnInit {
     });
   }
 
+  // 判断工单当前状态
+  compareStateValue(incidentData){
+    if(incidentData.state.value !== 'close'){
+      this.message.warning('工单状态异常！请刷新页面再重试');
+      this.hideModal();
+    }
+  }
+
   // 事件详情
   incidentData:any = {};
   getDetail(){
@@ -94,6 +102,7 @@ export class IncidentVisitComponent implements OnInit {
         this.message.remove(this.maskFlag);
         this.maskFlag = false;
         this.incidentData = result.data || {};
+        this.compareStateValue(this.incidentData);
       });
   }
 
@@ -139,7 +148,7 @@ export class IncidentVisitComponent implements OnInit {
       if (result.state == 200) {
         this.message.success('回访成功');
       } else {
-        this.message.error('回访失败');
+        this.message.error(result.msg || '回访失败');
       }
     });
   }

src/app/views/fuwutai/fuwutai.component.ts

@@ -2896,7 +2896,7 @@ export class FuwutaiComponent implements OnInit {
           // this.msg.success('直接解决成功');
           this.isBuildOrderAgaginFn();
         } else {
-          this.msg.error('直接解决失败');
+          this.msg.error(result.msg || '直接解决失败');
         }
       });
   }
@@ -3636,7 +3636,7 @@ export class FuwutaiComponent implements OnInit {
           // this.msg.success('建单并派单成功');
           this.isBuildOrderAgaginFn();
         } else {
-          this.msg.error('建单并派单失败');
+          this.msg.error(result.msg || '建单并派单失败');
         }
       });
   }
@@ -3711,7 +3711,7 @@ export class FuwutaiComponent implements OnInit {
           // this.msg.success('暂存成功');
           this.isBuildOrderAgaginFn();
         } else {
-          this.msg.error('暂存失败');
+          this.msg.error(result.msg || '暂存失败');
         }
       });
   }
@@ -3801,7 +3801,7 @@ export class FuwutaiComponent implements OnInit {
           // this.msg.success('编辑成功');
           this.isBuildOrderAgaginFn();
         } else {
-          this.msg.error('编辑失败');
+          this.msg.error(result.msg || '编辑失败');
         }
       });
   }
@@ -5031,7 +5031,7 @@ export class FuwutaiComponent implements OnInit {
         this.rejectModalShow = false;
         this.showPromptModal("不受理", true, "", "");
       } else {
-        this.msg.error('不受理失败');
+        this.msg.error(result.msg || '不受理失败');
       }
     });
   }

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

@@ -1286,51 +1286,28 @@
               </div>
             </div>
             <div class="orders">
-              <div
-                class="orderTit display_flex justify-content_space-between align-items_center"
-              >
+              <div class="orderTit display_flex justify-content_space-between align-items_center">
                 <span>工单列表<b style="font-size: 12px">({{ orderListTime }}秒)</b></span>
                 <div>
-                  <nz-select
-                    style="width: 100px"
-                    [(ngModel)]="orderStateSelected"
-                    (ngModelChange)="changeOrderState($event)"
-                    nzPlaceHolder="请选择工单状态"
-                  >
+                  <nz-select style="width: 100px" [(ngModel)]="orderStateSelected" (ngModelChange)="changeOrderState($event)" nzPlaceHolder="请选择工单状态">
                     <nz-option nzValue="-1" nzLabel="全部"></nz-option>
                     <nz-option nzValue="1" nzLabel="执行中"></nz-option>
                     <nz-option nzValue="2" nzLabel="待评价"></nz-option>
                   </nz-select>
-                  <nz-select
-                    class="ml8"
-                    style="width: 100px"
-                    [(ngModel)]="orderSelected"
-                    (ngModelChange)="changeOrderSel(orderSelected)"
-                    nzPlaceHolder="请选择任务类型"
-                  >
+                  <nz-select class="ml8" style="width: 100px" [(ngModel)]="orderSelected" (ngModelChange)="changeOrderSel(orderSelected)" nzPlaceHolder="请选择任务类型">
                     <nz-option nzValue="-1" nzLabel="全部"></nz-option>
-                    <nz-option
-                      *ngFor="let item of orderSelectList"
-                      [nzValue]="item.id"
-                      [nzLabel]="item.name"
-                    >
+                    <nz-option *ngFor="let item of orderSelectList" [nzValue]="item.id" [nzLabel]="item.name">
                     </nz-option>
                   </nz-select>
                 </div>
               </div>
-              <div
-                class="loading display_flex align-items_center justify-content_flex-center"
-                *ngIf="OLoading"
-              >
+              <div class="loading display_flex align-items_center justify-content_flex-center" *ngIf="OLoading">
                 <div>
                   <img src="../../assets/images/loading.gif" alt="" />
                   <div>加载中...</div>
                 </div>
               </div>
-              <div
-                class="loading none display_flex align-items_center justify-content_flex-center"
-                *ngIf="orderLength == 0 && !OLoading"
-              >
+              <div class="loading none display_flex align-items_center justify-content_flex-center" *ngIf="orderLength == 0 && !OLoading">
                 <div>
                   <div>暂无数据</div>
                 </div>
@@ -1339,47 +1316,22 @@
                 <overlay-scrollbars #osComponentRef1 class="box">
                   <div class="orderLisBox">
                     <div class="orderLis">
-                      <div
-                        class="loading display_flex align-items_center justify-content_flex-center"
-                        *ngIf="OLoading"
-                      >
+                      <div class="loading display_flex align-items_center justify-content_flex-center" *ngIf="OLoading">
                         <div>
                           <img src="../../assets/images/loading.gif" alt="" />
                           <div>加载中...</div>
                         </div>
                       </div>
-                      <div
-                        class="orderItem borderB"
-                        *ngFor="let item of orderList"
-                      >
+                      <div class="orderItem borderB" *ngFor="let item of orderList">
                         <div class="info">
                           <div class="row" nz-row>
                             <div nz-col nzSpan="12" class="col txtL">
-                              {{
-                                item.isHalfInspect === 1
-                                  ? "半程陪检"
-                                  : item.taskType.taskName
-                              }}
-                              <ng-container
-                                *ngIf="
-                                  item.taskType.associationType.value ==
-                                    'drugsBag' && item.drugs
-                                "
-                              >
+                              {{ item.isHalfInspect === 1 ? "半程陪检" : item.taskType.taskName }}
+                              <ng-container *ngIf="item.taskType.associationType.value == 'drugsBag' && item.drugs">
                                 ({{ item.drugs.packid }})
                               </ng-container>
-                              <ng-container *ngIf="item.goodsRemark"
-                                >-{{ item.goodsRemark }}</ng-container
-                              >
-                              <span
-                                *ngIf="
-                                  item.patient &&
-                                  (item.taskType.associationType.value ==
-                                    'patientTransport' ||
-                                    item.taskType.associationType.value ==
-                                      'inspect')
-                                "
-                              >
+                              <ng-container *ngIf="item.goodsRemark">-{{ item.goodsRemark }}</ng-container>
+                              <span *ngIf="item.patient && (item.taskType.associationType.value == 'patientTransport' || item.taskType.associationType.value == 'inspect')">
                                 （{{ item.patient.patientName }}）
                               </span>
                             </div>
@@ -1393,55 +1345,23 @@
                             </div>
                           </div>
                           <div class="row" nz-row>
-                            <!-- <div nz-col nzSpan="12" class="col txtL"></div> -->
                             <div nz-col nzSpan="12" class="col txtL">
-                              <ng-container
-                                *ngIf="
-                                  item.taskType.associationType.value ==
-                                    'drugsBag' && item.startDept
-                                "
-                              >
-                                {{
-                                  deptDisplay == 2
-                                    ? item.startDept.deptalias
-                                    : item.startDept.dept
-                                }}
+                              <ng-container *ngIf="item.taskType.associationType.value == 'drugsBag' && item.startDept">
+                                {{ deptDisplay == 2 ? item.startDept.deptalias : item.startDept.dept }}
                               </ng-container>
                             </div>
-                            <div
-                              *ngIf="item.showCreateTime"
-                              nz-col
-                              nzSpan="12"
-                              class="col txtR"
-                            >
+                            <div *ngIf="item.showCreateTime" nz-col nzSpan="12" class="col txtR">
                               {{ item.showCreateTime }}
                             </div>
-                            <div
-                              *ngIf="item.yyjdTime && item.gdState.value == 11"
-                              nz-col
-                              nzSpan="12"
-                              class="col txtR"
-                            >
+                            <div *ngIf="item.yyjdTime && item.gdState.value == 11" nz-col nzSpan="12" class="col txtR">
                               {{ item.yyjdTime | date: "MM-dd HH:mm" }}
                             </div>
                           </div>
                           <div class="row" nz-row>
                             <div nz-col nzSpan="12" class="col txtL">
-                              <span *ngIf="item.worker"
-                                >{{ item.worker.name }}
-                                {{
-                                  item.worker.phone
-                                    ? "(" + item.worker.phone + ")"
-                                    : ""
-                                }}</span
-                              >
+                              <span *ngIf="item.worker">{{ item.worker.name }}{{ item.worker.phone ? "(" + item.worker.phone + ")" : "" }}</span>
                             </div>
-                            <div
-                              nz-col
-                              nzSpan="12"
-                              class="col txtR toDetail"
-                              (click)="openDetails(item)"
-                            >
+                            <div nz-col nzSpan="12" class="col txtR toDetail" (click)="openDetails(item)">
                               <span>查看详情>></span>
                             </div>
                           </div>
@@ -1451,29 +1371,10 @@
                             <div class="steps" *ngFor="let step of item.record">
                               <div class="step">
                                 <div class="txt">
-                                  <i
-                                    [ngClass]="{
-                                      icon_transport: true,
-                                      'transport-icon_liucheng': true,
-                                      green:
-                                        step.record &&
-                                        step.record[0] &&
-                                        step.record[0].operationTime
-                                    }"
-                                  ></i>
+                                  <i [ngClass]="{ icon_transport: true, 'transport-icon_liucheng': true, green: step.record && step.record[0] && step.record[0].operationTime }"></i>
                                   <p>{{ step.operationName }}</p>
-                                  <p
-                                    class="time"
-                                    *ngIf="
-                                      step.record &&
-                                      step.record[0] &&
-                                      step.record[0].operationTime
-                                    "
-                                  >
-                                    {{
-                                      step.record[0].operationTime
-                                        | date: "MM-dd HH:mm"
-                                    }}
+                                  <p class="time" *ngIf="step.record && step.record[0] && step.record[0].operationTime">
+                                    {{ step.record[0].operationTime | date: "MM-dd HH:mm"}}
                                   </p>
                                 </div>
                                 <div class="line"></div>
@@ -1482,73 +1383,27 @@
                           </div>
                         </div>
                         <div class="btns display_flex">
-                          <div
-                            class="btn flex_1 appraise"
-                            *ngIf="item.gdState.id == 73"
-                            (click)="showAppraise(item.id)"
-                          >
+                          <div class="btn flex_1 appraise" *ngIf="item.gdState.id == 73" (click)="showAppraise(item.id)">
                             评价
                           </div>
-                          <div
-                            *ngIf="isAssign && item.gdState.value == 2"
-                            class="btn flex_1 revocation borderR primary"
-                            (click)="allotWorker(item.id, item.gdState.id)"
-                          >
+                          <div *ngIf="isAssign && item.gdState.value == 2" class="btn flex_1 revocation borderR primary" (click)="allotWorker(item.id, item.gdState.id)">
                             指派
                           </div>
-                          <div
-                            *ngIf="isAssign && item.gdState.value == 4"
-                            class="btn flex_1 revocation borderR primary"
-                            (click)="allotWorker(item.id, item.gdState.id, 1)"
-                          >
+                          <div *ngIf="isAssign && item.gdState.value == 4" class="btn flex_1 revocation borderR primary" (click)="allotWorker(item.id, item.gdState.id, 1)">
                             指派
                           </div>
-                          <div
-                            *ngIf="
-                              item.gdState.id == 69 ||
-                              item.gdState.id == 70 ||
-                              item.gdState.id == 71 ||
-                              item.gdState.id == 433
-                            "
-                            class="btn flex_1 revocation borderR"
-                            (click)="openRecallModal(item.id)"
-                          >
+                          <div *ngIf="item.gdState.id == 69 || item.gdState.id == 70 || item.gdState.id == 71 || item.gdState.id == 433" class="btn flex_1 revocation borderR" (click)="openRecallModal(item.id)">
                             撤销
                           </div>
-                          <div
-                            *ngIf="item.gdState.id == 433"
-                            class="btn flex_1 revocation borderR"
-                            (click)="openExecModal(item)"
-                          >
+                          <div *ngIf="item.gdState.id == 433" class="btn flex_1 revocation borderR" (click)="openExecModal(item)">
                             立即执行
                           </div>
-                          <div
-                            *ngIf="
-                              (item.gdState.id == 69 ||
-                                item.gdState.id == 71) &&
-                              item.taskType.allowUrgent == 1 &&
-                              !item.urgentDetails
-                            "
-                            class="btn flex_1 urgent"
-                            (click)="showJiaji(item.id)"
-                          >
+                          <div *ngIf="(item.gdState.id == 69 || item.gdState.id == 71) && item.taskType.allowUrgent == 1 && !item.urgentDetails" class="btn flex_1 urgent" (click)="showJiaji(item.id)">
                             加急
                           </div>
                         </div>
-                        <img
-                          src="../../assets/images/icon_ji.png"
-                          class="icon_ji"
-                          *ngIf="
-                            item.emergencyType && item.emergencyType.id == 300
-                          "
-                        />
-                        <img
-                          src="../../assets/images/icon_jiaji.png"
-                          class="icon_ji"
-                          *ngIf="
-                            item.emergencyType && item.emergencyType.id == 301
-                          "
-                        />
+                        <img src="../../assets/images/icon_ji.png" class="icon_ji" *ngIf="item.emergencyType && item.emergencyType.id == 300" />
+                        <img src="../../assets/images/icon_jiaji.png" class="icon_ji" *ngIf="item.emergencyType && item.emergencyType.id == 301" />
                       </div>
                     </div>
                   </div>
@@ -1556,14 +1411,7 @@
                 <!-- 翻页 -->
                 <div class="pageing">
                   <div>
-                    <nz-pagination
-                      [(nzPageIndex)]="orderIdx"
-                      [(nzTotal)]="orderLength"
-                      (nzPageIndexChange)="getOrderList()"
-                      [nzPageSize]="10"
-                      nzSimple
-                    >
-                    </nz-pagination>
+                    <nz-pagination [(nzPageIndex)]="orderIdx" [(nzTotal)]="orderLength" (nzPageIndexChange)="getOrderList()" [nzPageSize]="10" nzSimple></nz-pagination>
                   </div>
                 </div>
               </div>

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

@@ -4515,7 +4515,7 @@ export class HushijiandanComponent implements OnInit {
           this.getBxlb(this.bxlbPageIndex);
           this.showPromptModal("评价", true, "");
         } else {
-          this.showPromptModal("评价", false, "");
+          this.showPromptModal("评价", false, data.msg);
         }
       });
   }
@@ -4960,6 +4960,7 @@ export class HushijiandanComponent implements OnInit {
       this.loadingQuick = this.btnLoading;
       this.buildType = "bb";
       this.shortcutMsg1 = taskType;
+      this.workOrderRemark1 = workOrderRemark;
       this.confirmShortcut1(shortcutForm);
     }
   }

src/app/views/task-type-management/task-type-management.component.html

@@ -142,7 +142,7 @@
             <label nz-radio nzValue='0'>否</label>
           </nz-radio-group>
         </div>
-        <div class="mb8 w100" *ngIf="association.value == 'patientTransport' || association.value == 'inspect' || association.value == 'specimen' || association.value == 'other'">
+        <div class="mb8 w100">
           <nz-form-label class="label" nzRequired>是否需要备注信息</nz-form-label>
           <nz-radio-group class="handlerType" [(ngModel)]="isRemarks" (ngModelChange)="isRemarksChange()">
             <label nz-radio nzValue='1'>是</label>