是否允许提前执行

proxy.conf.json

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

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

@@ -407,42 +407,16 @@ export class HushijiandanComponent implements OnInit {
   // 打开立即执行模态框
   openExecModal(item) {
     this.coopItem = item;
-    this.execModal = true;
+    // 是否允许提前执行
+    if(item.taskType.executeSwitch == 1){
+      this.execModal = true;
+    }else{
+      this.showPromptModal("操作", false, "相关任务会到点执行，无需立即执行。有问题请联系相关科室！");
+    }
   }
   // 确认立即执行
   confirmExec() {
     this.btnLoading = true;
-    // let postData: any = {
-    //   workOderId: this.coopItem.id,
-    //   workOrder: {
-    //     sourceId: this.coopItem.sourceId,
-    //     taskType: {
-    //       id: this.coopItem.taskType.id,
-    //     },
-    //     startDept: {
-    //       id: this.coopItem.startDept.id,
-    //     },
-    //     endDepts: this.coopItem.endDepts.map((v) => ({ id: v.id })),
-    //     createDept: this.coopItem.createDept,
-    //     patient: {
-    //       patientCode: this.coopItem.patient.patientCode,
-    //     },
-    //     goods: this.coopItem.goods,
-    //     platform: 2,
-    //     isAccompany: this.coopItem.isAccompany,
-    //   },
-    // };
-    // if (this.coopItem.isRemand !== undefined) {
-    //   postData.workOrder.isRemand = this.coopItem.isRemand;
-    // }
-    // if (this.coopItem.taskType.associationType.value == 'inspect') {
-    //   postData.workOrder.taskType.isHalfInspect = this.coopItem.taskType.isHalfInspect;
-    // }
-    // checkList:[
-    //   {
-    //     "id": 1165517
-    //   }
-    // ]
     this.mainService.executeNow(this.coopItem.id).subscribe((result: any) => {
       this.closeExecModal();
       if (result.status == 200) {

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

@@ -187,6 +187,13 @@
             <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)]="executeSwitch">
+            <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)]="bindTrans">

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

@@ -104,6 +104,7 @@ export class TaskTypeManagementComponent implements OnInit {
   remandTypeId = null; //开通自动送回,选择的任务类型
   defaultNullDeptId = null; //空单默认科室-标本配送
   specialCloseButton = "0"; //是否开通自动送回
+  executeSwitch = 0;
   bindTrans = "0"; //是否关联数据
   appointmentBuildFlag = "0"; //护士端是否允许预约建单,患者陪检业务
   appointmentBuildFlagZy = "0"; //护士端是否允许预约建单,患者其他服务
@@ -966,6 +967,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.specialCloseButton = data.specialCloseButton
       ? data.specialCloseButton + ""
       : "0";
+    this.executeSwitch = data.executeSwitch ? data.executeSwitch : 0;
     this.bindTrans = data.bindTrans
       ? data.bindTrans + ""
       : "0";
@@ -1266,6 +1268,7 @@ export class TaskTypeManagementComponent implements OnInit {
       delete this.taskData.taskType["ordinaryField"];
     }
     this.taskData.taskType["specialCloseButton"] = this.specialCloseButton;
+    this.taskData.taskType["executeSwitch"] = this.executeSwitch;
     this.taskData.taskType["bindTrans"] = this.bindTrans;
     if (this.departmentStrategy.idv) {
       this.taskData.taskType.carryingCourses[this.indexs].departmentStrategy = {
@@ -1491,6 +1494,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.remandTypeId = null; //自动送回，选择任务类型
     this.defaultNullDeptId = null; //标本配送空单默认值
     this.specialCloseButton = "0"; //是否特殊情况关闭
+    this.executeSwitch = 0;
     this.bindTrans = "0"; //是否关联数据
     this.appointmentBuildFlag = "0"; //护士端是否允许预约建单,患者陪检
     this.appointmentBuildFlagZy = "0"; //护士端是否允许预约建单，患者其他