修复

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.4.241",
+    "target": "http://192.168.4.170",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/views/clinical-users-management/clinical-users-management.component.ts

@@ -288,16 +288,20 @@ export class ClinicalUsersManagementComponent implements OnInit {
   }
   // 选择用户类型
   usertypeChange() {
-    if (this.validateForm.value.usertype == 106) {
-      //配送人员
-      this.wxRequired = true;
-      this.validateForm.get("weixin")!.setValidators(Validators.required);
-      this.validateForm.get("weixin")!.markAsDirty();
-    } else {
-      this.wxRequired = false;
-      this.validateForm.get("weixin")!.clearValidators();
-      this.validateForm.get("weixin")!.markAsPristine();
-    }
+    // if (this.validateForm.value.usertype == 106) {
+    //   //配送人员
+    //   this.wxRequired = true;
+    //   this.validateForm.get("weixin")!.setValidators(Validators.required);
+    //   this.validateForm.get("weixin")!.markAsDirty();
+    // } else {
+    //   this.wxRequired = false;
+    //   this.validateForm.get("weixin")!.clearValidators();
+    //   this.validateForm.get("weixin")!.markAsPristine();
+    // }
+    this.wxRequired = false;
+    this.validateForm.get("weixin")!.clearValidators();
+    this.validateForm.get("weixin")!.markAsPristine();
+
     this.validateForm.get("weixin")!.updateValueAndValidity();
   }
   // 表单提交

src/app/views/quilt-washing-get-page-control/quilt-washing-get-page-control.component.html

@@ -48,6 +48,18 @@
             </nz-option>
           </nz-select>
         </div>
+        <!-- 特定科室无需填写回收数量 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label" nzRequired>特定科室无需填写回收数量</nz-form-label>
+          <nz-select nzMode="multiple" class="w320px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择" (nzOnSearch)="changeDept($event)" [(ngModel)]="noFillInQuantityIds">
+            <ng-container *ngFor="let data of clothingDepts">
+              <nz-option *ngIf="!isLoading" [nzLabel]="data.dept" nzValue="{{data.id}}"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
 
       </div>
       <!-- 自动建单配置 -->

src/app/views/quilt-washing-get-page-control/quilt-washing-get-page-control.component.ts

@@ -20,6 +20,8 @@ export class QuiltWashingGetPageControlComponent implements OnInit {
   clothingDept:any = null;
   // 批次号生成规则
   batchNoRule:any = null;
+  // 特定科室无需填写回收数量
+  noFillInQuantityIds:any = [];
   // 配置
   configs:any = {};
   searchTimerSubject = new Subject();
@@ -138,6 +140,11 @@ export class QuiltWashingGetPageControlComponent implements OnInit {
       return;
     }
 
+    if(!this.noFillInQuantityIds.length){
+      this.msg.create("warning", "请先配置特定科室无需填写回收数量！");
+      return;
+    }
+
     let postData:any = {
       id: this.configs.id,
       taskType: this.clothingGetTypeId,
@@ -145,6 +152,7 @@ export class QuiltWashingGetPageControlComponent implements OnInit {
       hosId: this.hosId,
       clothingDept: this.clothingDept,
       batchNoRule: { id: this.batchNoRule },
+      noFillInQuantityIds: this.noFillInQuantityIds.toString(),
     };
     this.btnLoading = true;
     this.otherPageControlService
@@ -184,6 +192,7 @@ export class QuiltWashingGetPageControlComponent implements OnInit {
           this.clothingDept = this.configs.clothingDept;
           this.batchNoRule = this.configs.batchNoRule ? this.configs.batchNoRule.id : null;
           this.clothingGetTypeId = this.configs.clothingGetTypeId || null;
+          this.noFillInQuantityIds = this.configs.noFillInQuantityIds ? this.configs.noFillInQuantityIds.split(',') : [];
         }
       });
   }

src/app/views/users-management/users-management.component.ts

@@ -264,16 +264,20 @@ export class UsersManagementComponent implements OnInit {
   }
   // 选择用户类型
   usertypeChange() {
-    if (this.validateForm.value.usertype == 106) {
-      //配送人员
-      this.wxRequired = true;
-      this.validateForm.get("weixin")!.setValidators(Validators.required);
-      this.validateForm.get("weixin")!.markAsDirty();
-    } else {
-      this.wxRequired = false;
-      this.validateForm.get("weixin")!.clearValidators();
-      this.validateForm.get("weixin")!.markAsPristine();
-    }
+    // if (this.validateForm.value.usertype == 106) {
+    //   //配送人员
+    //   this.wxRequired = true;
+    //   this.validateForm.get("weixin")!.setValidators(Validators.required);
+    //   this.validateForm.get("weixin")!.markAsDirty();
+    // } else {
+    //   this.wxRequired = false;
+    //   this.validateForm.get("weixin")!.clearValidators();
+    //   this.validateForm.get("weixin")!.markAsPristine();
+    // }
+    this.wxRequired = false;
+    this.validateForm.get("weixin")!.clearValidators();
+    this.validateForm.get("weixin")!.markAsPristine();
+
     this.validateForm.get("weixin")!.updateValueAndValidity();
   }
   // 表单提交