事件编辑

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

@@ -13,7 +13,7 @@
         <div class="name">故障工单编辑</div>
         <div class="newTopItem">
           <span class="grayFont required">院区：</span>
-          <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzPlaceHolder="请选择院区" [(ngModel)]="incidentModel.hosId" (ngModelChange)="changeApplyHospital($event)" nzAllowClear>
+          <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzPlaceHolder="请选择院区" [(ngModel)]="incidentModel.hosId" (ngModelChange)="changeApplyHospital($event)" nzAllowClear [nzDisabled]="buildType === '编辑事件'">
             <ng-container *ngFor="let option of applicationHospitalList">
               <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
             </ng-container>
@@ -105,6 +105,9 @@
                     <span class="name">报修人电话：</span>
                     <ng-container *ngIf="incidentMsg.requesterPhone">{{incidentMsg.requesterPhone}}<em (click)="importPhone(incidentMsg.requesterPhone)">引入</em></ng-container>
                   </div>
+                  <div class="col">
+
+                  </div>
                 </div>
 
                 <div class="row gap8">
@@ -149,7 +152,7 @@
                 <div class="row gap8">
                   <div class="col">
                     <span class="name required">优先级：</span>
-                    <nz-select class="w100" [(ngModel)]="incidentModel.priorityId" nzAllowClear nzPlaceHolder="请选择优先级">
+                    <nz-select class="w100" [(ngModel)]="incidentModel.priorityId" nzAllowClear nzPlaceHolder="请选择优先级" [nzDisabled]="buildType === '编辑事件'">
                       <nz-option [nzValue]="item.id" [nzLabel]="item.name" *ngFor="let item of applicationPriorityList"></nz-option>
                     </nz-select>
                   </div>

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

