护士端工单指派

src/app/views/hospital-config/hospital-config.component.html

@@ -454,6 +454,26 @@
                 </nz-form-control>
               </ng-container>
             </ng-container>
+            <ng-container *ngSwitchCase="'nurseSendOrder'">
+              <nz-form-label
+                [nzSpan]="24"
+                [nzFor]="config.key"
+                class="label"
+                [nzRequired]="config.required"
+                >{{config.desc}}</nz-form-label
+              >
+              <nz-form-control
+                [nzSpan]="24"
+                [nzErrorTip]="'请选择!'"
+              >
+                <nz-radio-group
+                  [formControlName]="config.key"
+                >
+                  <label nz-radio nzValue="1">是</label>
+                  <label nz-radio nzValue="0">否</label>
+                </nz-radio-group>
+              </nz-form-control>
+            </ng-container>
             <ng-container *ngSwitchDefault>
               <nz-form-label
                 [nzSpan]="24"

src/app/views/hushijiandan/hushijiandan-routing.module.ts

@@ -46,7 +46,8 @@ const routes: Routes = [
         component: DetailBxComponent
       },
       {
-        path: 'allotWorker/:id/:stateId',
+        // 指派
+        path: 'allotWorker/:id/:stateId/:flag/:hosId',
         component: AllocationWorkerComponent
       }
     ]

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

@@ -2316,6 +2316,20 @@
                             评价
                           </div>
                           <div
+                            *ngIf="isAssign && item.gdState.value == 2"
+                            class="btn flex_1 revocation borderR"
+                            (click)="allotWorker(item.id, item.gdState.id)"
+                          >
+                            指派
+                          </div>
+                          <div
+                            *ngIf="isAssign && item.gdState.value == 4"
+                            class="btn flex_1 revocation borderR"
+                            (click)="allotWorker(item.id, item.gdState.id, 1)"
+                          >
+                            指派
+                          </div>
+                          <div
                             *ngIf="
                               item.gdState.id == 69 ||
                               item.gdState.id == 70 ||
@@ -3743,7 +3757,7 @@
   </div>
 </div>
 
-<router-outlet></router-outlet>
+<router-outlet (deactivate)="refreshList($event)"></router-outlet>
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>
 <!-- 是否需要医护陪同检查模态框 -->

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

@@ -457,13 +457,15 @@ export class HushijiandanComponent implements OnInit {
   closeExecModal() {
     this.execModal = false;
   }
-  // 获取系统配置，护士端是否显示报修
-  isShowBx = false;
+  // 获取系统配置
+  isShowBx = false;// 护士端是否显示报修
+  isAssign = false;// 是否护士指定人员
   getItsmIncident() {
     let postData = { idx: 0, sum: 100, hospitalConfig: { hosId: this.currentHospital.id } };
     this.mainService.getFetchDataList("simple/data", "hospitalConfig", postData).subscribe((result) => {
         if (result.status == 200) {
           this.isShowBx = result.list.find(v => v.key == 'hos_itsmIncident').value == 1;
+          this.isAssign = result.list.find(v => v.key == 'nurseSendOrder').value == 1;
           if (this.isShowBx && (this.coopBtns.repairList || this.coopBtns.quickReportForRepair)) {
             // 初始化默认显示第一个
             if(this.tabPermission.length){
@@ -499,6 +501,14 @@ export class HushijiandanComponent implements OnInit {
         }
       });
   }
+  // 派单,flag 0是待抢单指派，1是待到达指派
+  allotWorker(id, stateId, flag?) {
+    if (flag == 1) {
+      this.router.navigateByUrl("nurse/allotWorker/" + id + "/" + stateId + "/1/" + this.currentHospital.id);
+    } else {
+      this.router.navigateByUrl("nurse/allotWorker/" + id + "/" + stateId + "/0/" + this.currentHospital.id);
+    }
+  }
   //获取检查页面任务类型
   getInspectAndPatientTransportConfigTasktype() {
     let postData = {
@@ -3887,11 +3897,6 @@ export class HushijiandanComponent implements OnInit {
     }
   }
 
-  // 派单
-  allotWorker(id, stateId) {
-    this.router.navigateByUrl("nurse/allotWorker/" + id + "/" + stateId);
-  }
-
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   showPromptModal(con, success, promptInfo?, back?) {
     this.btnLoading = false;
@@ -4065,4 +4070,11 @@ export class HushijiandanComponent implements OnInit {
     clearInterval(this.timerCloseTime);
     this.changeShow = false;
   }
+  // 刷新工单列表
+  refreshList(e) {
+    if (!e.promptContent) {
+      return;
+    }
+    this.getOrderList();
+  }
 }

src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
   enableProdMode();
   if (window) {
     window.console.log = function () { };
-    console.info('v2.4.39');
+    console.info('v2.4.40');
   }
 }
 platformBrowserDynamic().bootstrapModule(AppModule)