bug修复

src/app/components/incidentManagement/incident-handle-info-simple/incident-handle-info-simple.component.html

@@ -27,7 +27,7 @@
     </div>
   </div>
 
-  <div class="formItem">
+  <div class="formItem" *ngIf="itsmIncidentAsset.value == 1">
     <div class="name"><i class="icon_transport transport-required red" style="visibility: hidden;"></i>关联资产：</div>
     <div class="value w100">
       <nz-select class="w100" [(ngModel)]="incidentDataCopy.assetId" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch

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

@@ -47,6 +47,7 @@ export class IncidentHandleInfoSimpleComponent implements OnInit {
     this.hosId = this.tool.getCurrentHospital().id;
     this.incidentDataCopy = cloneDeep(this.incidentData);
     this.incidentDataCopy.synergetic = [];
+    this.getHospitalConfig();
     this.getHandleCategorys();
     this.getClosecodes();
     this.getSynergeticList();
@@ -114,6 +115,25 @@ export class IncidentHandleInfoSimpleComponent implements OnInit {
       });
   }
 
+  // 获取院区配置信息
+  itsmIncidentAsset:any = {};//是否事件关联资产
+  getHospitalConfig() {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      hospitalConfig: {
+        model: "itsm",
+        hosId: this.hosId,
+      },
+    }
+    this.mainService
+      .getFetchDataList("simple/data", "hospitalConfig", postData)
+      .subscribe((result) => {
+        let list = result.list || [];
+        this.itsmIncidentAsset = list.find(v => v.key == 'itsmIncidentAsset') || {};
+      });
+  }
+
   // 获取资产列表
   assetList: any = [];
   getAssetList(keyword = '') {

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

@@ -68,7 +68,7 @@
     </div>
   </div>
 
-  <div class="formItem">
+  <div class="formItem" *ngIf="itsmIncidentAsset.value == 1">
     <div class="name"><i class="icon_transport transport-required red" style="visibility: hidden;"></i>关联资产：</div>
     <div class="value w100">
       <nz-select class="w100" [(ngModel)]="incidentDataCopy.assetId" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch

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

@@ -66,6 +66,7 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
       this.incidentDataCopy.transSolution = 0;
     }
     console.log('this.incidentDataCopy:', this.incidentDataCopy)
+    this.getHospitalConfig();
     this.getHandleCategorys();
     this.getClosecodes();
     this.getSynergeticList();
@@ -169,6 +170,25 @@ export class IncidentHandleInfoComponent implements OnInit, OnChanges {
     })
   }
 
+  // 获取院区配置信息
+  itsmIncidentAsset:any = {};//是否事件关联资产
+  getHospitalConfig() {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      hospitalConfig: {
+        model: "itsm",
+        hosId: this.hosId,
+      },
+    }
+    this.mainService
+      .getFetchDataList("simple/data", "hospitalConfig", postData)
+      .subscribe((result) => {
+        let list = result.list || [];
+        this.itsmIncidentAsset = list.find(v => v.key == 'itsmIncidentAsset') || {};
+      });
+  }
+
   // 获取资产列表
   assetList: any = [];
   getAssetList(keyword = '') {

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

@@ -171,11 +171,13 @@ export class IncidentHandleOrderComponent implements OnInit {
     let postData:any = {
       consumable: {
         name: keyword,
-        // showZero: true,
       },
       idx: 0,
       sum: 20,
     };
+    if(this.itsmZeroStock.value == 1){
+      postData.consumable.showZero = true;
+		}
     if(this.itsmParentConsumable.value == 1){
       postData.consumable.upHosId = this.hosId;
 		}else{
@@ -302,6 +304,7 @@ export class IncidentHandleOrderComponent implements OnInit {
     let postData = {
       workHourManagement: {
         hosId: this.hosId,
+        showSecond: 1,
       },
       idx: 0,
       sum: 9999,

src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.component.html

@@ -13,7 +13,7 @@
             <div class="col">故障描述：{{item.description}}</div>
           </div>
           <div class="row">
-            <div class="col">详细地址：{{ item.place ? item.place.building.buildingName : '' }}{{ item.place ? item.place.floorName : '' }}{{ item.houseNumber }} <span [innerHTML]="transferHandlerLog(item.currentLog)"></span></div>
+            <div class="col">详细地址：{{ item.place ? item.place.building.buildingName : '' }}{{ item.place ? item.place.floorName : '' }}{{ item.houseNumber }} <span [innerHTML]="item.overtimeRemark"></span></div>
           </div>
           <div class="row">
             <div class="col">申请时间：{{ item.startDate | date: 'yyyy-MM-dd HH:mm'}}</div>

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

@@ -28,6 +28,7 @@ export class IncidentSubstitutionAssignComponent implements OnInit {
         this.getGroups(v[1]);
       }
     });
+
     this.initForm();
     this.getHospitals(1);
   }
@@ -43,6 +44,18 @@ export class IncidentSubstitutionAssignComponent implements OnInit {
       groupId: [null, [Validators.required]],//组
     });
     console.log(this.validateForm.controls)
+
+    // 默认回显当前人的院区和责任部门
+    let { hospital, type } = this.tool.getHospitalOrDuty();
+    if(type === 'duty'){
+      // 是责任部门
+      this.validateForm.controls.hosId.setValue(hospital.parent.id);
+      this.changeHospital(hospital.parent.id);
+      this.validateForm.controls.dutyId.setValue(hospital.id);
+    }else{
+      // 不是责任部门
+      this.validateForm.controls.hosId.setValue(hospital.id);
+    }
   }
 
   // 修改院区

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