@@ -100,17 +100,8 @@ export class IncidentCreateComponent implements OnInit {
     incidentModel.source && (incidentModel.source = incidentModel.source.id);
     incidentModel.area && (incidentModel.area = incidentModel.area.id);
     incidentModel.place && (incidentModel.place = incidentModel.place.id);
-
-    let { hospital, type } = this.tool.getHospitalOrDuty();
-    if(type === 'duty'){
-      // 当前的所属责任部门
-      incidentModel.category && (this.applicationCategoryList = [cloneDeep(incidentModel.category)]);
-      incidentModel.category && (incidentModel.category = incidentModel.category.id);
-    }else{
-      // 当前的所属院区
-      incidentModel.category && (this.applicationCategoryList = []);//故障现象列表为空，不要问，问就是设计如此
-      incidentModel.category && (incidentModel.category = undefined);
-    }
+    incidentModel.category && (this.applicationCategoryList = [cloneDeep(incidentModel.category)]);
+    incidentModel.category && (incidentModel.category = incidentModel.category.id);
 
     this.incidentModel = incidentModel;
     this.incidentMsg = incidentMsg;
@@ -206,7 +197,7 @@ export class IncidentCreateComponent implements OnInit {
     this.incidentModel.duty = undefined;
 
     // 根据院区和故障现象带出责任部门，优先级，维修人/组
-    if(this.incidentModel.category && e){
+    if(this.incidentModel.category && e && this.buildType !== '编辑事件'){
       let postData = {
         idx: 0,
         sum: 9999,
@@ -292,16 +283,11 @@ export class IncidentCreateComponent implements OnInit {
   // 故障现象列表
   applicationCategoryList:any[] = [];
   searchApplicationCategory(keyWord?) {
-    let { hospital, type } = this.tool.getHospitalOrDuty();
     let dutyIds;
-    if(type === 'duty'){
-      // 当前的所属责任部门
-      dutyIds = hospital.id.toString();
-    }else{
-      // 当前的所属院区
-      this.applicationCategoryList = [];//故障现象列表为空，不要问，问就是设计如此
-      return;
+    if(this.buildType === '编辑事件'){
+      dutyIds = this.incidentModel.duty.id.toString();
     }
+
     let postData = {
       category: {
         category: keyWord,
@@ -337,7 +323,7 @@ export class IncidentCreateComponent implements OnInit {
       }
     }
     // 根据院区和故障现象带出责任部门，优先级，维修人/组
-    if(this.incidentModel.hosId && e){
+    if(this.incidentModel.hosId && e && this.buildType !== '编辑事件'){
       let postData = {
         idx: 0,
         sum: 9999,
@@ -776,7 +762,7 @@ export class IncidentCreateComponent implements OnInit {
     this.searchApplicationRequester();
 
     // 根据院区和故障现象带出责任部门，优先级，维修人/组
-    if(this.incidentModel.category && this.incidentModel.hosId){
+    if(this.incidentModel.category && this.incidentModel.hosId && this.buildType !== '编辑事件'){
       let postData = {
         idx: 0,
         sum: 9999,
@@ -1117,15 +1103,41 @@ export class IncidentCreateComponent implements OnInit {
   buildType;
   editOrder;
   saveOrder(){
+    if(!this.incidentModel.category){
+      this.msg.warning('请选择故障现象!');
+      return;
+    }
+
+    let category = this.applicationCategoryList.find(v => v.id == this.incidentModel.category);
+    if(!this.incidentModel.duty){
+      this.msg.warning(`故障现象【${category.mutiCategory}】没有设置责任部门!`);
+      return;
+    }
+
+    if(!this.incidentModel.department){
+      this.msg.warning('请选择申请科室!');
+      return;
+    }
+
+    if(!this.incidentModel.contactsInformation){
+      this.msg.warning('请填写联系电话!');
+      return;
+    }
+
+    if(!this.incidentModel.priorityId){
+      this.msg.warning('请选择优先级!');
+      return;
+    }
+
+    if(!this.incidentModel.description){
+      this.msg.warning('请选择故障描述!');
+      return;
+    }
+
     this.maskFlag = this.msg.loading("正在加载中..", {
       nzDuration: 0,
     }).messageId;
 
-    let category;
-    if(this.incidentModel.category){
-      category = this.applicationCategoryList.find(v => v.id == this.incidentModel.category);
-    }
-
     let postData:any = {
       solutionId: this.solutionId,
       "incident": {

src/app/views/fuwutai/fuwutai.component.html

@@ -1168,7 +1168,7 @@
           <div class="name">来电咨询</div>
           <div class="newTopItem">
             <span class="grayFont required">院区：</span>
-            <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzPlaceHolder="请选择院区" [(ngModel)]="incidentModel.hosId" (ngModelChange)="changeApplyHospital($event)" nzAllowClear>
+            <nz-select style="width: 160px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzPlaceHolder="请选择院区" [(ngModel)]="incidentModel.hosId" (ngModelChange)="changeApplyHospital($event)" nzAllowClear [nzDisabled]="buildType === '编辑事件'">
               <ng-container *ngFor="let option of applicationHospitalList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
               </ng-container>
@@ -1892,9 +1892,11 @@
                       <span class="name">报修人电话：</span>
                       <ng-container *ngIf="incidentMsg.requesterPhone">{{incidentMsg.requesterPhone}}<em (click)="importPhone(incidentMsg.requesterPhone)">引入</em></ng-container>
                     </div>
-                    <div class="col" *ngIf="buildType !== '编辑事件'">
-                      <span class="name">来电电话：</span>
-                      <ng-container *ngIf="incidentModel.incomingPhone">{{incidentModel.incomingPhone}}<em (click)="importPhone(incidentModel.incomingPhone)">引入</em></ng-container>
+                    <div class="col">
+                      <ng-container *ngIf="buildType !== '编辑事件'">
+                        <span class="name">来电电话：</span>
+                        <ng-container *ngIf="incidentModel.incomingPhone">{{incidentModel.incomingPhone}}<em (click)="importPhone(incidentModel.incomingPhone)">引入</em></ng-container>
+                      </ng-container>
                     </div>
                   </div>
 
@@ -1940,7 +1942,7 @@
                   <div class="row gap8">
                     <div class="col">
                       <span class="name required">优先级：</span>
-                      <nz-select class="w100" [(ngModel)]="incidentModel.priorityId" nzAllowClear nzPlaceHolder="请选择优先级">
+                      <nz-select class="w100" [(ngModel)]="incidentModel.priorityId" nzAllowClear nzPlaceHolder="请选择优先级" [nzDisabled]="buildType === '编辑事件'">
                         <nz-option [nzValue]="item.id" [nzLabel]="item.name" *ngFor="let item of applicationPriorityList"></nz-option>
                       </nz-select>
                     </div>

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

@@ -2559,7 +2559,7 @@ export class FuwutaiComponent implements OnInit {
     this.incidentModel.duty = undefined;
 
     // 根据院区和故障现象带出责任部门，优先级，维修人/组
-    if(this.incidentModel.category && e){
+    if(this.incidentModel.category && e && this.buildType !== '编辑事件'){
       let postData = {
         idx: 0,
         sum: 9999,
@@ -2645,12 +2645,18 @@ export class FuwutaiComponent implements OnInit {
   // 故障现象列表
   applicationCategoryList:any[] = [];
   searchApplicationCategory(keyWord?) {
+    let dutyIds;
+    if(this.buildType === '编辑事件'){
+      dutyIds = this.incidentModel.duty.id.toString();
+    }else{
+      dutyIds = this.itsmData.checkedHos.length ? (this.itsmData.checkedHos.map(v => v.id).toString() || undefined) : undefined;
+    }
     let postData = {
       category: {
         category: keyWord,
         selectType: 'mutlQuery',
         hierarchy: 3,//只差有三级的故障现象列表
-        dutyIds: this.itsmData.checkedHos.length ? (this.itsmData.checkedHos.map(v => v.id).toString() || undefined) : undefined,
+        dutyIds,
       },
     };
     console.log(postData);
@@ -2680,7 +2686,7 @@ export class FuwutaiComponent implements OnInit {
       }
     }
     // 根据院区和故障现象带出责任部门，优先级，维修人/组
-    if(this.incidentModel.hosId && e){
+    if(this.incidentModel.hosId && e && this.buildType !== '编辑事件'){
       let postData = {
         idx: 0,
         sum: 9999,
@@ -3248,7 +3254,7 @@ export class FuwutaiComponent implements OnInit {
     this.searchApplicationRequester();
 
     // 根据院区和故障现象带出责任部门，优先级，维修人/组
-    if(this.incidentModel.category && this.incidentModel.hosId){
+    if(this.incidentModel.category && this.incidentModel.hosId && this.buildType !== '编辑事件'){
       let postData = {
         idx: 0,
         sum: 9999,
@@ -3600,15 +3606,40 @@ export class FuwutaiComponent implements OnInit {
 
   // 运维-保存
   saveOrder(){
+    if(!this.incidentModel.category){
+      this.msg.warning('请选择故障现象!');
+      return;
+    }
+
+    let category = this.applicationCategoryList.find(v => v.id == this.incidentModel.category);
+    if(!this.incidentModel.duty){
+      this.msg.warning(`故障现象【${category.mutiCategory}】没有设置责任部门!`);
+      return;
+    }
+
+    if(!this.incidentModel.department){
+      this.msg.warning('请选择申请科室!');
+      return;
+    }
+
+    if(!this.incidentModel.contactsInformation){
+      this.msg.warning('请填写联系电话!');
+      return;
+    }
+
+    if(!this.incidentModel.priorityId){
+      this.msg.warning('请选择优先级!');
+      return;
+    }
+
+    if(!this.incidentModel.description){
+      this.msg.warning('请选择故障描述!');
+      return;
+    }
     this.maskFlag = this.msg.loading("正在加载中..", {
       nzDuration: 0,
     }).messageId;
 
-    let category;
-    if(this.incidentModel.category){
-      category = this.applicationCategoryList.find(v => v.id == this.incidentModel.category);
-    }
-
     let postData:any = {
       solutionId: this.solutionId,
       "incident": {