其他临床服务多动作签到

proxy.conf.json

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

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

@@ -472,7 +472,8 @@ export class HushijiandanComponent implements OnInit {
       .getFetchDataList("simple/data", "taskTypeConfig", postData)
       .subscribe((result) => {
         if (result.status == 200) {
-          this.inspectAndPatientTransportConfig = result.list[0] || {};
+          let inspectAndPatientTransportConfig = result.list[0] || {};
+          this.inspectAndPatientTransportConfig = {...this.inspectAndPatientTransportConfig, inspectAndPatientTransportConfig};
 
           // 是否显示排队信息
           if(this.inspectAndPatientTransportConfig.queuingInformation == 1){

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

@@ -695,6 +695,33 @@
           <div class="turnoff">
             <label nz-checkbox [(ngModel)]="carryingCourses[indexs].handoverSwitch">是否必填交接人信息</label>
           </div>
+          <!-- 是否支持拍照签到 -->
+          <div class="turnoff" *ngIf="currentChoice.associationType.value == 'other'&&indexs==0">
+            <label nz-checkbox [(ngModel)]="carryingCourses[indexs].photoSwitch">是否支持拍照签到</label>
+          </div>
+          <!-- 是否支持多动作签到 -->
+          <div class="turnoff" *ngIf="currentChoice.associationType.value == 'other'&&indexs==1">
+            <label nz-checkbox [(ngModel)]="carryingCourses[indexs].actionsSwitch">是否支持多动作签到</label>
+          </div>
+          <!-- 确认动作 -->
+          <div class="turnoff" *ngIf="carryingCourses[indexs].actionsSwitch">
+            <label nz-checkbox [(ngModel)]="carryingCourses[indexs].actionConfirmSwitch">确认动作</label>
+            <ng-container *ngIf="carryingCourses[indexs].actionConfirmSwitch">
+              <button nz-button nzType="dashed" (click)="addActions()" *ngIf="!carryingCourses[indexs].actionRemarks">
+                <i nz-icon nzType="plus"></i>
+                添加动作
+              </button>
+              <span class="mr8" *ngIf="carryingCourses[indexs].actionRemarks">{{carryingCourses[indexs].actionRemarks.split('$').join(',')}}</span>
+              <button *ngIf="carryingCourses[indexs].actionRemarks" nz-button nzType="dashed" (click)="editActions()">
+                <i nz-icon nzType="plus"></i>
+                编辑动作
+              </button>
+            </ng-container>
+          </div>
+          <!-- 拍照动作 -->
+          <div class="turnoff" *ngIf="carryingCourses[indexs].actionsSwitch">
+            <label nz-checkbox [(ngModel)]="carryingCourses[indexs].actionPhotoSwitch">拍照动作</label>
+          </div>
           <!-- 静配自动建单 -->
           <div class="turnoff" *ngIf="currentChoice.associationType.value == 'jPBag'&&indexs==0">
             <label nz-checkbox [(ngModel)]="bagOrderSwitch">根据对接数据自动建单</label>
@@ -1185,3 +1212,39 @@
     </div>
   </div>
 </div>
+
+<!-- 新增/编辑动作模态框 -->
+<div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="actionsModal">
+  <div class="modalBody">
+    <div class="title">{{actionsAdd?"新增":"编辑"}}动作<i class="icon_transport transport-guanbi"
+        (click)="hideActionsModal()"></i>
+    </div>
+    <div class="content">
+      <form nz-form [formGroup]="validateActionForm" class="addForm">
+        <nz-form-item>
+          <nz-form-label style="line-height: normal;" [nzSm]="6" [nzXs]="24" nzFor="actions">备注快捷输入</nz-form-label>
+          <nz-form-control nzErrorTip="请输入备注快捷输入!">
+            <nz-input-group>
+              <input (ngModelChange)="actionsChange()" nz-input formControlName="actions"
+                placeholder="请填写备注快捷输入" />
+            </nz-input-group>
+            <nz-input-group *ngFor="let action of actionses;let index = index" class="dynamic">
+              <input nz-input [ngModel]="action.content" [ngModelOptions]="{standalone: true}"
+                placeholder="请填写备注快捷输入" (ngModelChange)="actionsChange($event,action)" />
+              <i nz-icon nzType="minus-circle-o" (click)="removeActions(index, $event)"></i>
+            </nz-input-group>
+            <button nz-button nzType="dashed" [disabled]="isAddActions" *ngIf="actionses.length < 9"
+              class="add-button" (click)="addAction($event)">
+              <i nz-icon nzType="plus"></i>
+              添加备注快捷输入
+            </button>
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </div>
+    <div class=" display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitFormActions()">保存</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideActionsModal()">取消</button>
+    </div>
+  </div>
+</div>

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

@@ -120,6 +120,14 @@ export class TaskTypeManagementComponent implements OnInit {
   isAddQRemarks = true; //添加新的备注快捷选择输入是否禁用
   qRemarksId = 1; //备注快捷选择输入自增id
   leadTime: any = 20; //提前生效时间，默认20分钟
+
+  actionsModal = false; //动作弹窗
+  actionsAdd = false; //动作弹窗新增还是编辑
+  validateActionForm: FormGroup; //新增/编辑动作
+  actionses = []; //动作第二条-第N条(其他类型)
+  isAddActions = true; //添加新的动作是否禁用
+  actionsId = 1; //动作自增id
+
   formatterDollar = (value) => Number(value);
   // 护士端是否允许预约建单，选中
   appointmentBuildClick() {
@@ -397,6 +405,86 @@ export class TaskTypeManagementComponent implements OnInit {
   }
   // 备注快速选择输入---------------------------------------------------------------------
 
+  // 动作------------------------------------------------------------------start
+  // 新添加动作快速选择输入
+  addAction(e: MouseEvent) {
+    e.preventDefault();
+    this.actionses.push({ id: ++this.actionsId, content: "" });
+    this.actionsChange();
+  }
+  // 删除新添加动作快速选择输入
+  removeActions(index: number, e: MouseEvent) {
+    e.preventDefault();
+    this.actionses.splice(index, 1);
+    this.actionsChange();
+  }
+  //监听动作快速选择输入输入事件
+  actionsChange(e?, action?) {
+    if (e !== undefined && action !== undefined) {
+      action.content = e;
+    }
+    // -------------判断添加按钮是否禁用 start
+    this.isAddActions = !this.validateActionForm.value.actions;
+    if (!this.isAddActions) {
+      //如果没禁用
+      this.isAddActions = this.actionses.some(
+        (item) => item.content === ""
+      );
+    }
+    // -------------判断添加按钮是否禁用 end
+  }
+  //动作快速选择输入-新增
+  addActions() {
+    this.actionsAdd = true;
+    this.actionsModal = true;
+    this.actionses = [];
+    this.initActionForm();
+  }
+  hideActionsModal() {
+    this.actionsModal = false;
+  }
+  // 初始化新增form表单
+  initActionForm() {
+    this.validateActionForm = this.fb.group({
+      actions: [null],
+    });
+  }
+
+  // 新增/编辑表单提交
+  submitFormActions(): void {
+    for (const i in this.validateActionForm.controls) {
+      this.validateActionForm.controls[i].markAsDirty();
+      this.validateActionForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateActionForm.invalid) {
+      return;
+    }
+    this.hideActionsModal();
+    let arr = this.actionses.map((item) => item.content);
+    if (this.validateActionForm.value.actions) {
+      arr.unshift(this.validateActionForm.value.actions);
+    }
+    this.carryingCourses[this.indexs].actionRemarks = arr.join("$");
+  }
+
+  // 编辑
+  editActions() {
+    this.initActionForm();
+    this.isAddActions = false;
+    this.actionsAdd = false;
+    this.actionsModal = true;
+    let arr = this.carryingCourses[this.indexs].actionRemarks.split("$");
+    if (arr.length === 1) {
+      this.validateActionForm.controls.actions.setValue(arr[0]);
+    } else {
+      this.validateActionForm.controls.actions.setValue(arr[0]);
+      this.actionses = arr.slice(1).map((item) => {
+        return { id: ++this.actionsId, content: item };
+      });
+    }
+  }
+  // 动作---------------------------------------------------------------------end
+
   // 初始化增删改按钮
   coopBtns: any = {};
   // 获取所有院区
@@ -1141,6 +1229,11 @@ export class TaskTypeManagementComponent implements OnInit {
       this.taskData.taskType.carryingCourses[0].autoAddDeptSwitch = 0; //自动建单追加终点科室开关
       this.taskData.taskType.carryingCourses[0].handAddDeptSwitch = 0; //手动建单追加终点科室开关
     }
+    // 其他临床服务，多动作开启后，必须配置至少一个动作
+    if(this.taskData.taskType.associationType.value === 'other' && this.taskData.taskType.carryingCourses[1].actionConfirmSwitch && !this.taskData.taskType.carryingCourses[1].actionRemarks){
+      this.showPromptModal("提示", false, "确认动作开启后，至少配置一个动作！");
+      return;
+    }
     console.log(this.taskData);
     // return;
     this.loading5 = true;