瀏覽代碼

去除冗余

seimin 2 年之前
父節點
當前提交
7ca62f8e5a

+ 1 - 1
proxy.conf.json

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

+ 4 - 6
src/app/views/task-type-management/task-type-management.component.html

@@ -137,7 +137,7 @@
137
             <label nz-radio nzValue='0'>否</label>
137
             <label nz-radio nzValue='0'>否</label>
138
           </nz-radio-group>
138
           </nz-radio-group>
139
         </div> -->
139
         </div> -->
140
-        <div class="mb8 w100" *ngIf="association['id'] == 256||association['id'] == 259">
140
+        <div class="mb8 w100" *ngIf="association['id'] == 255 || association['id'] == 260 || association['id'] == 256 || association['id'] == 259">
141
           <nz-form-label class="label" nzRequired>是否需要备注信息</nz-form-label>
141
           <nz-form-label class="label" nzRequired>是否需要备注信息</nz-form-label>
142
           <nz-radio-group class="handlerType" [(ngModel)]="isRemarks">
142
           <nz-radio-group class="handlerType" [(ngModel)]="isRemarks">
143
             <label nz-radio nzValue='1'>是</label>
143
             <label nz-radio nzValue='1'>是</label>
@@ -240,11 +240,9 @@
240
             <label nz-radio nzValue='0'>否</label>
240
             <label nz-radio nzValue='0'>否</label>
241
           </nz-radio-group>
241
           </nz-radio-group>
242
         </div>
242
         </div>
243
-        <div nz-row *ngIf='carryShow&&(association.id == 260 || association.id == 255)'>
244
-          <div nz-col nzSpan="5" class="label ml8">携带设备:</div>
245
-          <div nz-col nzSpan="18">
246
-            <nz-checkbox-group class="w100" [(ngModel)]="carryEquipmentIds"></nz-checkbox-group>
247
-          </div>
243
+        <div nz-row *ngIf='association.id == 260 || association.id == 255'>
244
+          <nz-form-label class="label">携带设备</nz-form-label>
245
+          <nz-checkbox-group class="handlerType" [(ngModel)]="carryEquipmentIds"></nz-checkbox-group>
248
         </div>
246
         </div>
249
       </div>
247
       </div>
250
       <!-- 规则信息 -->
248
       <!-- 规则信息 -->

+ 0 - 9
src/app/views/task-type-management/task-type-management.component.ts

@@ -119,7 +119,6 @@ export class TaskTypeManagementComponent implements OnInit {
119
   validateForm: FormGroup; //新增/编辑备注快捷选择输入
119
   validateForm: FormGroup; //新增/编辑备注快捷选择输入
120
   isAddQRemarks = true; //添加新的备注快捷选择输入是否禁用
120
   isAddQRemarks = true; //添加新的备注快捷选择输入是否禁用
121
   qRemarksId = 1; //备注快捷选择输入自增id
121
   qRemarksId = 1; //备注快捷选择输入自增id
122
-  carryShow = false; //携带设备显示隐藏字段
123
   leadTime: any = 20; //提前生效时间,默认20分钟
122
   leadTime: any = 20; //提前生效时间,默认20分钟
124
   formatterDollar = (value) => Number(value);
123
   formatterDollar = (value) => Number(value);
125
   // 护士端是否允许预约建单,选中
124
   // 护士端是否允许预约建单,选中
@@ -573,11 +572,6 @@ export class TaskTypeManagementComponent implements OnInit {
573
       id:'',
572
       id:'',
574
       value:''
573
       value:''
575
     }
574
     }
576
-    if (data.id == 260 || data.id == 255) {
577
-      this.carryShow = true;
578
-    } else {
579
-      this.carryShow = false;
580
-    }
581
     if (data.id == 260) {
575
     if (data.id == 260) {
582
       this.carryingCourses = [
576
       this.carryingCourses = [
583
         {
577
         {
@@ -680,7 +674,6 @@ export class TaskTypeManagementComponent implements OnInit {
680
       data.associationType.value == "patientTransport" ||
674
       data.associationType.value == "patientTransport" ||
681
       data.associationType.value == "inspect"
675
       data.associationType.value == "inspect"
682
     ) {
676
     ) {
683
-      this.carryShow = true;
684
       for (var i = 0; i < this.carryEquipmentIds.length; i++) {
677
       for (var i = 0; i < this.carryEquipmentIds.length; i++) {
685
         this.carryEquipmentIds[i]["label"] = this.carryEquipmentIds[i].name;
678
         this.carryEquipmentIds[i]["label"] = this.carryEquipmentIds[i].name;
686
         this.carryEquipmentIds[i]["checked"] = false;
679
         this.carryEquipmentIds[i]["checked"] = false;
@@ -694,8 +687,6 @@ export class TaskTypeManagementComponent implements OnInit {
694
           }
687
           }
695
         }
688
         }
696
       }
689
       }
697
-    } else {
698
-      this.carryShow = false;
699
     }
690
     }
700
 
691
 
701
     this.scheduleClassChecked = [];
692
     this.scheduleClassChecked = [];