Browse Source

血制品页面控制增加是否指定人派单

seimin 1 year ago
parent
commit
8dc0a87735

+ 1 - 1
proxy.conf.json

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

+ 5 - 0
src/app/views/blood-products-config/blood-products-config.component.html

@@ -59,6 +59,11 @@
59
             </nz-option>
59
             </nz-option>
60
           </nz-select>
60
           </nz-select>
61
         </div>
61
         </div>
62
+        <!-- 自动派单 -->
63
+        <div class="display_flex align-items_center mb8">
64
+          <nz-form-label class="label">自动派单</nz-form-label>
65
+          <nz-checkbox-group [(ngModel)]="autoSendUsers"></nz-checkbox-group>
66
+        </div>
62
       </div>
67
       </div>
63
       <div class="bottom">
68
       <div class="bottom">
64
         <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>
69
         <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>

+ 6 - 0
src/app/views/blood-products-config/blood-products-config.component.ts

@@ -26,6 +26,10 @@ export class BloodProductsConfigComponent implements OnInit {
26
   autoCreateOrders:any[] = [
26
   autoCreateOrders:any[] = [
27
     {label:'是否开启',value: 0}
27
     {label:'是否开启',value: 0}
28
   ];
28
   ];
29
+  // 是否指定人派单
30
+  autoSendUsers:any[] = [
31
+    {label:'是否指定人派单',value: 0}
32
+  ];
29
   // 是否根据开通科室建单
33
   // 是否根据开通科室建单
30
   autoDepts:any[] = [
34
   autoDepts:any[] = [
31
     {label:'是否根据开通科室建单',value: 0}
35
     {label:'是否根据开通科室建单',value: 0}
@@ -131,6 +135,7 @@ export class BloodProductsConfigComponent implements OnInit {
131
       taskType: this.tasktype.id,
135
       taskType: this.tasktype.id,
132
       hosId: this.hosId,
136
       hosId: this.hosId,
133
       autoCreate: this.autoCreateOrders[0].checked ? 1 : 0,
137
       autoCreate: this.autoCreateOrders[0].checked ? 1 : 0,
138
+      autoSendUser: this.autoSendUsers[0].checked ? 1 : 0,
134
       autoDept: this.autoDepts[0].checked ? 1 : 0,
139
       autoDept: this.autoDepts[0].checked ? 1 : 0,
135
       autoDeptLimit: this.autoDeptLimits[0].checked ? 1 : 0,
140
       autoDeptLimit: this.autoDeptLimits[0].checked ? 1 : 0,
136
       limitDeptIds: String(this.limitDeptIds),
141
       limitDeptIds: String(this.limitDeptIds),
@@ -232,6 +237,7 @@ export class BloodProductsConfigComponent implements OnInit {
232
           this.handoverMode = this.configs.handoverType?this.configs.handoverType.id:undefined;
237
           this.handoverMode = this.configs.handoverType?this.configs.handoverType.id:undefined;
233
           this.radioCheckModesValue = this.configs.checkType.id;
238
           this.radioCheckModesValue = this.configs.checkType.id;
234
           this.autoCreateOrders[0].checked = this.configs.autoCreate == 1;
239
           this.autoCreateOrders[0].checked = this.configs.autoCreate == 1;
240
+          this.autoSendUsers[0].checked = this.configs.autoSendUser == 1;
235
           this.autoDepts[0].checked = this.configs.autoDept == 1;
241
           this.autoDepts[0].checked = this.configs.autoDept == 1;
236
           this.autoDeptLimits[0].checked = this.configs.autoDeptLimit == 1;
242
           this.autoDeptLimits[0].checked = this.configs.autoDeptLimit == 1;
237
           this.getDeptList(true, '', true);
243
           this.getDeptList(true, '', true);

+ 1 - 1
src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
8
   enableProdMode();
8
   enableProdMode();
9
   if (window) {
9
   if (window) {
10
     window.console.log = function () { };
10
     window.console.log = function () { };
11
-    console.info('v2.4.44');
11
+    console.info('v2.4.45');
12
   }
12
   }
13
 }
13
 }
14
 platformBrowserDynamic().bootstrapModule(AppModule)
14
 platformBrowserDynamic().bootstrapModule(AppModule)