服务台ITSM待接单

proxy.conf.json

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

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

@@ -252,7 +252,7 @@
                 <div class="left_cots">
                   <div class="gongdan" (click)="batchDispatchSelect(!data.checked, data.data.id)">
                     <span class="left gongdan_name">
-                      <span [ngClass]="priorityColor(data.priorityId)">{{ data.data.priorityDTO?.name }}</span>{{ data.data.incidentsign }} <span nz-tooltip [nzTooltipTitle]="data.data.hosName + data.data.department?.dept">{{ data.data.hosName }}{{ data.data.department?.dept }}</span>
+                      <span [ngClass]="priorityColor(data.data.priorityId)">{{ data.data.priorityDTO?.name }} </span>{{ data.data.incidentsign }} <span nz-tooltip [nzTooltipTitle]="data.data.hosName + data.data.department?.dept">{{ data.data.hosName }}{{ data.data.department?.dept }}</span>
                     </span>
                     <div class="right_all">
                       <span class="right">
@@ -468,7 +468,7 @@
                 <div class="left_cots">
                   <div class="gongdan" (click)="batchDispatchSelect(!data.checked, data.data.id)">
                     <span class="left gongdan_name">
-                      <span [ngClass]="priorityColor(data.priorityId)">{{ data.data.priorityDTO?.name }}</span>{{ data.data.incidentsign }} <span nz-tooltip [nzTooltipTitle]="data.data.hosName + data.data.department?.dept">{{ data.data.hosName }}{{ data.data.department?.dept }}</span>
+                      <span [ngClass]="priorityColor(data.data.priorityId)">{{ data.data.priorityDTO?.name }} </span>{{ data.data.incidentsign }} <span nz-tooltip [nzTooltipTitle]="data.data.hosName + data.data.department?.dept">{{ data.data.hosName }}{{ data.data.department?.dept }}</span>
                     </span>
                     <div class="right_all">
                       <span class="right">
@@ -2209,7 +2209,7 @@
                 </overlay-scrollbars>
               </ng-container>
               <!-- 故障报修 -->
-              <overlay-scrollbars #osComponentRef15 class="bottom_req" *ngIf="currentTabIndex == 99999">
+              <overlay-scrollbars #osComponentRef15 class="bottom_req" *ngIf="currentTabIndex === '99999'">
                 <div class="req">
                   <div class="row">
                     <div class="col flex4">
@@ -2472,12 +2472,7 @@
               [ngStyle]="{ height: '100%' }"
             >
               <div class="list listsTypeColor clearfix">
-                <nz-table
-                  [nzData]="patientLogList"
-                  nzSize="middle"
-                  [nzShowPagination]="false"
-                  [nzLoading]="loading5"
-                >
+                <nz-table class="w100" [nzData]="patientLogList" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading5">
                   <thead>
                     <tr class="thead">
                       <th nzWidth="10%">类型</th>
@@ -2681,7 +2676,7 @@
     (hideDelModalEvent)="closeDelOrderModal()"
     [btnLoading]="btnLoading"
     (confirmDelEvent)="confirmDel()"
-    content="您确认要删除此工单吗？"
+    content="您确认要删除吗？"
   ></app-dialog-delete>
   <!-- 删除模态框 -->
   <app-dialog-delete
@@ -2753,3 +2748,5 @@
 
 <!-- 换人处理 -->
 <app-incident-substitution [id]="coopData.id" *ngIf="substitutionModalShow" (closeModelHs)="closeSubstitutionModelOrder($event)" (confirmModelHs)="confirmSubstitutionModelOrder($event)"></app-incident-substitution>
+
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading" (confirmDelEvent)="confirmDelFn()" [content]="tipsMsg1"></app-dialog-delete>

src/app/views/fuwutai/fuwutai.component.less

@@ -51,7 +51,7 @@
 }
 
 .thead {
-  background-image: linear-gradient(to right, @bg-start, @bg-end);
+  background-image: linear-gradient(to right, @bg-start, @bg-end)!important;
 
   th {
     background: transparent;
@@ -1540,7 +1540,7 @@
       position: relative;
     }
     .thead {
-      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      background-image: linear-gradient(to right, @bg-start, @bg-end)!important;
       th {
         text-align: center !important;
         color: #fff;

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

@@ -1346,7 +1346,7 @@ export class FuwutaiComponent implements OnInit {
           "queryTask": "todoReassign",
         }
       }else if(stateId == 3){
-        return;
+        delete postData.incidentQuery;
       }
     }
 
@@ -1834,6 +1834,7 @@ export class FuwutaiComponent implements OnInit {
   }
   // 点击tab切换
   tabClick(key) {
+    let preCurrentTabIndex = this.currentTabIndex;
     this.currentTabIndex = key;
     this.radioValueQt = null;
     this.startDeptQt = null;
@@ -1853,7 +1854,7 @@ export class FuwutaiComponent implements OnInit {
     this.deptQtList["startStatus"] = 0;
     this.deptQtList["endStatus"] = 0;
 
-    if(this.currentTabIndex == '99999'){
+    if(this.currentTabIndex === '99999'){
       if(this.incidentModel.department){
         this.rightTitle_tab = [
           { id: 2, name: '近期维修' },
@@ -1874,7 +1875,7 @@ export class FuwutaiComponent implements OnInit {
       if(!this.incidentModel.source && source){
         this.incidentModel.source = source.id;
       }
-    }else{
+    }else if(preCurrentTabIndex === '99999'){
       if(this.applyDept){
         this.rightTitle_tab = [
           { id: 0, name: '近期配送' },
@@ -3186,6 +3187,11 @@ export class FuwutaiComponent implements OnInit {
     this.yyDateZy = addDays(this.yyDateZy, 1);
     this.yyDateChange(this.yyDateZy);
   }
+  // 下一日(其他临床服务)
+  nextDay() {
+    this.yyDate = addDays(this.yyDate, 1);
+    this.yyDateChange(this.yyDate);
+  }
   // 禁用日期(患者其他服务)
   disabledyyDateZy = (current: Date): boolean => {
     return differenceInCalendarDays(current, new Date()) < 0;
@@ -3718,6 +3724,7 @@ export class FuwutaiComponent implements OnInit {
     this.back = back || "";
     setTimeout(() => {
       this.showPromptModalRefresh();
+      this.promptModalShow = true;
     }, 100);
   }
 
@@ -3736,7 +3743,6 @@ export class FuwutaiComponent implements OnInit {
       } else if (this.currentRTab === 3) {
         this.getDictionaryList();
       }
-      this.promptModalShow = true;
       this.fixedTab = "";
       this.fixedMenuShangla();
   }
@@ -4034,4 +4040,58 @@ export class FuwutaiComponent implements OnInit {
   computedSubstitution(data){
     return (data.state.value === 'pending' || data.state.value === 'handler' || (data.state.value === 'reassign' && this.coopBtns.assign)) && data.deleteFlag !== 1;
   }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    e,
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    e.stopPropagation();
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDelFn() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "del") {
+      //删除
+      this.mainService
+        .simplePost("rmvData", "incident", [this.coopData.id])
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }else if (this.confirmDelType === "receive") {
+      //接单
+      this.mainService
+        .flowPost("incident/task/receive", { incident: this.coopData })
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.state == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }
+  }
 }