Преглед на файлове

临床其他建单增加字段

seimin преди 1 година
родител
ревизия
581fef86e3

+ 12 - 1
src/app/views/other-auto/other-auto.component.html

@@ -13,11 +13,12 @@
13 13
         [nzLoading]="loading1">
14 14
         <thead>
15 15
           <tr class="thead">
16
-            <th nzWidth="20%">自动建单名称</th>
16
+            <th nzWidth="10%">自动建单名称</th>
17 17
             <th nzWidth="10%">班次</th>
18 18
             <th nzWidth="30%">任务类型</th>
19 19
             <th nzWidth="10%">是否起始建单</th>
20 20
             <th nzWidth="10%">是否自动建单</th>
21
+            <th nzWidth="10%">是否自动派单</th>
21 22
             <th nzWidth="20%">操作</th>
22 23
           </tr>
23 24
         </thead>
@@ -28,6 +29,7 @@
28 29
             <td>{{ data.taskNames || '' }}</td>
29 30
             <td>{{ data.startCreated == 1 ? '是' : '否' }}</td>
30 31
             <td>{{ data.autoCreate == 1 ? '是' : '否' }}</td>
32
+            <td>{{ data.banDispatch == 1 ? '否' : '是' }}</td>
31 33
             <td>
32 34
               <div class="coop">
33 35
                 <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
@@ -106,6 +108,15 @@
106 108
             </nz-radio-group>
107 109
           </nz-form-control>
108 110
         </nz-form-item>
111
+        <nz-form-item>
112
+          <nz-form-label style="line-height:40px;" [nzSm]="6" [nzXs]="24" nzRequired nzFor="banDispatch">是否自动派单</nz-form-label>
113
+          <nz-form-control nzErrorTip="请选择是否自动派单!">
114
+            <nz-radio-group formControlName="banDispatch">
115
+              <label nz-radio [nzValue]="0">是</label>
116
+              <label nz-radio [nzValue]="1">否</label>
117
+            </nz-radio-group>
118
+          </nz-form-control>
119
+        </nz-form-item>
109 120
       </form>
110 121
     </overlay-scrollbars>
111 122
     <div class="display_flex justify-content_flex-center">

+ 5 - 0
src/app/views/other-auto/other-auto.component.ts

@@ -127,6 +127,7 @@ export class OtherAutoComponent implements OnInit {
127 127
     this.initForm();
128 128
     this.validateForm.controls.startCreated.setValue(0);
129 129
     this.validateForm.controls.autoCreate.setValue(0);
130
+    this.validateForm.controls.banDispatch.setValue(0);
130 131
   }
131 132
   hideModal() {
132 133
     this.modal = false;
@@ -145,6 +146,7 @@ export class OtherAutoComponent implements OnInit {
145 146
       taskTypeIds: [null, [Validators.required]],
146 147
       startCreated: [null, [Validators.required]],
147 148
       autoCreate: [null, [Validators.required]],
149
+      banDispatch: [null, [Validators.required]],
148 150
     });
149 151
   }
150 152
   // 表单提交
@@ -163,6 +165,7 @@ export class OtherAutoComponent implements OnInit {
163 165
         taskTypeIds: this.validateForm.value.taskTypeIds,
164 166
         startCreated: this.validateForm.value.startCreated,
165 167
         autoCreate: this.validateForm.value.autoCreate,
168
+        banDispatch: this.validateForm.value.banDispatch,
166 169
         hosId: this.hosId,
167 170
       })
168 171
       .subscribe((data) => {
@@ -183,6 +186,7 @@ export class OtherAutoComponent implements OnInit {
183 186
         taskTypeIds: this.validateForm.value.taskTypeIds,
184 187
         startCreated: this.validateForm.value.startCreated,
185 188
         autoCreate: this.validateForm.value.autoCreate,
189
+        banDispatch: this.validateForm.value.banDispatch,
186 190
         coopData: this.coopData,
187 191
       })
188 192
       .subscribe((data) => {
@@ -207,6 +211,7 @@ export class OtherAutoComponent implements OnInit {
207 211
     this.validateForm.controls.taskTypeIds.setValue(data.taskTypeList ? data.taskTypeList.map(v => v.id) : null);
208 212
     this.validateForm.controls.startCreated.setValue(data.startCreated);
209 213
     this.validateForm.controls.autoCreate.setValue(data.autoCreate);
214
+    this.validateForm.controls.banDispatch.setValue(data.banDispatch);
210 215
     this.modal = true;
211 216
     this.add = false;
212 217
     this.coopId = data.id;

+ 4 - 2
src/app/views/other-auto/other-auto.service.ts

@@ -28,13 +28,14 @@ export class OtherAutoService {
28 28
   }
29 29
 
30 30
   // 列表-增
31
-  add({title, classesId, taskTypeIds, startCreated, autoCreate, hosId}) {
31
+  add({title, classesId, taskTypeIds, startCreated, autoCreate, banDispatch, hosId}) {
32 32
     let data = {
33 33
       title,
34 34
       classesId,
35 35
       taskTypeIds: taskTypeIds.toString(),
36 36
       startCreated,
37 37
       autoCreate,
38
+      banDispatch,
38 39
       hosId,
39 40
     };
40 41
 
@@ -42,13 +43,14 @@ export class OtherAutoService {
42 43
   }
43 44
 
44 45
   // 列表-改
45
-  update({title, classesId, taskTypeIds, startCreated, autoCreate, coopData}) {
46
+  update({title, classesId, taskTypeIds, startCreated, autoCreate, banDispatch, coopData}) {
46 47
     let data = {
47 48
       title,
48 49
       classesId,
49 50
       taskTypeIds: taskTypeIds.toString(),
50 51
       startCreated,
51 52
       autoCreate,
53
+      banDispatch,
52 54
     };
53 55
     data = {...coopData, ...data};
54 56
     return this.mainService.simplePost("addData", "otherCreateOrderRule", data);