@@ -225,9 +225,9 @@
                     </span>
                   </div>
 
-                  <div class="didian" *ngIf="transferHandlerLog(data.data.currentLog)">
+                  <div class="didian" *ngIf="data.data.overtimeRemark">
                     <span class="left">
-                      <span [innerHTML]="transferHandlerLog(data.data.currentLog)" nz-tooltip [nzTooltipTitle]="transferHandlerLog(data.data.currentLog)"></span>
+                      <span [innerHTML]="data.data.overtimeRemark" nz-tooltip [nzTooltipTitle]="data.data.overtimeRemark"></span>
                     </span>
                   </div>
                   <!-- 时间 -->
@@ -436,9 +436,9 @@
                     </span>
                   </div>
 
-                  <div class="didian" *ngIf="transferHandlerLog(data.data.currentLog)">
+                  <div class="didian" *ngIf="data.data.overtimeRemark">
                     <span class="left">
-                      <span [innerHTML]="transferHandlerLog(data.data.currentLog)" nz-tooltip [nzTooltipTitle]="transferHandlerLog(data.data.currentLog)"></span>
+                      <span [innerHTML]="data.data.overtimeRemark" nz-tooltip [nzTooltipTitle]="data.data.overtimeRemark"></span>
                     </span>
                   </div>
                   <!-- 时间 -->
@@ -640,9 +640,9 @@
                     </span>
                   </div>
 
-                  <div class="didian" *ngIf="transferHandlerLog(data.data.currentLog)">
+                  <div class="didian" *ngIf="data.data.overtimeRemark">
                     <span class="left">
-                      <span [innerHTML]="transferHandlerLog(data.data.currentLog)" nz-tooltip [nzTooltipTitle]="transferHandlerLog(data.data.currentLog)"></span>
+                      <span [innerHTML]="data.data.overtimeRemark" nz-tooltip [nzTooltipTitle]="data.data.overtimeRemark"></span>
                     </span>
                   </div>
                   <!-- 时间 -->

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

