限制发起

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.4.163",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {
@@ -8,7 +8,7 @@
     }
   },
   "/file": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.4.163",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

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

@@ -3110,7 +3110,7 @@ export class HushijiandanComponent implements OnInit {
         nzDuration: 0,
       }).messageId;
       this.mainService
-      .postCustom("api", "compareWorkTime", {taskTypeId, deptId})
+      .postCustom("api", "compareWorkTime", {taskTypeId, deptId, yyTime: order.yyTime})
       .subscribe((data) => {
         this.message.remove(maskFlag);
         if(data.state == 200){

src/app/views/limit-initiation-time/limit-initiation-time.component.html

@@ -19,19 +19,21 @@
             <th nzWidth="10%">限制方式</th>
             <th nzWidth="10%">时间限制</th>
             <th nzWidth="10%">提示备注</th>
+            <th nzWidth="10%">是否限制发起数量</th>
             <th nzWidth="25%">操作</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let index = index">
             <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{data.taskTypeDTO ? data.taskTypeDTO.taskName : '-'}}</td>
+            <td>{{data.taskNames || '-'}}</td>
             <td>{{data.limitAllDept == 1 ? '是' : '否'}}</td>
             <td>{{data.buildingListNames || '-'}}</td>
             <td>{{data.deptListNames || '-'}}</td>
             <td>{{data.limitType == 1 ? '仅提示允许建单' : (data.limitType == 2 ? '提示不允许建单' : '-')}}</td>
             <td>{{data.startTime | date: 'HH:mm'}} ~ {{data.endTime | date: 'HH:mm'}}</td>
             <td>{{data.remark || '-'}}</td>
+            <td>{{data.limitNum == 1 ? '是' : '否'}}</td>
             <td>
               <div class="coop">
                 <span *ngIf="coopBtns.del&&!data.status" (click)="showDelModal(data,'您确认要删除此方案吗？','删除','del')">删除</span>
@@ -58,7 +60,7 @@
           <nz-form-item>
             <nz-form-label [nzSpan]="24" nzRequired nzFor="taskType">任务类型</nz-form-label>
             <nz-form-control nzErrorTip="请选择任务类型!">
-              <nz-select class="formItem" (nzOnSearch)="changeInp($event, 'taskType')" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzPlaceHolder="请选择任务类型" formControlName="taskType" (nzOpenChange)="getTaskTypeList($event)">
+              <nz-select class="formItem" nzMode="multiple" (nzOnSearch)="changeInp($event, 'taskType')" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzPlaceHolder="请选择任务类型" formControlName="taskType" (nzOpenChange)="getTaskTypeList($event)">
                 <ng-container *ngFor="let option of taskTypeList">
                   <nz-option *ngIf="!isLoading" [nzLabel]="option.taskName" [nzValue]="option.id"></nz-option>
                 </ng-container>
@@ -106,23 +108,32 @@
           <nz-form-item>
             <nz-form-label [nzSpan]="5" nzRequired nzFor="limitType">限制方式</nz-form-label>
             <nz-form-control [nzSpan]="19" nzErrorTip="请选择限制方式!">
-              <nz-radio-group formControlName="limitType">
+              <nz-radio-group formControlName="limitType" (ngModelChange)="changeLimitType($event)">
                 <label nz-radio [nzValue]="1">仅提示允许建单</label>
                 <label nz-radio [nzValue]="2">提示不允许建单</label>
               </nz-radio-group>
             </nz-form-control>
           </nz-form-item>
+          <nz-form-item *ngIf="validateForm.value.limitType == 2">
+            <nz-form-label [nzSpan]="8" nzRequired nzFor="limitDispatchDesk">调度台是否限制</nz-form-label>
+            <nz-form-control [nzSpan]="16" nzErrorTip="请选择调度台是否限制!">
+              <nz-radio-group formControlName="limitDispatchDesk">
+                <label nz-radio [nzValue]="1">是</label>
+                <label nz-radio [nzValue]="0">否</label>
+              </nz-radio-group>
+            </nz-form-control>
+          </nz-form-item>
           <nz-form-item>
-            <nz-form-label [nzSpan]="5" nzRequired nzFor="limitType">时间限制</nz-form-label>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="startTime">时间限制</nz-form-label>
             <nz-form-control [nzSpan]="19" nzErrorTip="请选择时间限制!">
               <nz-time-picker nzFormat="HH:mm" formControlName="startTime" [nzDisabledHours]="startTimeHourdis" [nzDisabledMinutes]="startTimeMindis" (nzOpenChange)="timeChange($event,'startTime')">
             </nz-time-picker>
             -
             <nz-time-picker nzFormat="HH:mm" formControlName="endTime" [nzDisabledHours]="endTimeHourdis" [nzDisabledMinutes]="endTimeMindis" (nzOpenChange)="timeChange($event,'endTime')"></nz-time-picker>
             </nz-form-control>
-            <div style="text-align: left;color: red;" *ngIf="(validateForm.value.startTime||validateForm.value.endTime)&&!(validateForm.value.startTime&&validateForm.value.endTime)">请选择完整的时间限制</div>
+            <div style="text-align: left;color: red;" *ngIf="(!validateForm.value.startTime||!validateForm.value.endTime)||!(validateForm.value.startTime&&validateForm.value.endTime)">请选择完整的时间限制</div>
           </nz-form-item>
-          <nz-form-item>
+          <nz-form-item *ngIf="validateForm.value.limitNum == 0">
             <nz-form-label [nzSpan]="24" nzRequired nzFor="remark">提示备注</nz-form-label>
             <nz-form-control nzErrorTip="请输入提示备注!">
               <nz-input-group>
@@ -130,6 +141,54 @@
               </nz-input-group>
             </nz-form-control>
           </nz-form-item>
+          <!-- new -->
+          <nz-form-item>
+            <nz-form-label [nzSpan]="8" nzRequired nzFor="limitNum">是否限制发起数量</nz-form-label>
+            <nz-form-control [nzSpan]="16" nzErrorTip="请选择是否限制发起数量!">
+              <nz-radio-group formControlName="limitNum" (ngModelChange)="changeLimitNum($event)">
+                <label nz-radio [nzValue]="1">是</label>
+                <label nz-radio [nzValue]="0">否</label>
+              </nz-radio-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item *ngIf="validateForm.value.limitNum == 1">
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="limitTime">限制时间</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请选择限制时间!">
+              <nz-radio-group formControlName="limitTime">
+                <label nz-radio nzValue="0.5">每半小时</label>
+                <label nz-radio nzValue="1">每一小时</label>
+              </nz-radio-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item *ngIf="validateForm.value.limitNum == 1">
+            <nz-form-label [nzSpan]="8" nzRequired nzFor="fqLimitNum">发起限制数量</nz-form-label>
+            <nz-form-control [nzSpan]="16" nzErrorTip="请选择发起限制数量!">
+              <nz-input-number formControlName="fqLimitNum" [nzMin]="0" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item *ngIf="validateForm.value.limitNum == 1">
+            <nz-form-label [nzSpan]="8" nzRequired nzFor="yyLimitNum">预约限制数量</nz-form-label>
+            <nz-form-control [nzSpan]="16" nzErrorTip="请选择预约限制数量!">
+              <nz-input-number formControlName="yyLimitNum" [nzMin]="0" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item *ngIf="validateForm.value.limitNum == 1">
+            <nz-form-label [nzSpan]="24" nzRequired nzFor="createRemark"><span class="mr8">建单限制提示备注</span><span *ngFor="let item of variableNamesCreate; let last = last;" (click)="writeIn(item, $event, 'createRemark')"><strong style="cursor:pointer;color: #266CA4;">{{item}}</strong><em *ngIf="!last">、</em><em *ngIf="last">。</em></span></nz-form-label>
+            <nz-form-control nzErrorTip="请输入建单限制提示备注!">
+              <nz-input-group>
+                <input nz-input formControlName="createRemark" placeholder="请输入建单限制提示备注" />
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item *ngIf="validateForm.value.limitNum == 1">
+            <nz-form-label [nzSpan]="24" nzRequired nzFor="yyLimitRemark"><span class="mr8">预约限制提示备注</span><span *ngFor="let item of variableNamesYy; let last = last;" (click)="writeIn(item, $event, 'yyLimitRemark')"><strong style="cursor:pointer;color: #266CA4;">{{item}}</strong><em *ngIf="!last">、</em><em *ngIf="last">。</em></span></nz-form-label>
+            <nz-form-control nzErrorTip="请输入预约限制提示备注!">
+              <nz-input-group>
+                <input nz-input formControlName="yyLimitRemark" placeholder="请输入预约限制提示备注" />
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+
         </form>
       </div>
       <div class=" display_flex justify-content_flex-center">

src/app/views/limit-initiation-time/limit-initiation-time.component.less

@@ -114,6 +114,8 @@
 
             .ant-form-item-label {
               text-align: left;
+              position: relative;
+              z-index: 999;
             }
 
             .desc {

src/app/views/limit-initiation-time/limit-initiation-time.component.ts

@@ -61,6 +61,26 @@ export class LimitInitiationTimeComponent implements OnInit {
     this.getList(1);
   }
 
+  // 写入
+  variableNamesCreate = ['[$待接单数量$]', '[$执行中数量$]'];
+  variableNamesYy = ['[$预约单数量$]'];
+  writeIn(content, event, type){
+    var element = event.target.parentElement.parentElement.parentElement.parentElement.getElementsByTagName('input')[0];
+    if (element.selectionStart || element.selectionStart == '0') {
+        var startPos = element.selectionStart;
+        var endPos = element.selectionEnd;
+        this.validateForm.controls[type].setValue(element.value.substring(0, startPos) + content + element.value.substring(endPos));
+        element.focus();
+        setTimeout(() => {
+          element.setSelectionRange(startPos + content.length, startPos + content.length);
+        },0)
+    } else {
+        var val = element.value + content;
+        this.validateForm.controls[type].setValue(val);
+        element.focus();
+    }
+  }
+
   // 初始化增删改按钮
   coopBtns: any = {};
 
@@ -83,7 +103,7 @@ export class LimitInitiationTimeComponent implements OnInit {
       .subscribe((data) => {
         this.loading1 = false;
         if (data.status == 200) {
-          this.listOfData = data.list;
+          this.listOfData = data.list.map(v => ({...v, taskNames: v.taskTypeDTO.map(v => v.taskName.toString())}));
           this.listLength = data.totalNum;
         }
       });
@@ -241,6 +261,14 @@ export class LimitInitiationTimeComponent implements OnInit {
       startTime: [null],
       endTime: [null],
       remark: ['', [Validators.required]],
+      // new
+      limitNum: [0, [Validators.required]],
+      limitTime: ['0.5', [Validators.required]],
+      fqLimitNum: [0, [Validators.required]],
+      yyLimitNum: [0, [Validators.required]],
+      createRemark: ['', [Validators.required]],
+      yyLimitRemark: ['', [Validators.required]],
+      limitDispatchDesk: [0, [Validators.required]],
     });
   }
 
@@ -250,6 +278,76 @@ export class LimitInitiationTimeComponent implements OnInit {
     this.validateForm.controls.deptIds.setValue([]);
   }
 
+  // 修改限制方式
+  changeLimitType(e){
+    console.log(e);
+    this.validateForm.controls.limitDispatchDesk.setValue(0);
+    if(e == 1){
+      // 仅提示允许建单
+      this.validateForm.get('limitDispatchDesk')!.clearValidators();
+      this.validateForm.get('limitDispatchDesk')!.markAsPristine();
+    }else if(e == 2){
+      // 提示不允许建单
+      this.validateForm.get('limitDispatchDesk')!.setValidators(Validators.required);
+      this.validateForm.get('limitDispatchDesk')!.markAsDirty();
+    }
+    this.validateForm.get('limitDispatchDesk')!.updateValueAndValidity();
+  }
+
+  // 修改是否限制发起数量
+  changeLimitNum(e){
+    console.log(e);
+    this.validateForm.controls.limitTime.setValue('0.5');
+    this.validateForm.controls.fqLimitNum.setValue(0);
+    this.validateForm.controls.yyLimitNum.setValue(0);
+    this.validateForm.controls.createRemark.setValue('');
+    this.validateForm.controls.yyLimitRemark.setValue('');
+    if(e == 1){
+      //  是
+      this.validateForm.get('limitTime')!.setValidators(Validators.required);
+      this.validateForm.get('limitTime')!.markAsDirty();
+
+      this.validateForm.get('fqLimitNum')!.setValidators(Validators.required);
+      this.validateForm.get('fqLimitNum')!.markAsDirty();
+
+      this.validateForm.get('yyLimitNum')!.setValidators(Validators.required);
+      this.validateForm.get('yyLimitNum')!.markAsDirty();
+
+      this.validateForm.get('createRemark')!.setValidators(Validators.required);
+      this.validateForm.get('createRemark')!.markAsDirty();
+
+      this.validateForm.get('yyLimitRemark')!.setValidators(Validators.required);
+      this.validateForm.get('yyLimitRemark')!.markAsDirty();
+
+      this.validateForm.get('remark')!.clearValidators();
+      this.validateForm.get('remark')!.markAsPristine();
+    }else if(e == 0){
+      // 否
+      this.validateForm.get('limitTime')!.clearValidators();
+      this.validateForm.get('limitTime')!.markAsPristine();
+
+      this.validateForm.get('fqLimitNum')!.clearValidators();
+      this.validateForm.get('fqLimitNum')!.markAsPristine();
+
+      this.validateForm.get('yyLimitNum')!.clearValidators();
+      this.validateForm.get('yyLimitNum')!.markAsPristine();
+
+      this.validateForm.get('createRemark')!.clearValidators();
+      this.validateForm.get('createRemark')!.markAsPristine();
+
+      this.validateForm.get('yyLimitRemark')!.clearValidators();
+      this.validateForm.get('yyLimitRemark')!.markAsPristine();
+
+      this.validateForm.get('remark')!.setValidators(Validators.required);
+      this.validateForm.get('remark')!.markAsDirty();
+    }
+    this.validateForm.get('limitDispatchDesk')!.updateValueAndValidity();
+    this.validateForm.get('fqLimitNum')!.updateValueAndValidity();
+    this.validateForm.get('yyLimitNum')!.updateValueAndValidity();
+    this.validateForm.get('createRemark')!.updateValueAndValidity();
+    this.validateForm.get('yyLimitRemark')!.updateValueAndValidity();
+  }
+
   // 新增/编辑表单提交
   submitForm(): void {
     for (const i in this.validateForm.controls) {
@@ -279,7 +377,7 @@ export class LimitInitiationTimeComponent implements OnInit {
     if (this.add) {
       //增加
       data = {
-        taskType: this.validateForm.value.taskType,
+        taskType: this.validateForm.value.taskType.toString(),
         limitAllDept: this.validateForm.value.limitAllDept,
         buildingIds: this.validateForm.value.buildingIds.length ? this.validateForm.value.buildingIds.toString() : null,
         deptIds: this.validateForm.value.deptIds.length ? this.validateForm.value.deptIds.toString() : null,
@@ -288,12 +386,19 @@ export class LimitInitiationTimeComponent implements OnInit {
         endTime: format(endOfMinute(this.validateForm.value.endTime), "yyyy-MM-dd HH:mm:ss"),
         remark: this.validateForm.value.remark.trim(),
         hosId: this.currentHospital.id,
+        limitNum: this.validateForm.value.limitNum,
+        limitTime: this.validateForm.value.limitTime,
+        fqLimitNum: this.validateForm.value.fqLimitNum,
+        yyLimitNum: this.validateForm.value.yyLimitNum,
+        createRemark: this.validateForm.value.createRemark.trim(),
+        yyLimitRemark: this.validateForm.value.yyLimitRemark.trim(),
+        limitDispatchDesk: this.validateForm.value.limitDispatchDesk,
       };
     } else {
       //编辑
       data = {
         ...this.coopId,
-        taskType: this.validateForm.value.taskType,
+        taskType: this.validateForm.value.taskType.toString(),
         limitAllDept: this.validateForm.value.limitAllDept,
         buildingIds: this.validateForm.value.buildingIds.length ? this.validateForm.value.buildingIds.toString() : null,
         deptIds: this.validateForm.value.deptIds.length ? this.validateForm.value.deptIds.toString() : null,
@@ -302,6 +407,13 @@ export class LimitInitiationTimeComponent implements OnInit {
         endTime: format(endOfMinute(this.validateForm.value.endTime), "yyyy-MM-dd HH:mm:ss"),
         remark: this.validateForm.value.remark.trim(),
         hosId: this.currentHospital.id,
+        limitNum: this.validateForm.value.limitNum,
+        limitTime: this.validateForm.value.limitTime,
+        fqLimitNum: this.validateForm.value.fqLimitNum,
+        yyLimitNum: this.validateForm.value.yyLimitNum,
+        createRemark: this.validateForm.value.createRemark.trim(),
+        yyLimitRemark: this.validateForm.value.yyLimitRemark.trim(),
+        limitDispatchDesk: this.validateForm.value.limitDispatchDesk,
       };
     }
     this.limitInitiationTimeService
@@ -331,8 +443,8 @@ export class LimitInitiationTimeComponent implements OnInit {
     this.modal = true;
     this.coopId = data;
 
-    this.taskTypeList = data.taskTypeDTO ? [data.taskTypeDTO] : [];
-    this.validateForm.controls.taskType.setValue(data.taskType); //任务类型
+    this.taskTypeList = data.taskTypeDTO || [];
+    this.validateForm.controls.taskType.setValue(this.taskTypeList.map(v => v.id)); //任务类型
 
     this.validateForm.controls.limitAllDept.setValue(data.limitAllDept); //是否限制所有科室
 
@@ -347,6 +459,14 @@ export class LimitInitiationTimeComponent implements OnInit {
       this.validateForm.controls.endTime.setValue(new Date(data.endTime));
     }
     this.validateForm.controls.remark.setValue(data.remark); //提示备注
+
+    this.validateForm.controls.limitNum.setValue(data.limitNum);
+    this.validateForm.controls.limitTime.setValue(data.limitTime);
+    this.validateForm.controls.fqLimitNum.setValue(data.fqLimitNum);
+    this.validateForm.controls.yyLimitNum.setValue(data.yyLimitNum);
+    this.validateForm.controls.createRemark.setValue(data.createRemark);
+    this.validateForm.controls.yyLimitRemark.setValue(data.yyLimitRemark);
+    this.validateForm.controls.limitDispatchDesk.setValue(data.limitDispatchDesk);
   }
 
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）