Browse Source

临床其他建单增加字段

seimin 1 year ago
parent
commit
581fef86e3

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

@@ -13,11 +13,12 @@
13
         [nzLoading]="loading1">
13
         [nzLoading]="loading1">
14
         <thead>
14
         <thead>
15
           <tr class="thead">
15
           <tr class="thead">
16
-            <th nzWidth="20%">自动建单名称</th>
16
+            <th nzWidth="10%">自动建单名称</th>
17
             <th nzWidth="10%">班次</th>
17
             <th nzWidth="10%">班次</th>
18
             <th nzWidth="30%">任务类型</th>
18
             <th nzWidth="30%">任务类型</th>
19
             <th nzWidth="10%">是否起始建单</th>
19
             <th nzWidth="10%">是否起始建单</th>
20
             <th nzWidth="10%">是否自动建单</th>
20
             <th nzWidth="10%">是否自动建单</th>
21
+            <th nzWidth="10%">是否自动派单</th>
21
             <th nzWidth="20%">操作</th>
22
             <th nzWidth="20%">操作</th>
22
           </tr>
23
           </tr>
23
         </thead>
24
         </thead>
@@ -28,6 +29,7 @@
28
             <td>{{ data.taskNames || '' }}</td>
29
             <td>{{ data.taskNames || '' }}</td>
29
             <td>{{ data.startCreated == 1 ? '是' : '否' }}</td>
30
             <td>{{ data.startCreated == 1 ? '是' : '否' }}</td>
30
             <td>{{ data.autoCreate == 1 ? '是' : '否' }}</td>
31
             <td>{{ data.autoCreate == 1 ? '是' : '否' }}</td>
32
+            <td>{{ data.banDispatch == 1 ? '否' : '是' }}</td>
31
             <td>
33
             <td>
32
               <div class="coop">
34
               <div class="coop">
33
                 <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
35
                 <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
@@ -106,6 +108,15 @@
106
             </nz-radio-group>
108
             </nz-radio-group>
107
           </nz-form-control>
109
           </nz-form-control>
108
         </nz-form-item>
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
       </form>
120
       </form>
110
     </overlay-scrollbars>
121
     </overlay-scrollbars>
111
     <div class="display_flex justify-content_flex-center">
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
     this.initForm();
127
     this.initForm();
128
     this.validateForm.controls.startCreated.setValue(0);
128
     this.validateForm.controls.startCreated.setValue(0);
129
     this.validateForm.controls.autoCreate.setValue(0);
129
     this.validateForm.controls.autoCreate.setValue(0);
130
+    this.validateForm.controls.banDispatch.setValue(0);
130
   }
131
   }
131
   hideModal() {
132
   hideModal() {
132
     this.modal = false;
133
     this.modal = false;
@@ -145,6 +146,7 @@ export class OtherAutoComponent implements OnInit {
145
       taskTypeIds: [null, [Validators.required]],
146
       taskTypeIds: [null, [Validators.required]],
146
       startCreated: [null, [Validators.required]],
147
       startCreated: [null, [Validators.required]],
147
       autoCreate: [null, [Validators.required]],
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
         taskTypeIds: this.validateForm.value.taskTypeIds,
165
         taskTypeIds: this.validateForm.value.taskTypeIds,
164
         startCreated: this.validateForm.value.startCreated,
166
         startCreated: this.validateForm.value.startCreated,
165
         autoCreate: this.validateForm.value.autoCreate,
167
         autoCreate: this.validateForm.value.autoCreate,
168
+        banDispatch: this.validateForm.value.banDispatch,
166
         hosId: this.hosId,
169
         hosId: this.hosId,
167
       })
170
       })
168
       .subscribe((data) => {
171
       .subscribe((data) => {
@@ -183,6 +186,7 @@ export class OtherAutoComponent implements OnInit {
183
         taskTypeIds: this.validateForm.value.taskTypeIds,
186
         taskTypeIds: this.validateForm.value.taskTypeIds,
184
         startCreated: this.validateForm.value.startCreated,
187
         startCreated: this.validateForm.value.startCreated,
185
         autoCreate: this.validateForm.value.autoCreate,
188
         autoCreate: this.validateForm.value.autoCreate,
189
+        banDispatch: this.validateForm.value.banDispatch,
186
         coopData: this.coopData,
190
         coopData: this.coopData,
187
       })
191
       })
188
       .subscribe((data) => {
192
       .subscribe((data) => {
@@ -207,6 +211,7 @@ export class OtherAutoComponent implements OnInit {
207
     this.validateForm.controls.taskTypeIds.setValue(data.taskTypeList ? data.taskTypeList.map(v => v.id) : null);
211
     this.validateForm.controls.taskTypeIds.setValue(data.taskTypeList ? data.taskTypeList.map(v => v.id) : null);
208
     this.validateForm.controls.startCreated.setValue(data.startCreated);
212
     this.validateForm.controls.startCreated.setValue(data.startCreated);
209
     this.validateForm.controls.autoCreate.setValue(data.autoCreate);
213
     this.validateForm.controls.autoCreate.setValue(data.autoCreate);
214
+    this.validateForm.controls.banDispatch.setValue(data.banDispatch);
210
     this.modal = true;
215
     this.modal = true;
211
     this.add = false;
216
     this.add = false;
212
     this.coopId = data.id;
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
     let data = {
32
     let data = {
33
       title,
33
       title,
34
       classesId,
34
       classesId,
35
       taskTypeIds: taskTypeIds.toString(),
35
       taskTypeIds: taskTypeIds.toString(),
36
       startCreated,
36
       startCreated,
37
       autoCreate,
37
       autoCreate,
38
+      banDispatch,
38
       hosId,
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
     let data = {
47
     let data = {
47
       title,
48
       title,
48
       classesId,
49
       classesId,
49
       taskTypeIds: taskTypeIds.toString(),
50
       taskTypeIds: taskTypeIds.toString(),
50
       startCreated,
51
       startCreated,
51
       autoCreate,
52
       autoCreate,
53
+      banDispatch,
52
     };
54
     };
53
     data = {...coopData, ...data};
55
     data = {...coopData, ...data};
54
     return this.mainService.simplePost("addData", "otherCreateOrderRule", data);
56
     return this.mainService.simplePost("addData", "otherCreateOrderRule", data);