@@ -1336,7 +1336,10 @@ export class FuwutaiComponent implements OnInit {
       this.incomingService.connectWs().subscribe((data) => {
         // data = { status: 201, phone: '013581394341' };//ceshi
         console.log(data);
+        console.log(this.incidentModel);
         this.websocketLoading = false;
+        this.incidentModel = {};
+        this.incidentMsg = {};
         this.incidentModel.callID = data.callId || undefined;
         if (data.status == 200 && data.phone) {
           this.msg.info('签入成功');
@@ -1401,6 +1404,7 @@ export class FuwutaiComponent implements OnInit {
             console.log(this.newOrderShow);
             console.log(this.incidentModel);
             console.log(this.incidentMsg);
+            this.incidentMsg = {};
             if (!this.newOrderShow && !this.newOrderShowOpen) {
               this.applyDept = null;
               this.showNewOrder("no", this.incidentModel.incomingPhone, true, '来电弹屏');
@@ -1612,7 +1616,10 @@ export class FuwutaiComponent implements OnInit {
 
     let postData = {
       incident: {
-        department: { id },
+        department: {
+          id,
+          queryTask: 'all',
+        },
       },
       idx: 0,
       sum: 6,

src/app/views/incident-management/incident-management.component.html

@@ -1,7 +1,7 @@
 <div class="list-template pt0">
   <div class="list-template__content">
     <div class="list-template__tab">
-      <div class="list-template__tabItem" [ngClass]="{'active': queryTask == item.key}" (click)="changeTab(item.key)" *ngFor="let item of tabs">{{item.value}}({{item.num}})</div>
+      <div class="list-template__tabItem" [ngClass]="{'active': queryTask == item.key}" (click)="changeTab(item.key)" *ngFor="let item of tabs">{{item.value}}<span [ngClass]="{ red: item.isRed && item.num > 0}">({{item.num}})</span></div>
     </div>
     <div class="list-template__top" nz-row>
       <div nz-col nzXl='18' class="list-template__searchBox">
@@ -90,10 +90,10 @@
             <td>
               {{ data.acceptUser?.name || '无' }}<br>
               {{ transferSynergetic(data) }}<br>
-              <ng-container *ngIf="(data.state.value === 'pending' || data.state.value === 'reassign') && data.overdueTime"><span [ngStyle]="{ color: data.handleColourInfo ? data.handleColourInfo.value : '' }">{{ data.overdueTime | date: 'MM-dd HH:mm' }}</span>前接单</ng-container>
+              <ng-container *ngIf="(data.state.value === 'pending' || data.state.value === 'reassign') && data.overdueResponseDate"><span [ngStyle]="{ color: data.acceptColourInfo ? data.acceptColourInfo.value : '' }">{{ data.overdueResponseDate | date: 'MM-dd HH:mm' }}</span>前接单</ng-container>
               <ng-container *ngIf="data.state.value === 'handler' && data.overdueTime"><span [ngStyle]="{ color: data.handleColourInfo ? data.handleColourInfo.value : '' }">{{ data.overdueTime | date: 'MM-dd HH:mm' }}</span>前处理</ng-container>
             </td>
-            <td [innerHTML]="transferHandlerLog(data.currentLog)"></td>
+            <td [innerHTML]="data.overtimeRemark"></td>
             <td>{{ data.state?.name }}</td>
             <td>
               <div class="coop">

src/app/views/incident-management/incident-management.component.ts

@@ -48,15 +48,15 @@ export class IncidentManagementComponent implements OnInit {
   btnLoading: boolean = false; //提交按钮loading状态
 
   tabs:any[] = [
-    // {key: 'all', value: '全部故障', num: 0},
-    {key: 'todo', value: '待我接单', num: 0},
-    {key: 'doing', value: '待我处理', num: 0},
-    // {key: 'reassign', value: '重新指派', num: 0},
-    // {key: 'callback', value: '待我回访', num: 0},
-    {key: 'resolve', value: '由我解决', num: 0},
-    {key: 'owns', value: '与我关联', num: 0},
-    {key: 'storage', value: '暂存', num: 0},
-    // {key: 'badEvaluate', value: '异常评价', num: 0},
+    // {key: 'all', value: '全部故障', num: 0, isRed: false},
+    {key: 'todo', value: '待我接单', num: 0, isRed: true},
+    {key: 'doing', value: '待我处理', num: 0, isRed: true},
+    // {key: 'reassign', value: '重新指派', num: 0, isRed: false},
+    // {key: 'callback', value: '待我回访', num: 0, isRed: false},
+    {key: 'resolve', value: '由我解决', num: 0, isRed: false},
+    {key: 'owns', value: '与我关联', num: 0, isRed: false},
+    {key: 'storage', value: '暂存', num: 0, isRed: false},
+    // {key: 'badEvaluate', value: '异常评价', num: 0, isRed: false},
   ]
 
   searchDTO: any = {};
@@ -99,18 +99,18 @@ export class IncidentManagementComponent implements OnInit {
   // 初始化tab
   initTabs(){
     if (this.coopBtns.all) {
-        this.tabs.splice(0, 0 , {key: 'all', value: '全部故障', num: 0});
+        this.tabs.splice(0, 0 , {key: 'all', value: '全部故障', num: 0, isRed: false});
     }
     if (this.coopBtns.callback) {
         let index = this.tabs.findIndex(v => v.key == 'resolve');
-        this.tabs.splice(index, 0 , {key: 'callback', value: '待我回访', num: 0});
+        this.tabs.splice(index, 0 , {key: 'callback', value: '待我回访', num: 0, isRed: false});
     }
     if (this.coopBtns.reassign) {
         let index = this.tabs.findIndex(v => v.key == 'doing');
-        this.tabs.splice(index + 1, 0 , {key: 'reassign', value: '重新指派', num: 0});
+        this.tabs.splice(index + 1, 0 , {key: 'reassign', value: '重新指派', num: 0, isRed: false});
     }
     // if (this.coopBtns.badEvaluate) {
-    //     this.tabs.push({key: 'badEvaluate', value: '异常评价', num: 0});
+    //     this.tabs.push({key: 'badEvaluate', value: '异常评价', num: 0, isRed: false});
     // }
   }
 

src/app/views/main/main.component.html

@@ -31,7 +31,7 @@
       <div class="app-header display_flex justify-content_space-between align-items_center">
         <div class="left">
           <i class="icon_transport transport-tiaodu-fill green" *ngIf='deskRole' (click)="toFuwutai()" nz-tooltip nzTooltipTitle="调度台"></i>
-          <i class="icon_transport transport-hushi green" *ngIf="nurseRole" (click)="toHuShi()" nz-tooltip nzTooltipTitle="护士端"></i>
+          <i class="icon_transport transport-hushizhihanghuligongzuo green" *ngIf="nurseRole" (click)="toHuShi()" nz-tooltip nzTooltipTitle="护士端"></i>
           <i class="icon_transport transport-peizhi1 green" *ngIf="configurationCenterRole" (click)="toConfigurationCenter()" nz-tooltip nzTooltipTitle="配置中心"></i>
           <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && !userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要上班"></i>
           <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要下班"></i>

src/app/views/main/main.component.less

@@ -277,7 +277,7 @@ nz-header.ant-layout-header {
 
         .user {
           overflow: hidden;
-          height: 100%;
+          height: 48px;
           display: flex;
           justify-content: center;
           align-items: center;

src/assets/iconfont/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon icon_transport">&#xe7ba;</span>
+                <div class="name">护士执行护理工作</div>
+                <div class="code-name">&amp;#xe7ba;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon icon_transport">&#xe6bb;</span>
                 <div class="name">配置</div>
                 <div class="code-name">&amp;#xe6bb;</div>
@@ -942,9 +948,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'icon_transport';
-  src: url('iconfont.woff2?t=1728986389176') format('woff2'),
-       url('iconfont.woff?t=1728986389176') format('woff'),
-       url('iconfont.ttf?t=1728986389176') format('truetype');
+  src: url('iconfont.woff2?t=1729066208752') format('woff2'),
+       url('iconfont.woff?t=1729066208752') format('woff'),
+       url('iconfont.ttf?t=1729066208752') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -971,6 +977,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon icon_transport transport-hushizhihanghuligongzuo"></span>
+            <div class="name">
+              护士执行护理工作
+            </div>
+            <div class="code-name">.transport-hushizhihanghuligongzuo
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon icon_transport transport-peizhi1"></span>
             <div class="name">
               配置
@@ -2304,6 +2319,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#transport-hushizhihanghuligongzuo"></use>
+                </svg>
+                <div class="name">护士执行护理工作</div>
+                <div class="code-name">#transport-hushizhihanghuligongzuo</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#transport-peizhi1"></use>
                 </svg>
                 <div class="name">配置</div>

src/assets/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "icon_transport"; /* Project id 4543613 */
-  src: url('iconfont.woff2?t=1728986389176') format('woff2'),
-       url('iconfont.woff?t=1728986389176') format('woff'),
-       url('iconfont.ttf?t=1728986389176') format('truetype');
+  src: url('iconfont.woff2?t=1729066208752') format('woff2'),
+       url('iconfont.woff?t=1729066208752') format('woff'),
+       url('iconfont.ttf?t=1729066208752') format('truetype');
 }
 
 .icon_transport {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.transport-hushizhihanghuligongzuo:before {
+  content: "\e7ba";
+}
+
 .transport-peizhi1:before {
   content: "\e6bb";
 }

src/assets/iconfont/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "39318134",
+      "name": "护士执行护理工作",
+      "font_class": "hushizhihanghuligongzuo",
+      "unicode": "e7ba",
+      "unicode_decimal": 59322
+    },
+    {
       "icon_id": "376638",
       "name": "配置",
       "font_class": "peizhi1",