被服页面控制

proxy.conf.json

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

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

@@ -25,7 +25,7 @@
           </nz-select>
         </div>
         <!-- 被服洗涤科室 -->
-        <div class="display_flex align-items_center mb8">
+        <!-- <div class="display_flex align-items_center mb8">
           <nz-form-label class="label" nzRequired>被服洗涤科室</nz-form-label>
           <nz-select class="w320px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择" (nzOnSearch)="changeDept($event)" [(ngModel)]="clothingDept">
             <ng-container *ngFor="let data of clothingDepts">
@@ -35,9 +35,9 @@
               <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
             </nz-option>
           </nz-select>
-        </div>
+        </div> -->
         <!-- 批次号生成规则 -->
-        <div class="display_flex align-items_center mb8">
+        <!-- <div class="display_flex align-items_center mb8">
           <nz-form-label class="label" nzRequired>批次号生成规则</nz-form-label>
           <nz-select class="w320px" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择" [(ngModel)]="batchNoRule">
             <ng-container *ngFor="let data of clothing_batchno_rule">
@@ -47,7 +47,7 @@
               <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
             </nz-option>
           </nz-select>
-        </div>
+        </div> -->
 
       </div>
       <!-- 自动建单配置 -->

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

@@ -17,9 +17,9 @@ export class QuiltWashingSendPageControlComponent implements OnInit {
   hosId = this.tool.getCurrentHospital().id; //当前院区
 
   // 积分计算方式
-  clothingDept:any = null;
+  // clothingDept:any = null;
   // 批次号生成规则
-  batchNoRule:any = null;
+  // batchNoRule:any = null;
   // 配置
   configs:any = {};
   searchTimerSubject = new Subject();
@@ -32,8 +32,8 @@ export class QuiltWashingSendPageControlComponent implements OnInit {
       fun.call(this, v[1]);
     });
     this.getTaskTypes();
-    this.getDepts();
-    this.getClothingBatchnoRule();
+    // this.getDepts();
+    // this.getClothingBatchnoRule();
     this.getConfig();
   }
 
@@ -51,9 +51,9 @@ export class QuiltWashingSendPageControlComponent implements OnInit {
     this.searchTimer(this.getTaskTypes, e);
   }
 
-  changeDept(e) {
-    this.searchTimer(this.getDepts, e);
-  }
+  // changeDept(e) {
+  //   this.searchTimer(this.getDepts, e);
+  // }
 
   //获取任务类型
   getTaskTypes(e:string = '') {
@@ -84,38 +84,38 @@ export class QuiltWashingSendPageControlComponent implements OnInit {
   }
 
   //获取科室
-  clothingDepts:any = [];
-  getDepts(e:string = '') {
-    this.isLoading = true;
-    let postData = {
-      idx: 0,
-      sum: 9999,
-      department: {
-        searchType: 1,// 简单查询
-        dept: e,
-        cascadeHosId: this.hosId,
-      }
-    };
-    this.otherPageControlService
-      .getDepts(postData)
-      .subscribe((result) => {
-        this.isLoading = false;
-        if (result.status == 200) {
-          this.clothingDepts = result.list || [];
-        }
-      });
-  }
+  // clothingDepts:any = [];
+  // getDepts(e:string = '') {
+  //   this.isLoading = true;
+  //   let postData = {
+  //     idx: 0,
+  //     sum: 9999,
+  //     department: {
+  //       searchType: 1,// 简单查询
+  //       dept: e,
+  //       cascadeHosId: this.hosId,
+  //     }
+  //   };
+  //   this.otherPageControlService
+  //     .getDepts(postData)
+  //     .subscribe((result) => {
+  //       this.isLoading = false;
+  //       if (result.status == 200) {
+  //         this.clothingDepts = result.list || [];
+  //       }
+  //     });
+  // }
   //获取批次号生成规则
-  clothing_batchno_rule:any = [];
-  getClothingBatchnoRule() {
-    this.isLoading = true;
-    this.otherPageControlService
-      .getDictionary("clothing_batchno_rule")
-      .subscribe((data) => {
-        this.isLoading = false;
-        this.clothing_batchno_rule = data;
-      });
-  }
+  // clothing_batchno_rule:any = [];
+  // getClothingBatchnoRule() {
+  //   this.isLoading = true;
+  //   this.otherPageControlService
+  //     .getDictionary("clothing_batchno_rule")
+  //     .subscribe((data) => {
+  //       this.isLoading = false;
+  //       this.clothing_batchno_rule = data;
+  //     });
+  // }
   // 切换tab
   tabModal(tabModalName:string){
     this.tabModalName = tabModalName;
@@ -128,23 +128,23 @@ export class QuiltWashingSendPageControlComponent implements OnInit {
       return;
     }
 
-    if(!this.clothingDept){
-      this.msg.create("warning", "请先配置被服洗涤科室！");
-      return;
-    }
+    // if(!this.clothingDept){
+    //   this.msg.create("warning", "请先配置被服洗涤科室！");
+    //   return;
+    // }
 
-    if(!this.batchNoRule){
-      this.msg.create("warning", "请先配置批次号生成规则！");
-      return;
-    }
+    // if(!this.batchNoRule){
+    //   this.msg.create("warning", "请先配置批次号生成规则！");
+    //   return;
+    // }
 
     let postData:any = {
       id: this.configs.id,
       taskType: this.clothingSendTypeId,
       clothingSendTypeId: this.clothingSendTypeId,
       hosId: this.hosId,
-      clothingDept: this.clothingDept,
-      batchNoRule: { id: this.batchNoRule },
+      // clothingDept: this.clothingDept,
+      // batchNoRule: { id: this.batchNoRule },
     };
     this.btnLoading = true;
     this.otherPageControlService
@@ -181,8 +181,8 @@ export class QuiltWashingSendPageControlComponent implements OnInit {
         this.loading = false;
         if (result.status == 200) {
           this.configs = result.list[0] || {};
-          this.clothingDept = this.configs.clothingDept;
-          this.batchNoRule = this.configs.batchNoRule ? this.configs.batchNoRule.id : null;
+          // this.clothingDept = this.configs.clothingDept;
+          // this.batchNoRule = this.configs.batchNoRule ? this.configs.batchNoRule.id : null;
           this.clothingSendTypeId = this.configs.clothingSendTypeId || null;
         }
       });