工作分配方案增加示忙原因

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/work-assignment/work-assignment.component.html

@@ -80,6 +80,21 @@
               </nz-input-group>
             </nz-form-control>
           </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="8" nzRequired nzFor="showBusy">是否支持上班示忙</nz-form-label>
+            <nz-form-control [nzSpan]="16" nzErrorTip="请输入是否支持上班示忙!">
+              <nz-radio-group formControlName="showBusy" (ngModelChange)="changeShowBusy()">
+                <label nz-radio [nzValue]="1">是</label>
+                <label nz-radio [nzValue]="0">否</label>
+              </nz-radio-group>
+            </nz-form-control>
+          </nz-form-item>
+          <ng-container *ngIf="validateForm.value.showBusy == 1">
+            <div *ngFor="let busy of busyList;let index = index" class="busyList">
+              <input class="busyContent" nz-input [(ngModel)]="busy.busyContent" [ngModelOptions]="{standalone: true}" placeholder="请填写示忙原因" />
+              <nz-input-number [(ngModel)]="busy.busyMinute" [ngModelOptions]="{standalone: true}" [nzMin]="1" [nzStep]="1" [nzPrecision]="0"></nz-input-number>分钟
+            </div>
+          </ng-container>
         </form>
       </div>
       <div class=" display_flex justify-content_flex-center">

src/app/views/work-assignment/work-assignment.component.less

@@ -47,6 +47,15 @@
       margin-top: 12px;
       padding: 16px 0;
 
+      .busyList{
+        display: flex;
+        margin-bottom: 8px;
+        .busyContent{
+          margin-right: 8px;
+          flex: 1;
+        }
+      }
+
       & > div {
         text-align: center;
         margin: 0;

src/app/views/work-assignment/work-assignment.component.ts

@@ -46,6 +46,34 @@ export class WorkAssignmentComponent implements OnInit {
   nextSchemeName = ""; //下一个开启的方案名称
   modelName = ""; //模态框名称
 
+  busyList:any[] = [
+    {
+      id: 1,
+      busyContent: '',
+      busyMinute: 1,
+    },
+    {
+      id: 2,
+      busyContent: '',
+      busyMinute: 1,
+    },
+    {
+      id: 3,
+      busyContent: '',
+      busyMinute: 1,
+    },
+    {
+      id: 4,
+      busyContent: '',
+      busyMinute: 1,
+    },
+    {
+      id: 5,
+      busyContent: '',
+      busyMinute: 1,
+    },
+  ]
+
   ngOnInit() {
     this.currentHospital = this.tool.getCurrentHospital();
     this.coopBtns = this.tool.initCoopBtns(this.route);
@@ -124,6 +152,7 @@ export class WorkAssignmentComponent implements OnInit {
     this.validateForm = this.fb.group({
       workAssignmentName: [null, [Validators.required]],
       workAssignmentType: ["1", [Validators.required]],
+      showBusy: [0, [Validators.required]],
       workAssignmentDescribe: [null, [Validators.required]],
     });
   }
@@ -134,6 +163,36 @@ export class WorkAssignmentComponent implements OnInit {
     });
   }
 
+  changeShowBusy(){
+    this.busyList = [
+      {
+        id: 1,
+        busyContent: '',
+        busyMinute: 1,
+      },
+      {
+        id: 2,
+        busyContent: '',
+        busyMinute: 1,
+      },
+      {
+        id: 3,
+        busyContent: '',
+        busyMinute: 1,
+      },
+      {
+        id: 4,
+        busyContent: '',
+        busyMinute: 1,
+      },
+      {
+        id: 5,
+        busyContent: '',
+        busyMinute: 1,
+      },
+    ];
+  }
+
   // 新增/编辑表单提交
   btnLoading1 = false; //完成
   submitForm(noGoTo?): void {
@@ -149,7 +208,7 @@ export class WorkAssignmentComponent implements OnInit {
     } else {
       this.btnLoading = true;
     }
-    let data = {};
+    let data:any = {};
 
     if (this.add) {
       //增加
@@ -157,6 +216,7 @@ export class WorkAssignmentComponent implements OnInit {
         workScheme: {
           name: this.validateForm.value.workAssignmentName,
           workType: this.validateForm.value.workAssignmentType,
+          showBusy: this.validateForm.value.showBusy,
           describe: this.validateForm.value.workAssignmentDescribe,
           status: 0,
           hosId: this.currentHospital.id,
@@ -169,6 +229,7 @@ export class WorkAssignmentComponent implements OnInit {
           id: this.coopId.id,
           name: this.validateForm.value.workAssignmentName,
           workType: this.validateForm.value.workAssignmentType,
+          showBusy: this.validateForm.value.showBusy,
           describe: this.validateForm.value.workAssignmentDescribe,
           hosId: this.currentHospital.id,
         },
@@ -180,6 +241,7 @@ export class WorkAssignmentComponent implements OnInit {
         workScheme: {
           name: this.validateForm.value.workAssignmentName,
           workType: this.validateForm.value.workAssignmentType,
+          showBusy: this.validateForm.value.showBusy,
           describe: this.validateForm.value.workAssignmentDescribe,
           status: 0,
           copy: 1,
@@ -188,6 +250,13 @@ export class WorkAssignmentComponent implements OnInit {
         },
       };
     }
+    // 示忙原因
+    this.busyList.forEach(v => {
+      if(v.busyContent.trim()){
+        data.workScheme['busyContent' + v.id] = v.busyContent.trim();
+        data.workScheme['busyMinute' + v.id] = v.busyMinute;
+      }
+    })
     this.mainService
       .coopTypeConfig("addData", "workScheme", data)
       .subscribe((result) => {
@@ -307,6 +376,13 @@ export class WorkAssignmentComponent implements OnInit {
     this.copyModel = false;
     this.validateForm.controls.workAssignmentName.setValue(data.name); //名称
     this.validateForm.controls.workAssignmentType.setValue(data.workType + ""); //类型
+    this.validateForm.controls.showBusy.setValue(data.showBusy || 0);
+    if(this.validateForm.value.showBusy == 1){
+      this.busyList.forEach(v => {
+        v.busyContent = data['busyContent' + v.id];
+        v.busyMinute = data['busyMinute' + v.id] || 0;
+      })
+    }
     this.validateForm.controls.workAssignmentDescribe.setValue(data.describe); //描述
   }
   //复制
@@ -318,6 +394,13 @@ export class WorkAssignmentComponent implements OnInit {
     this.coopId = data;
     this.validateForm.controls.workAssignmentName.setValue(data.name); //名称
     this.validateForm.controls.workAssignmentType.setValue(data.workType + ""); //类型
+    this.validateForm.controls.showBusy.setValue(data.showBusy || 0);
+    if(this.validateForm.value.showBusy == 1){
+      this.busyList.forEach(v => {
+        v.busyContent = data['busyContent' + v.id];
+        v.busyMinute = data['busyMinute' + v.id] || 0;
+      })
+    }
     this.validateForm.controls.workAssignmentDescribe.setValue(data.describe); //描述
   }
 

src/main.ts

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