消毒供应任务类型配置

proxy.conf.json

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

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

@@ -232,6 +232,30 @@
             <label nz-radio nzValue='0'>否</label>
           </nz-radio-group>
         </div>
+        <div class="mb8 w100" *ngIf="association.value == 'other'">
+          <nz-form-label class="label" nzRequired>是否预定工单</nz-form-label>
+          <nz-radio-group class="handlerType" [(ngModel)]="reserveSwitch">
+            <label nz-radio nzValue='1'>是</label>
+            <label nz-radio nzValue='0'>否</label>
+          </nz-radio-group>
+        </div>
+        <div class="mb8 w100" *ngIf="association.value == 'other'">
+          <nz-form-label class="label" nzRequired>是否需要填写工号</nz-form-label>
+          <nz-radio-group class="handlerType" [(ngModel)]="reserveUserSwitch">
+            <label nz-radio nzValue='1'>是</label>
+            <label nz-radio nzValue='0'>否</label>
+          </nz-radio-group>
+        </div>
+        <div class="mb8 w100">
+          <nz-form-label class="label" nzRequired>是否限制业务发起时间</nz-form-label>
+          <nz-radio-group class="handlerType" [(ngModel)]="reserveType" (ngModelChange)="changeReserveType($event)">
+            <label nz-radio [nzValue]='option.value' *ngFor="let option of reserveTypes">{{option.name}}</label>
+          </nz-radio-group>
+        </div>
+        <div class="mb8 w100" *ngIf="reserveType == 3">
+          <nz-time-picker [(ngModel)]="reserveDate" nzFormat="HH:mm" class="mr8"></nz-time-picker>
+          <input nz-input style="width: 300px;" class="handlerType" [(ngModel)]="reserveMsg" placeholder="请填写超出时间提示用语" nzSize="default" />
+        </div>
         <div nz-row *ngIf="association.value == 'inspect' || association.value == 'patientTransport'">
           <nz-form-label class="label">携带设备</nz-form-label>
           <nz-checkbox-group class="handlerType" [nzDisabled]="isRemarks == 1" [(ngModel)]="carryEquipmentIds"></nz-checkbox-group>

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

@@ -7,6 +7,7 @@ import { ToolService } from "../../services/tool.service";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
 import { NzMessageService } from "ng-zorro-antd";
+import { format, startOfSecond } from 'date-fns';
 export interface Data {
   id: number;
   name: string;
@@ -109,6 +110,12 @@ export class TaskTypeManagementComponent implements OnInit {
   isDrugsCreateTime = "0"; //药品自动建单
   isOneClickSignIn = "0"; //是否允许一键签收
   isDigitalHandover = "0"; //是否允许数字交接
+  reserveSwitch = "0"; //是否预定工单
+  reserveUserSwitch = "0"; //是否需要填写工号
+  reserveType = "0"; //是否限制业务发起时间
+  reserveTypes:any = []; //是否限制业务发起时间-字典
+  reserveDate = null; //是否限制业务发起时间-时间
+  reserveMsg = ''; //是否限制业务发起时间-提示
   // wechatFocusSwitch = "0"; //支助中心端是否能标记重点关注
   isRemarks: any = "0"; //是否需要备注信息(其他类型)
   remarks = ""; //备注信息提示用语(其他类型)
@@ -305,6 +312,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.getAllTaskType(); //任务类型列表
     this.getSearchTaskList(); //任务类型列表,可搜索
     this.getSearchDeptList(); //标本配送，空单默认科室列表
+    this.getReserveType(); //获取是否限制业务发起时间-字典
   }
   // 搜索科室
   optionList = [];
@@ -502,6 +510,14 @@ export class TaskTypeManagementComponent implements OnInit {
         that.allAssociation = data;
       });
   }
