Browse Source

是否支持按钮送达交接

seimin 1 year ago
parent
commit
70209a0790

+ 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.4.223",
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

@@ -36,6 +36,11 @@
36
           <nz-form-label class="label">自动关单</nz-form-label>
36
           <nz-form-label class="label">自动关单</nz-form-label>
37
           <nz-checkbox-group class="w320px" [(ngModel)]="automaticCustomsOrders"></nz-checkbox-group>
37
           <nz-checkbox-group class="w320px" [(ngModel)]="automaticCustomsOrders"></nz-checkbox-group>
38
         </div>
38
         </div>
39
+        <!-- 是否支持按钮送达交接 -->
40
+        <div class="display_flex align-items_center mb8">
41
+          <nz-form-label class="label">是否支持按钮送达交接</nz-form-label>
42
+          <nz-checkbox-group class="w320px" [(ngModel)]="delivery"></nz-checkbox-group>
43
+        </div>
39
       </div>
44
       </div>
40
       <!-- 自动建单配置 -->
45
       <!-- 自动建单配置 -->
41
       <div *ngIf="tabModalName=='automaticOrderCreation'">
46
       <div *ngIf="tabModalName=='automaticOrderCreation'">

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

@@ -38,6 +38,10 @@ export class BloodProductsConfigComponent implements OnInit {
38
   autoDeptLimits:any[] = [
38
   autoDeptLimits:any[] = [
39
     {label:'是否根据起点科室建单',value: 0}
39
     {label:'是否根据起点科室建单',value: 0}
40
   ];
40
   ];
41
+  // 是否支持按钮送达交接
42
+  delivery:any[] = [
43
+    {label:'是否开启',value: 0}
44
+  ];
41
   // 选择起点科室
45
   // 选择起点科室
42
   limitDeptIds:any = [];
46
   limitDeptIds:any = [];
43
   // 配置
47
   // 配置
@@ -135,6 +139,7 @@ export class BloodProductsConfigComponent implements OnInit {
135
       taskType: this.tasktype.id,
139
       taskType: this.tasktype.id,
136
       hosId: this.hosId,
140
       hosId: this.hosId,
137
       autoCreate: this.autoCreateOrders[0].checked ? 1 : 0,
141
       autoCreate: this.autoCreateOrders[0].checked ? 1 : 0,
142
+      delivery: this.delivery[0].checked ? 1 : 0,
138
       autoSendUser: this.autoSendUsers[0].checked ? 1 : 0,
143
       autoSendUser: this.autoSendUsers[0].checked ? 1 : 0,
139
       autoDept: this.autoDepts[0].checked ? 1 : 0,
144
       autoDept: this.autoDepts[0].checked ? 1 : 0,
140
       autoDeptLimit: this.autoDeptLimits[0].checked ? 1 : 0,
145
       autoDeptLimit: this.autoDeptLimits[0].checked ? 1 : 0,
@@ -237,6 +242,7 @@ export class BloodProductsConfigComponent implements OnInit {
237
           this.handoverMode = this.configs.handoverType?this.configs.handoverType.id:undefined;
242
           this.handoverMode = this.configs.handoverType?this.configs.handoverType.id:undefined;
238
           this.radioCheckModesValue = this.configs.checkType.id;
243
           this.radioCheckModesValue = this.configs.checkType.id;
239
           this.autoCreateOrders[0].checked = this.configs.autoCreate == 1;
244
           this.autoCreateOrders[0].checked = this.configs.autoCreate == 1;
245
+          this.delivery[0].checked = this.configs.delivery == 1;
240
           this.autoSendUsers[0].checked = this.configs.autoSendUser == 1;
246
           this.autoSendUsers[0].checked = this.configs.autoSendUser == 1;
241
           this.autoDepts[0].checked = this.configs.autoDept == 1;
247
           this.autoDepts[0].checked = this.configs.autoDept == 1;
242
           this.autoDeptLimits[0].checked = this.configs.autoDeptLimit == 1;
248
           this.autoDeptLimits[0].checked = this.configs.autoDeptLimit == 1;

+ 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.47');
11
+    console.info('v2.4.48');
12
   }
12
   }
13
 }
13
 }
14
 platformBrowserDynamic().bootstrapModule(AppModule)
14
 platformBrowserDynamic().bootstrapModule(AppModule)