+  // 获取是否限制业务发起时间-字典
+  getReserveType() {
+    this.mainService
+      .getDictionary("list", "reserveType")
+      .subscribe((data) => {
+        this.reserveTypes = data;
+      });
+  }
   // 获取所有关联业务
   getAllRelatedBusiness() {
     this.mainService
@@ -873,6 +889,20 @@ export class TaskTypeManagementComponent implements OnInit {
       !data.isDigitalHandover
         ? "0"
         : data.isDigitalHandover + ""; //是否允许数字交接
+    this.reserveSwitch =
+      !data.reserveSwitch
+        ? "0"
+        : data.reserveSwitch + ""; //是否预定工单
+    this.reserveUserSwitch =
+      !data.reserveUserSwitch
+        ? "0"
+        : data.reserveUserSwitch + ""; //是否需要填写工号
+    this.reserveType =
+      !data.reserveType
+        ? '1'
+        : data.reserveType.value + ""; //是否限制业务发起时间
+    this.reserveDate =  data.reserveDate === undefined ? null : data.reserveDate; //是否限制业务发起时间-时间
+    this.reserveMsg =  data.reserveMsg === undefined ? '' : data.reserveMsg; //是否限制业务发起时间-提示
     // this.wechatFocusSwitch =
     //   data.wechatFocusSwitch === undefined ? "0" : data.wechatFocusSwitch + ""; //支助中心端是否能标记重点关注
     this.leadTime =
@@ -968,6 +998,14 @@ export class TaskTypeManagementComponent implements OnInit {
   //提交数据
   loading5 = false; //保存按钮loading
   submitForm() {
+    if (this.reserveType == "3" && !this.reserveDate) {
+      this.showPromptModal(this.add ? "新增" : "编辑", false, "<span class='red'>是否限制业务发起时间</span>选择<span class='red'>根据时间限制</span>时需要选择时间");
+      return;
+    }
+    if (this.reserveType == "3" && !this.reserveMsg) {
+      this.showPromptModal(this.add ? "新增" : "编辑", false, "<span class='red'>是否限制业务发起时间</span>选择<span class='red'>根据时间限制</span>时需要填写超出时间提示用语");
+      return;
+    }
     //选择自动送回后，必须选择任务类型
     //空单默认科室必选
     if (
@@ -1204,6 +1242,15 @@ export class TaskTypeManagementComponent implements OnInit {
       this.taskData.taskType.isOneClickSignIn = parseInt(this.isOneClickSignIn); //是否允许一键签收
     }
     this.taskData.taskType.isDigitalHandover = this.isDigitalHandover === "1" ? 1 : 0; //是否允许数字交接
+    this.taskData.taskType.reserveSwitch = this.reserveSwitch === "1" ? 1 : 0; //是否预定工单
+    this.taskData.taskType.reserveUserSwitch = this.reserveUserSwitch === "1" ? 1 : 0; //是否需要填写工号
+    this.taskData.taskType.reserveType = this.reserveTypes.find(v => v.value == this.reserveType); //是否限制业务发起时间-字典
+    
+    // 根据时间限制
+    if(this.reserveType == '3'){
+      this.taskData.taskType.reserveDate = this.reserveDate ? format(startOfSecond(this.reserveDate), 'yyyy-MM-dd HH:mm:ss') : undefined; //是否限制业务发起时间-时间
+      this.taskData.taskType.reserveMsg = this.reserveMsg; //是否限制业务发起时间-提示
+    }
     // this.taskData.taskType.wechatFocusSwitch =
     //   this.wechatFocusSwitch === "1" ? 1 : 0; //支助中心端重点关注开关
     this.taskData.taskType.remarksSwitch = this.isRemarks === "1" ? 1 : 0; //是否需要备注信息
@@ -2529,4 +2576,12 @@ export class TaskTypeManagementComponent implements OnInit {
       this.carryingCourses[this.indexs].actionRemarks = '';
     }
   }
+
+  // 修改是否限制业务发起时间
+  changeReserveType(e){
+    if(!e){
+      this.reserveDate = null;
+      this.reserveMsg = '';
+    }
+  }
 }

src/main.ts

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