被服洗涤数据字典和页面控制

proxy.conf.json

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

src/app/views/building-floor/building-floor.component.html

@@ -50,8 +50,8 @@
               (nzCheckedChange)="refreshStatus()"></td>
             <td>{{ data.floorName }}</td>
             <td>
-              <button nz-button nzType="primary" nzSize="small" (click)="showFloorModal($event,'edit',data)">编辑</button>
-              <button nz-button nzType="primary" nzSize="small" class="ml8"
+              <button nz-button nzType="primary" *ngIf="coopBtns.edit" nzSize="small" (click)="showFloorModal($event,'edit',data)">编辑</button>
+              <button nz-button nzType="primary" *ngIf="coopBtns.del" nzSize="small" class="ml8"
                 (click)="showDelFloorModal($event,data)">删除</button>
             </td>
           </tr>

src/app/views/building-floor/building-floor.component.ts

@@ -63,7 +63,7 @@ export class BuildingFloorComponent implements OnInit {
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.hosId = this.tool.getCurrentHospital().id;
     this.getBuildingList();
-    this.tableHeight = document.body.clientHeight - 267;
+    this.tableHeight = document.body.clientHeight - 312;
   }
 
   // 楼栋列表

src/app/views/data-building/data-building-routing.module.ts

@@ -1,14 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-import { DataBuildingComponent } from './data-building.component';
-
-
-const routes: Routes = [
-  { path: '', component: DataBuildingComponent }
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule]
-})
-export class DataBuildingRoutingModule { }

src/app/views/data-building/data-building.component.html

@@ -1,28 +0,0 @@
-<div class="dataBuilding" *ngIf="!loading1">
-  <overlay-scrollbars #osComponentRef1 class="dataBuilding-mainBox">
-    <div class="dataBuilding-main" [ngStyle]="{width:mainWidth}">
-      <div class="ipt" *ngFor="let item of buildingList">
-        <input nz-input placeholder="请输入楼栋" [(ngModel)]="item.buildingName" />
-        <i class="icon_transport transport-lajitong" (click)="delete(item)" *ngIf="coopBtns.del"></i>
-      </div>
-      <button nz-button class="add" nzType="primary" (click)="add()" [disabled]="!coopBtns.add">新增</button>
-    </div>
-  </overlay-scrollbars>
-  <div class="dataBuilding-submit">
-    <button nz-button nzType="primary" (click)="save()" [nzLoading]="loading3" [disabled]="!coopBtns.edit">保存</button>
-  </div>
-</div>
-<div style="height: 100%;" class="loadingFull display_flex justify-content_flex-center align-items_center"
-  *ngIf="loading1">
-  <div class="loadingFullInner">
-    <img src="../../../assets/images/loading.gif" alt="">
-    <div>加载中...</div>
-  </div>
-</div>
-<!-- 操作成功/失败提示框 -->
-<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
-  [info]="promptInfo">
-</app-prompt-modal>
-<!-- 删除模态框 -->
-<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="loading2"
-  (confirmDelEvent)="confirmDel()" [content]="tipsMsg1" [tips]="tips"></app-dialog-delete>

src/app/views/data-building/data-building.component.less

@@ -1,130 +0,0 @@
-.dataBuilding {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  .dataBuilding-mainBox {
-    flex: 1;
-    .dataBuilding-main {
-      margin: 0 auto;
-      display: flex;
-      flex-wrap: wrap;
-      align-content: flex-start;
-      position: relative;
-      .add {
-        width: 80px;
-        height: 28px;
-        margin: 24px;
-      }
-      .ipt {
-        width: 312px;
-        height: 34px;
-        margin: 24px 24px 0;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        input {
-          height: 100%;
-        }
-        i {
-          font-size: 20px;
-          cursor: pointer;
-        }
-      }
-    }
-  }
-  .dataBuilding-submit {
-    height: 65px;
-    border-top: 1px solid #e5e9ed;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-}
-.save {
-  position: fixed;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100%;
-  background: rgba(0, 0, 0, 0.4);
-  z-index: 99;
-
-  .modalBody {
-    width: 350px;
-    height: 220px;
-    background: #fff;
-    border-radius: 5px;
-    padding: 10px 20px;
-    color: #333;
-
-    .title {
-      width: 100%;
-      text-align: center;
-      font-size: 18px;
-      position: relative;
-
-      i {
-        position: absolute;
-        right: 0;
-        top: 0;
-        font-size: 20px;
-        color: #666;
-        cursor: pointer;
-        padding: 0 5px;
-      }
-    }
-
-    .content {
-      width: 310px;
-      height: 117px;
-      background: #f9fafb;
-      border: 1px solid #e5e9ed;
-      border-radius: 5px;
-      overflow: hidden;
-      margin-top: 12px;
-
-      & > div {
-        text-align: center;
-        margin: 0;
-
-        &.icon {
-          margin-top: 17px;
-
-          i {
-            color: #34b349;
-            font-size: 30px !important;
-
-            &.transport-wenhao {
-              color: #f5a523;
-            }
-
-            &.transport-shibai {
-              color: #ff3a52;
-            }
-          }
-        }
-
-        &.defeat {
-          color: #333;
-          font-size: 18px;
-        }
-
-        &:nth-child(3) {
-          font-size: 14px;
-          color: #666;
-        }
-      }
-      .roundRobinTips {
-        font-size: 12px;
-      }
-    }
-
-    button {
-      margin-top: 10px;
-
-      &.btn {
-        margin-left: 8px;
-      }
-    }
-  }
-}

src/app/views/data-building/data-building.component.ts

@@ -1,222 +0,0 @@
-import { Component, OnInit, ViewChild } from "@angular/core";
-import { ActivatedRoute, ParamMap } from "@angular/router";
-import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
-import { MainService } from "../../services/main.service";
-import { ToolService } from "../../services/tool.service";
-
-@Component({
-  selector: "app-data-building",
-  templateUrl: "./data-building.component.html",
-  styleUrls: ["./data-building.component.less"],
-})
-export class DataBuildingComponent implements OnInit {
-  @ViewChild("osComponentRef1", {
-    read: OverlayScrollbarsComponent,
-    static: false,
-  })
-  osComponentRef1: OverlayScrollbarsComponent;
-  hosId: any; //院区id
-  loading1 = false; //获取楼栋信息列表加载状态
-  loading3 = false; //保存
-  id: number = 0; //自定义id，负整数
-  buildingList: Array<any> = []; //楼栋信息列表
-  promptContent: string; //操作提示框提示信息
-  ifSuccess: boolean; //操作成功/失败
-  promptInfo: string; //操作结果提示信息
-  promptModalShow: boolean; //操作提示框是否展示
-  delModal: boolean = false; //删除模态框
-  tipsMsg1: string; //提示框信息
-  tips: string; //提示框信息(附注)
-  coop: any; //当前操作列
-  loading2 = false; //删除接口
-  mainWidth: any = "100%";
-  coopBtns = {};
-  constructor(
-    private mainService: MainService,
-    private route: ActivatedRoute,
-    private tool: ToolService
-  ) {}
-  ngOnInit() {
-    this.route.queryParamMap.subscribe((params: ParamMap) => {
-      this.hosId = params.get("id");
-      if (!this.hosId) {
-        this.hosId = this.tool.getCurrentHospital().id;
-      }
-      this.getBuildingList();
-    });
-    this.coopBtns = this.tool.initCoopBtns("dataDictionary");
-    this.changeSize();
-    window.addEventListener("resize", () => {
-      this.changeSize();
-    });
-  }
-  // 改变窗口大小
-  changeSize() {
-    let w = window.innerWidth - 582; //屏幕宽-其他元素宽度
-    this.mainWidth = Math.floor(w / 360) * 360 + "px";
-  }
-  // 新增
-  add() {
-    this.buildingList.push({ id: --this.id, buildingName: "" });
-  }
-  // 删除
-  delete(data) {
-    this.showDelModal(
-      data,
-      "您确认要删除此楼栋吗？",
-      "删除后对应的楼栋积分配置也会删除"
-    );
-  }
-  // 删除楼栋
-  showDelModal(data: any, tipsMsg1: string, tips?) {
-    this.delModal = true;
-    this.coop = data;
-    this.tipsMsg1 = tipsMsg1;
-    this.tips = tips ? tips : "";
-  }
-  // 隐藏删除框
-  hideDelModal() {
-    this.delModal = false;
-  }
-  // 确认删除
-  confirmDel() {
-    this.loading2 = true;
-    if (this.coop.id > 0) {
-      //接口删除
-      let postData = [this.coop.id];
-      this.mainService.delBuildingList(postData).subscribe(
-        (result) => {
-          this.loading2 = false;
-          this.delModal = false;
-          if (result["status"] == 200 && !result["data"][0].msg) {
-            this.showPromptModal("删除", true, "", false);
-            // 过滤掉当前这一条
-            this.buildingList = this.buildingList.filter(
-              (item) => item.id !== this.coop.id
-            );
-          } else {
-            this.showPromptModal("删除", false, result["data"][0].msg, false);
-          }
-        },
-        (err) => {
-          this.loading2 = false;
-          this.delModal = false;
-          this.showPromptModal("删除", false, "", false);
-        }
-      );
-    } else {
-      this.loading2 = false;
-      this.delModal = false;
-      this.showPromptModal("删除", true, "", false);
-      // 过滤掉当前这一条
-      this.buildingList = this.buildingList.filter(
-        (item) => item.id !== this.coop.id
-      );
-    }
-  }
-  // 保存
-  save() {
-    let arr = []; //排查是否有重复的名称的容器
-    let arrStr = ""; //重复名称
-    // 过滤空值
-    this.buildingList = this.buildingList.filter((item) => {
-      return item.buildingName !== "";
-    });
-    // 数据处理
-    let postData = JSON.parse(JSON.stringify(this.buildingList));
-    postData.forEach((item) => {
-      arr.push(item.buildingName);
-      item.deleted = false;
-      item.hosId = this.hosId;
-      if (item.id < 0) {
-        delete item.id;
-      }
-    });
-    if (arr.length > 1) {
-      arr.sort();
-      for (let i = 0; i < arr.length - 1; i++) {
-        if (arr[i] === arr[i + 1]) {
-          arrStr += `【${arr[i]}】,`;
-        }
-      }
-    }
-    if (arrStr) {
-      //有重复名称
-      arrStr = [...new Set(arrStr.split(","))].join(); //去重
-      this.showPromptModal(
-        "保存",
-        false,
-        `存在重复的楼栋名称${arrStr}请修改后再保存！`,
-        false
-      );
-    } else {
-      this.loading3 = true;
-      this.mainService.saveBuildingList(postData).subscribe(
-        (result) => {
-          this.loading3 = false;
-          if (result["status"] == 200) {
-            this.showPromptModal("保存", true, "");
-          } else {
-            this.showPromptModal("保存", false, result["msg"]);
-          }
-        },
-        (err) => {
-          this.loading3 = false;
-          this.showPromptModal("保存", false, "");
-        }
-      );
-    }
-  }
-  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
-  showPromptModal(con, success, promptInfo, isRefresh = true) {
-    this.promptModalShow = false;
-    this.promptContent = con;
-    this.ifSuccess = success;
-    this.promptInfo = promptInfo;
-    setTimeout(() => {
-      this.promptModalShow = true;
-    }, 100);
-    if (isRefresh) {
-      this.getBuildingList();
-    }
-  }
-  // 获取楼栋信息列表
-  getBuildingList() {
-    this.loading1 = true;
-    this.mainService
-      .getFetchDataList("simple/data", "building", {
-        idx: 0,
-        sum: 9999,
-        building: { hosId: this.hosId },
-      })
-      .subscribe((result) => {
-        this.loading1 = false;
-        if (result["status"] == 200) {
-          if (
-            result["list"] &&
-            Array.isArray(result["list"]) &&
-            result["list"].length < 6
-          ) {
-            let arr = result["list"];
-            let len = 6 - arr.length;
-            for (let i = 0; i < len; i++) {
-              arr.push({ id: --this.id, buildingName: "" });
-            }
-            this.buildingList = arr;
-          } else if (
-            result["list"] &&
-            Array.isArray(result["list"]) &&
-            result["list"].length >= 6
-          ) {
-            this.buildingList = result["list"];
-          } else {
-            let arr = [];
-            for (let i = 0; i < 6; i++) {
-              arr.push({ id: --this.id, buildingName: "" });
-            }
-            this.buildingList = arr;
-          }
-        }
-      });
-  }
-}

src/app/views/data-building/data-building.module.ts

@@ -1,19 +0,0 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-import { DataBuildingRoutingModule } from './data-building-routing.module';
-import { DataBuildingComponent } from './data-building.component';
-import { ShareModule } from 'src/app/share/share.module';
-
-
-@NgModule({
-  declarations: [
-    DataBuildingComponent
-  ],
-  imports: [
-    CommonModule,
-    DataBuildingRoutingModule,
-    ShareModule
-  ]
-})
-export class DataBuildingModule { }

src/app/views/data-dictionary/data-dictionary-routing.module.ts

@@ -7,24 +7,6 @@ const routes: Routes = [
   {
     path: '',
     component: DataDictionaryComponent,
-    children: [
-      {
-        // 默认
-        path: '',
-        redirectTo: 'dataBuilding',
-        pathMatch: 'full'
-      },
-      {
-        // 楼栋
-        path: 'dataBuilding',
-        loadChildren: () => import('../data-building/data-building.module').then(m => m.DataBuildingModule),
-      },
-      {
-        // 楼层
-        path: 'dataFloor',
-        loadChildren: () => import('../data-floor/data-floor.module').then(m => m.DataFloorModule),
-      }
-    ]
    }
 ];
 

src/app/views/data-dictionary/data-dictionary.component.html

@@ -1,15 +1,136 @@
-<div class="dataDictionary">
-  <div class="nav">
-    <div class="nav-title">
-      <span>数据字典</span>
-    </div>
-    <div *ngFor="let item of navList;let index = index;" class="nav-menu" [routerLink]="item.url"
-      (click)="selectedNav(index)" [class.active]="currentIndex==index">
-      {{item.name}}</div>
+<div class="groupManagement">
+  <div class="groupInfo">
+    <div class="title">数据字典</div>
+    <div class="groups" [ngStyle]="{display:!dictionaryLoading?'block':'none'}">
+      <overlay-scrollbars #osComponentRef1 [ngStyle]="{ height:'100%' }">
+        <div [ngClass]="{'item':true,'checked':data.id == checkedDictionary.id}" *ngFor="let data of dictionaryList"
+          (click)="checkDictionary(data)" [title]="data.dictionaryName">{{data.dictionaryName}}</div>
+      </overlay-scrollbars>
+    </div>
+    <div class="groups" *ngIf="dictionaryLoading">
+      <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+        <div class="loadingFullInner">
+          <img src="../../../assets/images/loading.gif" alt="">
+          <div>加载中...</div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="userInfo">
+    <div class="top display_flex justify-content_flex-end align-items_center">
+      <div class="display_flex align-items_center">
+        <span>已选择 {{selectedDictionary.length}} 个</span>
+        <button class="btn default" *ngIf="coopBtns.add&&dictionaryList.length" nzType="primary" nz-button
+          (click)="showModal($event,'add')">新增</button>
+        <button class="btn default" *ngIf="coopBtns.del&&dictionaryList.length" nzType="primary" nz-button
+          (click)="showDelDictionaryModal($event)" [disabled]="allDataList.length===0">批量删除</button>
+      </div>
+    </div>
+    <div class="table" *ngIf="!dictionaryLoading">
+      <nz-table class="groupManagementTable" #rowSelectionTable [nzPageSize]="9999" [nzData]="allDataList"
+        [nzShowPagination]="false" [nzScroll]="{ y: tableHeight+'px' }" [nzLoading]="dictionaryLoading">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="5%" nzShowCheckbox [(nzChecked)]="isAllDisplayDataChecked"
+              (nzCheckedChange)="checkAll($event)"></th>
+            <th nzWidth="15%">名称</th>
+            <th nzWidth="10%">值</th>
+            <th nzWidth="10%">排序号</th>
+            <th nzWidth="10%">单价</th>
+            <th nzWidth="30%">附加说明</th>
+            <th nzWidth="20%">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of rowSelectionTable.data" (click)="selectedUser(data)">
+            <td nzShowCheckbox [(nzDisabled)]="!coopBtns.edit" [(nzChecked)]="mapOfCheckedId[data.id]"
+              (nzCheckedChange)="refreshStatus()"></td>
+            <td>{{ data.name }}</td>
+            <td>{{ data.value }}</td>
+            <td>{{ data.orders }}</td>
+            <td>{{ data.extra3 }}</td>
+            <td>{{ data.desc }}</td>
+            <td>
+              <button nz-button nzType="primary" *ngIf="coopBtns.edit" nzSize="small" (click)="showModal($event,'edit',data)">编辑</button>
+              <button nz-button nzType="primary" *ngIf="coopBtns.del" nzSize="small" class="ml8"
+                (click)="showDelDictionaryModal($event,data)">删除</button>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+    </div>
   </div>
-  <div class="main">
-    <div class="main-box">
-      <router-outlet></router-outlet>
+
+  <!-- 新增/编辑模态框 -->
+  <div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="dictionaryModal">
+    <div class="modalBody">
+      <div class="title">{{add?'新增':'编辑'}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+      </div>
+      <div class="content">
+        <form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
+          <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="key">数据字典</nz-form-label>
+            <nz-form-control nzErrorTip="请选择数据字典!">
+              <nz-select formControlName="key" nzPlaceHolder="请选择数据字典" nzDisabled>
+                <nz-option *ngFor="let option of dictionaryList" [nzLabel]="option.dictionaryName" [nzValue]="option.key">
+                </nz-option>
+              </nz-select>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="name">名称</nz-form-label>
+            <nz-form-control nzErrorTip="请输入名称!">
+              <nz-input-group>
+                <input nz-input formControlName="name" placeholder="请输入名称" />
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="value">值</nz-form-label>
+            <nz-form-control nzErrorTip="请输入值!">
+              <nz-input-group>
+                <input nz-input formControlName="value" placeholder="请输入值" />
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="orders">排序号</nz-form-label>
+            <nz-form-control nzErrorTip="请输入排序号!">
+              <nz-input-group>
+                <nz-input-number formControlName="orders" placeholder="请输入排序号" [nzMin]="0" [nzStep]="1" [nzPrecision]="0"></nz-input-number>
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="extra3">单价</nz-form-label>
+            <nz-form-control nzErrorTip="请输入单价!">
+              <nz-input-group>
+                <nz-input-number formControlName="extra3" placeholder="请输入单价" [nzMin]="0" [nzStep]="1" [nzPrecision]="2"></nz-input-number>
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="desc">附加说明</nz-form-label>
+            <nz-form-control nzErrorTip="请输入附加说明!">
+              <nz-input-group>
+                <input nz-input formControlName="desc" placeholder="请输入附加说明" />
+              </nz-input-group>
+            </nz-form-control>
+          </nz-form-item>
+        </form>
+      </div>
+      <div class="display_flex justify-content_flex-center">
+        <button nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">确认</button>
+        <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+      </div>
     </div>
   </div>
+  <!-- 删除模态框 -->
+  <app-dialog-delete [delModal]="delDictionaryModal" (hideDelModalEvent)="hideDelDictionaryModal()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmDictionaryDel()" content="您确认要删除吗？"></app-dialog-delete>
 </div>
+
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>

src/app/views/data-dictionary/data-dictionary.component.less

@@ -1,57 +1,281 @@
 @import "../../../../src/theme.less";
-.dataDictionary {
-  padding: 16px;
-  height: calc(100vh - 88px);
-  display: flex;
-  background-color: #f9fafb;
-  .nav {
-    width: 280px;
+:host {
+  width: 100%;
+  height: 100%;
+}
+
+.groupManagement {
+  width: 100%;
+  height: 100%;
+  background: #f9fafb;
+  padding: 16px 20px;
+  min-height: 532px;
+  overflow: hidden;
+
+  .groupInfo {
+    float: left;
+    width: 24%;
+    height: 100%;
+    min-height: calc(100vh - 120px);
     border: 1px solid #e5e9ed;
-    border-radius: 1px;
-    font-size: 14px;
+    background: #fff;
     color: #333;
-    background-color: #fff;
-    .nav-title {
-      padding-left: 16px;
+    font-size: 14px;
+    position: relative;
+    overflow: hidden;
+
+    .title {
+      width: 100%;
       height: 40px;
       line-height: 40px;
+      padding-left: 16px;
       border-bottom: 1px solid #e5e9ed;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      .selectHospital{
-        width: 140px;
-        margin-right: 8px;
+      position: relative;
+      background: #fff;
+      z-index: 2;
+    }
+
+    .operate {
+      width: 100%;
+      border-bottom: 1px solid #e5e9ed;
+      position: relative;
+      background: #fff;
+      z-index: 2;
+
+      .item {
+        display: inline-block;
+        width: 33.33%;
+        height: 34px;
+        line-height: 34px;
+        border-right: 1px solid #e5e9ed;
+        text-align: center;
+        color: #666;
+        cursor: pointer;
+
+        &:nth-last-child(1) {
+          border: none;
+        }
       }
     }
-    .nav-menu {
-      height: 34px;
-      line-height: 34px;
-      text-align: center;
-      cursor: pointer;
-      &.active,
-      &:active {
-        background-color: #f0f6ed;
-        color: @primary-color;
-        outline: none;
+
+    .groups {
+      width: 100%;
+      height: 100%;
+      position: absolute;
+      top: 0;
+      padding-top: 40px;
+      overflow-y: auto;
+      z-index: 1;
+
+      .item {
+        width: 100%;
+        height: 34px;
+        line-height: 34px;
+        text-align: center;
+        cursor: pointer;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+
+        &:hover {
+          color: @primary-color;
+          background: #f0f6ed;
+        }
+
+        &.checked {
+          color: @primary-color;
+          background: #f0f6ed;
+        }
       }
     }
   }
-  .main {
-    flex: 1;
-    margin-left: 16px;
-    border: 1px solid #dde1e5;
-    border-radius: 1px;
-    background-color: #fff;
-    padding: 16px;
+
+  .userInfo {
+    float: right;
+    width: 74%;
+    height: 100%;
+    min-height: calc(100vh - 120px);
+    border: 1px solid #e5e9ed;
+    background: #fff;
+    color: #333;
     position: relative;
-    .main-box {
-      position: absolute;
+
+    .top {
+      height: 74px;
+      padding: 0 16px;
+      line-height: 74px;
+      border-bottom: 1px solid #e5e9ed;
+      position: relative;
+      z-index: 2;
+
+      & > div {
+        input {
+          width: 224px;
+        }
+
+        button {
+          margin-left: 8px;
+        }
+      }
+    }
+
+    .table {
       width: 100%;
       height: 100%;
-      background-color: #f9fafb;
-      border: 1px solid #e5e9ed;
-      border-radius: 8px;
+      padding: 15px;
+      position: absolute;
+      top: 0;
+      padding-top: 90px;
+
+      .groupManagementTable {
+        border-radius: 5px;
+        padding: 16px;
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        .thead th {
+          text-align: center;
+        }
+
+        .ant-table-tbody {
+          tr {
+            td {
+              text-align: center;
+            }
+          }
+
+          tr:nth-child(2n-1) {
+            background: #f9fafb;
+          }
+        }
+      }
+    }
+  }
+
+  .save {
+    position: fixed;
+    left: 0;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    background: rgba(0, 0, 0, 0.4);
+    z-index: 99;
+
+    .modalBody {
+      width: 350px;
+      height: 220px;
+      background: #fff;
+      border-radius: 5px;
+      padding: 10px 20px;
+      color: #333;
+
+      .title {
+        width: 100%;
+        text-align: center;
+        font-size: 18px;
+        position: relative;
+
+        i {
+          position: absolute;
+          right: 0;
+          top: 0;
+          font-size: 20px;
+          color: #666;
+          cursor: pointer;
+          padding: 0 5px;
+        }
+      }
+
+      .content {
+        width: 310px;
+        height: 117px;
+        background: #f9fafb;
+        border: 1px solid #e5e9ed;
+        border-radius: 5px;
+        overflow: hidden;
+        margin-top: 12px;
+
+        div {
+          text-align: center;
+          margin: 0;
+
+          &.icon {
+            margin-top: 17px;
+
+            i {
+              color: #34b349;
+              font-size: 30px !important;
+
+              &.transport-wenhao {
+                color: #f5a523;
+              }
+
+              &.transport-shibai {
+                color: #ff3a52;
+              }
+            }
+          }
+
+          &.defeat {
+            color: #333;
+            font-size: 18px;
+          }
+
+          &:nth-child(3) {
+            font-size: 14px;
+            color: #666;
+          }
+        }
+      }
+
+      button {
+        margin-top: 10px;
+
+        &.btn {
+          margin-left: 8px;
+        }
+      }
+    }
+
+    // 新增
+    &.add {
+      .modalBody {
+        width: 480px;
+        height: auto;
+
+        .content {
+          width: 100%;
+          height: auto;
+          padding: 18px 14px 0 14px;
+
+          .addForm {
+            .ant-form-item {
+              margin-bottom: 15px;
+
+              .ant-form-item-label {
+                line-height: 0;
+                text-align: left;
+              }
+            }
+          }
+
+          .editForm {
+            .ant-form-item {
+              margin-bottom: 15px;
+
+              .ant-form-item-label {
+                line-height: 0;
+                text-align: left;
+              }
+            }
+          }
+        }
+
+        button {
+          &:nth-child(1) {
+            margin-right: 20px;
+          }
+        }
+      }
     }
   }
 }

src/app/views/data-dictionary/data-dictionary.component.ts

@@ -1,5 +1,9 @@
-import { Component, OnInit } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
+import { Component, OnInit, ViewChild } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+import { FormBuilder, Validators, FormGroup } from "@angular/forms";
+
+import { MainService } from "../../services/main.service";
+import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { ToolService } from "../../services/tool.service";
 
 @Component({
@@ -8,41 +12,270 @@ import { ToolService } from "../../services/tool.service";
   styleUrls: ["./data-dictionary.component.less"],
 })
 export class DataDictionaryComponent implements OnInit {
-  navList: Array<any> = [
-    { name: "楼栋", url: "/main/dataDictionary/dataBuilding" },
-    { name: "楼层", url: "/main/dataDictionary/dataFloor" },
-  ];
-  coopBtns = {};
-  hospitalList = []; //权限下的院区列表
-  selectedHospital: any; //权限下的选中的院区
-  currentIndex = 0; //当前高亮的导航
+  tableHeight;
+  validateForm: FormGroup;
+  allDataList: any[] = []; //数据字典下的数据列表
+  mapOfCheckedId: { [key: string]: boolean } = {};
+  checkedDictionary: any = {}; //选中
+  dictionaryList: Array<any> = []; //数据字典信息
+  hosId: any; //当前选择的院区id
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //是否展示提示框
+  btnLoading: boolean = false; //确认按钮loading状态
+  coopBtns: any = {}; // 初始化增删改按钮
+  dictionaryLoading = false; //loading
+  positionY = 0; //记录Y轴滚动距离
+  selectedDictionary = []; //选中的
+  add: boolean = true; //新增的标识，true：新增；false：编辑
+  dictionaryModal: boolean = false; //模态框是否展示
+  dataEdit; //正在编辑的
+  delModal: boolean = false; //删除，模态框是否显示
+  delDictionaryModal: boolean = false; //删除，模态框是否显示
+  isDelSingle: boolean = false; //是否单个删除
+  isAllDisplayDataChecked = false; //当前页是否全选
+
   constructor(
+    private fb: FormBuilder,
     private route: ActivatedRoute,
-    private tool: ToolService,
-    private router: Router
+    private mainService: MainService,
+    private tool: ToolService
   ) {}
 
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: true,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
+
   ngOnInit() {
-    console.log(this.router.url);
-    this.hospitalList = this.tool.getHospitalList();
-    let urlArr = this.router.url.split("?");
-    let url = urlArr[0];
-    let id = urlArr[1];
-    this.currentIndex = this.navList.findIndex((item) => item.url == url);
-    if (id) {
-      this.selectedHospital = parseInt(id.split("=")[1]);
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.getDictionaryList();
+    this.tableHeight = document.body.clientHeight - 312;
+  }
+
+  // 数据字典列表
+  getDictionaryList() {
+    this.dictionaryList = [
+      {
+        id: -1,
+        dictionaryName: '被服种类',
+        key: 'clothes_type',
+      }
+    ];
+    if (Object.keys(this.checkedDictionary).length) {
+      this.dictionaryList.forEach((item) => {
+        if (item.id == this.checkedDictionary.id) {
+          this.checkDictionary(item);
+        }
+      });
     } else {
-      this.selectedHospital = this.tool.getCurrentHospital().id;
+      this.checkDictionary(this.dictionaryList[0]);
     }
-    this.coopBtns = this.tool.initCoopBtns(this.route);
   }
-  // 导航跳转
-  selectedNav(index) {
-    this.currentIndex = index;
+
+  // 获取选中数据字典列表
+  getAll() {
+    // 初始化的时候搜索一次，然后前端过滤
+    this.dictionaryLoading = true;
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      dictionary: {
+        key: this.checkedDictionary.key,
+      },
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "dictionary", postData)
+      .subscribe((result) => {
+        this.dictionaryLoading = false;
+        if (result.status == 200) {
+          this.allDataList = result.list;
+          this.refreshStatus();
+        }
+      });
+  }
+
+  // 选中数据字典
+  checkDictionary(data) {
+    this.positionY = this.osComponentRef1.osInstance() ? this.osComponentRef1.osInstance().scroll().position.y : 0; //内容滚动的距离
+    this.checkedDictionary = data ? data : {};
+    this.mapOfCheckedId = {};
+    this.getAll();
+  }
+
+  selectedUser(data) {
+    this.mapOfCheckedId[data.id] = !this.mapOfCheckedId[data.id];
+    this.refreshStatus();
+  }
+  // 选中列表中
+  refreshStatus(): void {
+    let arr = [];
+    if (this.allDataList.length) {
+      this.isAllDisplayDataChecked = this.allDataList.every(
+        (item) => this.mapOfCheckedId[item.id]
+      );
+    } else {
+      this.isAllDisplayDataChecked = false;
+    }
+
+    for (var m in this.mapOfCheckedId) {
+      if (this.mapOfCheckedId[m]) {
+        arr.push({ id: m });
+      }
+    }
+    this.selectedDictionary = arr;
+  }
+
+  // 新增/编辑模态框
+  showModal(e, type, data?) {
+    this.dictionaryModal = true;
+    this.add = type == "add";
+    if (type == "edit") {
+      this.initForm();
+      this.dataEdit = data;
+      this.validateForm.controls.key.setValue(data.key);
+      this.validateForm.controls.name.setValue(data.name);
+      this.validateForm.controls.value.setValue(data.value);
+      this.validateForm.controls.orders.setValue(data.orders);
+      this.validateForm.controls.extra3.setValue(data.extra3);
+      this.validateForm.controls.desc.setValue(data.desc);
+    } else {
+      this.initForm();
+    }
+    e.stopPropagation();
+  }
+
+  // 隐藏模态框
+  hideModal() {
+    this.dictionaryModal = false;
+  }
+
+  // 初始化新增form表单dictionary
+  initForm() {
+    this.validateForm = this.fb.group({
+      key: [this.checkedDictionary.key, [Validators.required]],
+      name: [null, [Validators.required]],
+      value: [null, [Validators.required]],
+      orders: [0, [Validators.required]],
+      extra3: [0, [Validators.required]],
+      desc: [null, [Validators.required]],
+    });
+  }
+
+  // 新增/编辑提交
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) return;
+    this.btnLoading = true;
+    let postData;
+
+    if (this.add) {
+      postData = {
+        key: this.validateForm.value.key,
+        name: this.validateForm.value.name,
+        value: this.validateForm.value.value,
+        orders: this.validateForm.value.orders,
+        extra3: this.validateForm.value.extra3,
+        desc: this.validateForm.value.desc,
+      };
+    } else {
+      postData = {
+        key: this.validateForm.value.key,
+        name: this.validateForm.value.name,
+        value: this.validateForm.value.value,
+        orders: this.validateForm.value.orders,
+        extra3: this.validateForm.value.extra3,
+        desc: this.validateForm.value.desc,
+        id: this.dataEdit.id,
+      };
+    }
+    this.addHandler(postData);
+  }
+
+  //新增/编辑
+  addHandler(postData) {
+    this.mainService
+      .simplePost("addData", "dictionary", postData)
+      .subscribe((result) => {
+        this.hideModal();
+        this.btnLoading = false;
+        if (result["status"] == 200) {
+          this.showPromptModal(this.add ? "新增" : "编辑", true, "");
+        } else {
+          this.showPromptModal(
+            this.add ? "新增" : "编辑",
+            false,
+            result["msg"]
+          );
+        }
+      });
   }
-  // 切换院区
-  selectedHospitalChange() {
-    let url = this.router.url.split("?")[0];
-    this.router.navigate([url], { queryParams: { id: this.selectedHospital } });
+
+  /**
+   * 删除
+   * @param e 事件对象
+   * @param data 有值就是单个删除，无值就是批量删除
+   */
+  showDelDictionaryModal(e, data?) {
+    if (data) {
+      this.isDelSingle = true;
+      this.dataEdit = data;
+    } else {
+      this.isDelSingle = false;
+    }
+    this.delDictionaryModal = true;
+    e.stopPropagation();
+  }
+  hideDelDictionaryModal() {
+    this.delDictionaryModal = false;
+  }
+  // 确认删除
+  confirmDictionaryDel() {
+    this.btnLoading = true;
+    let selectedDictionary = this.selectedDictionary.map((item) => item.id);
+    let postData = this.isDelSingle ? [this.dataEdit.id] : selectedDictionary;
+    this.mainService.simplePost("rmvData", "dictionary", postData).subscribe((result) => {
+      this.hideDelDictionaryModal();
+      this.btnLoading = false;
+      if (result.status == 200) {
+        this.showPromptModal("删除", true, "");
+      } else {
+        this.showPromptModal("删除", false, result.msg);
+      }
+    });
+  }
+  // 全选
+  checkAll(value: boolean): void {
+    console.log(this.allDataList);
+    this.allDataList.forEach((item) => {
+      this.mapOfCheckedId[item.id] = value;
+    });
+    this.refreshStatus();
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    this.osComponentRef1.osInstance().scroll({ x: 0, y: this.positionY });
+    if (success) {
+      setTimeout(() => {
+        this.promptModalShow = true;
+        this.getDictionaryList();
+      }, 100);
+    } else {
+      setTimeout(() => {
+        this.promptModalShow = true;
+      }, 100);
+    }
   }
 }
+

src/app/views/main/main-routing.module.ts

@@ -93,11 +93,21 @@ const routes: Routes = [
         path: "drugPageControl",
         loadChildren: () => import("../drug-page-control/drug-page-control.module").then((m) => m.DrugPageControlModule),
       },
-      // 药品页面控制
+      // 临床服务页面控制
       {
         path: "otherPageControl",
         loadChildren: () => import("../other-page-control/other-page-control.module").then((m) => m.OtherPageControlModule),
       },
+      // 被服洗涤-回收页面控制
+      {
+        path: "quiltWashingGetPageControl",
+        loadChildren: () => import("../quilt-washing-get-page-control/quilt-washing-get-page-control.module").then((m) => m.QuiltWashingGetPageControlModule),
+      },
+      // 被服洗涤-送回页面控制
+      {
+        path: "quiltWashingSendPageControl",
+        loadChildren: () => import("../quilt-washing-send-page-control/quilt-washing-send-page-control.module").then((m) => m.QuiltWashingSendPageControlModule),
+      },
       // 限制发起时间
       {
         path: "limitInitiationTime",

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

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { QuiltWashingGetPageControlComponent } from './quilt-washing-get-page-control.component';
+
+
+const routes: Routes = [
+  { path: '', component: QuiltWashingGetPageControlComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class QuiltWashingGetPageControlRoutingModule { }

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

@@ -0,0 +1,69 @@
+<div class="TaskTypeManagement">
+  <div class="taskTypeInfo">
+    <div class="top">
+      <div class="item" (click)="tabModal('characteristics')" [ngClass]="{'items':tabModalName=='characteristics'}">
+        特性配置
+      </div>
+      <div class="item" (click)="tabModal('automaticOrderCreation')" [ngClass]="{'items':tabModalName=='automaticOrderCreation'}">
+        自动建单配置
+      </div>
+    </div>
+    <div class="list" *ngIf="!loading">
+      <!-- 特性配置 -->
+      <div *ngIf="tabModalName=='characteristics'">
+        <!-- 被服洗涤-回收 -->
+        <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
+            (nzOnSearch)="changeTasktype($event)" nzPlaceHolder="请选择被服洗涤-回收" [(ngModel)]="clothingGetTypeId">
+            <ng-container *ngFor="let option of taskTypes">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.taskName" [nzValue]="option.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 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">
+              <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 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">
+              <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [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>
+      <!-- 自动建单配置 -->
+      <div *ngIf="tabModalName=='automaticOrderCreation'">
+      </div>
+      <div class="bottom">
+        <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>
+      </div>
+    </div>
+    <div class="list" *ngIf="loading">
+      <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+        <div class="loadingFullInner">
+          <img src="../../../assets/images/loading.gif" alt="">
+          <div>加载中...</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,193 @@
+import { Component, OnInit } from "@angular/core";
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { QuiltWashingGetPageControlService } from './quilt-washing-get-page-control.service';
+
+@Component({
+  selector: "app-quilt-washing-get-page-control",
+  templateUrl: "./quilt-washing-get-page-control.component.html",
+  styleUrls: ["./quilt-washing-get-page-control.component.less"],
+})
+export class QuiltWashingGetPageControlComponent implements OnInit {
+  loading:boolean = false; //页面加载的loading
+  btnLoading:boolean = false; //提交按钮的loading
+  tabModalName:string = 'characteristics'; //当前选中的tab
+  hosId = this.tool.getCurrentHospital().id; //当前院区
+
+  // 积分计算方式
+  clothingDept:any = null;
+  // 批次号生成规则
+  batchNoRule:any = null;
+  // 配置
+  configs:any = {};
+  searchTimerSubject = new Subject();
+  constructor(private otherPageControlService: QuiltWashingGetPageControlService, private tool: ToolService, private msg: NzMessageService) {}
+
+  ngOnInit():void {
+    // todo
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.getTaskTypes();
+    this.getDepts();
+    this.getClothingBatchnoRule();
+    this.getConfig();
+  }
+
+  // 边输入边搜索节流阀
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  // 用户输入搜索任务类型
+  isLoading: boolean = false;
+  clothingGetTypeId:any = null;
+  taskTypes:any[] = [];
+  changeTasktype(e) {
+    this.searchTimer(this.getTaskTypes, e);
+  }
+
+  changeDept(e) {
+    this.searchTimer(this.getDepts, e);
+  }
+
+  //获取任务类型
+  getTaskTypes(e:string = '') {
+    let postData:any = {
+      idx: 0,
+      sum: 9999,
+      taskType: {
+        taskName: e,
+        simpleQuery: true,
+        hosId: {
+          id: this.hosId
+        },
+        ordinaryField: {
+          key: 'ordinary_field',
+          value: 'clothingGet'
+        }
+      }
+    };
+    this.isLoading = true;
+    this.otherPageControlService
+      .getTaskTypes(postData)
+      .subscribe((result) => {
+        this.isLoading = false;
+        if (result.status == 200) {
+          this.taskTypes = 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;
+      });
+  }
+  // 切换tab
+  tabModal(tabModalName:string){
+    this.tabModalName = tabModalName;
+  }
+
+  // 保存
+  submitForm() {
+    if(!this.clothingGetTypeId){
+      this.msg.create("warning", "请先配置被服洗涤-回收任务类型！");
+      return;
+    }
+
+    if(!this.clothingDept){
+      this.msg.create("warning", "请先配置被服洗涤科室！");
+      return;
+    }
+
+    if(!this.batchNoRule){
+      this.msg.create("warning", "请先配置批次号生成规则！");
+      return;
+    }
+
+    let postData:any = {
+      id: this.configs.id,
+      taskType: this.clothingGetTypeId,
+      clothingGetTypeId: this.clothingGetTypeId,
+      hosId: this.hosId,
+      clothingDept: this.clothingDept,
+      batchNoRule: { id: this.batchNoRule },
+    };
+    this.btnLoading = true;
+    this.otherPageControlService
+      .simplePost("addData", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        if (result.status == 200) {
+          this.getConfig();
+        }
+      });
+  }
+
+  // 获取配置
+  getConfig() {
+    this.loading = true;
+    let postData = {
+      idx: 0,
+      sum: 10,
+      taskTypeConfig: {
+        taskTypeDTO: {
+          hosId: {
+            id: this.hosId
+          },
+          ordinaryField: {
+            key: 'ordinary_field',
+            value: 'clothingGet'
+          }
+        }
+      }
+    };
+    this.otherPageControlService
+      .getConfig(postData)
+      .subscribe((result) => {
+        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.clothingGetTypeId = this.configs.clothingGetTypeId || null;
+        }
+      });
+  }
+}
+
+
+

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

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { QuiltWashingGetPageControlRoutingModule } from './quilt-washing-get-page-control-routing.module';
+import { QuiltWashingGetPageControlComponent } from './quilt-washing-get-page-control.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    QuiltWashingGetPageControlComponent,
+  ],
+  imports: [
+    CommonModule,
+    QuiltWashingGetPageControlRoutingModule,
+    ShareModule,
+  ]
+})
+export class QuiltWashingGetPageControlModule { }

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

@@ -0,0 +1,52 @@
+import { Injectable } from '@angular/core';
+import { MainService } from 'src/app/services/main.service';
+import { map } from 'rxjs/operators';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class QuiltWashingGetPageControlService {
+
+  constructor(
+    private mainService: MainService,
+  ) { }
+
+  // 字典
+  getDictionary(type) {
+    return this.mainService.getDictionary("list", type);
+  }
+
+  // 获取配置列表
+  getConfig(postData) {
+    return this.mainService.getFetchDataList("simple/data", "taskTypeConfig", postData);
+  }
+
+  // 获取其他临床服务任务类型列表
+  getTaskTypes(postData) {
+    return this.mainService.getFetchDataList("simple/data", "taskType", postData).pipe(map((v:any) => {
+      if(Array.isArray(v.list)){
+        v.list = v.list.map(vv => ({id: vv.id, taskName: vv.taskName}));
+      }else{
+        v.list = [];
+      }
+      return v;
+    }));
+  }
+
+  // 获取科室列表
+  getDepts(postData) {
+    return this.mainService.getFetchDataList("simple/data", "department", postData).pipe(map((v:any) => {
+      if(Array.isArray(v.list)){
+        v.list = v.list.map(vv => ({id: vv.id, dept: vv.dept}));
+      }else{
+        v.list = [];
+      }
+      return v;
+    }));
+  }
+
+  // simple增删改
+  simplePost(type, model, postData) {
+    return this.mainService.simplePost(type, model, postData);
+  }
+}

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

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { QuiltWashingSendPageControlComponent } from './quilt-washing-send-page-control.component';
+
+
+const routes: Routes = [
+  { path: '', component: QuiltWashingSendPageControlComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class QuiltWashingSendPageControlRoutingModule { }

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

@@ -0,0 +1,69 @@
+<div class="TaskTypeManagement">
+  <div class="taskTypeInfo">
+    <div class="top">
+      <div class="item" (click)="tabModal('characteristics')" [ngClass]="{'items':tabModalName=='characteristics'}">
+        特性配置
+      </div>
+      <div class="item" (click)="tabModal('automaticOrderCreation')" [ngClass]="{'items':tabModalName=='automaticOrderCreation'}">
+        自动建单配置
+      </div>
+    </div>
+    <div class="list" *ngIf="!loading">
+      <!-- 特性配置 -->
+      <div *ngIf="tabModalName=='characteristics'">
+        <!-- 被服洗涤-送回 -->
+        <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
+            (nzOnSearch)="changeTasktype($event)" nzPlaceHolder="请选择被服洗涤-送回" [(ngModel)]="clothingSendTypeId">
+            <ng-container *ngFor="let option of taskTypes">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.taskName" [nzValue]="option.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 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">
+              <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 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">
+              <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [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>
+      <!-- 自动建单配置 -->
+      <div *ngIf="tabModalName=='automaticOrderCreation'">
+      </div>
+      <div class="bottom">
+        <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>
+      </div>
+    </div>
+    <div class="list" *ngIf="loading">
+      <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+        <div class="loadingFullInner">
+          <img src="../../../assets/images/loading.gif" alt="">
+          <div>加载中...</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,193 @@
+import { Component, OnInit } from "@angular/core";
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { QuiltWashingSendPageControlService } from './quilt-washing-send-page-control.service';
+
+@Component({
+  selector: "app-quilt-washing-send-page-control",
+  templateUrl: "./quilt-washing-send-page-control.component.html",
+  styleUrls: ["./quilt-washing-send-page-control.component.less"],
+})
+export class QuiltWashingSendPageControlComponent implements OnInit {
+  loading:boolean = false; //页面加载的loading
+  btnLoading:boolean = false; //提交按钮的loading
+  tabModalName:string = 'characteristics'; //当前选中的tab
+  hosId = this.tool.getCurrentHospital().id; //当前院区
+
+  // 积分计算方式
+  clothingDept:any = null;
+  // 批次号生成规则
+  batchNoRule:any = null;
+  // 配置
+  configs:any = {};
+  searchTimerSubject = new Subject();
+  constructor(private otherPageControlService: QuiltWashingSendPageControlService, private tool: ToolService, private msg: NzMessageService) {}
+
+  ngOnInit():void {
+    // todo
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
+    this.getTaskTypes();
+    this.getDepts();
+    this.getClothingBatchnoRule();
+    this.getConfig();
+  }
+
+  // 边输入边搜索节流阀
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+
+  // 用户输入搜索任务类型
+  isLoading: boolean = false;
+  clothingSendTypeId:any = null;
+  taskTypes:any[] = [];
+  changeTasktype(e) {
+    this.searchTimer(this.getTaskTypes, e);
+  }
+
+  changeDept(e) {
+    this.searchTimer(this.getDepts, e);
+  }
+
+  //获取任务类型
+  getTaskTypes(e:string = '') {
+    let postData:any = {
+      idx: 0,
+      sum: 9999,
+      taskType: {
+        taskName: e,
+        simpleQuery: true,
+        hosId: {
+          id: this.hosId
+        },
+        ordinaryField: {
+          key: 'ordinary_field',
+          value: 'clothingSend'
+        }
+      }
+    };
+    this.isLoading = true;
+    this.otherPageControlService
+      .getTaskTypes(postData)
+      .subscribe((result) => {
+        this.isLoading = false;
+        if (result.status == 200) {
+          this.taskTypes = 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;
+      });
+  }
+  // 切换tab
+  tabModal(tabModalName:string){
+    this.tabModalName = tabModalName;
+  }
+
+  // 保存
+  submitForm() {
+    if(!this.clothingSendTypeId){
+      this.msg.create("warning", "请先配置被服洗涤-送回任务类型！");
+      return;
+    }
+
+    if(!this.clothingDept){
+      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 },
+    };
+    this.btnLoading = true;
+    this.otherPageControlService
+      .simplePost("addData", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        if (result.status == 200) {
+          this.getConfig();
+        }
+      });
+  }
+
+  // 获取配置
+  getConfig() {
+    this.loading = true;
+    let postData = {
+      idx: 0,
+      sum: 10,
+      taskTypeConfig: {
+        taskTypeDTO: {
+          hosId: {
+            id: this.hosId
+          },
+          ordinaryField: {
+            key: 'ordinary_field',
+            value: 'clothingSend'
+          }
+        }
+      }
+    };
+    this.otherPageControlService
+      .getConfig(postData)
+      .subscribe((result) => {
+        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.clothingSendTypeId = this.configs.clothingSendTypeId || null;
+        }
+      });
+  }
+}
+
+
+

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

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { QuiltWashingSendPageControlRoutingModule } from './quilt-washing-send-page-control-routing.module';
+import { QuiltWashingSendPageControlComponent } from './quilt-washing-send-page-control.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    QuiltWashingSendPageControlComponent,
+  ],
+  imports: [
+    CommonModule,
+    QuiltWashingSendPageControlRoutingModule,
+    ShareModule,
+  ]
+})
+export class QuiltWashingSendPageControlModule { }

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

@@ -0,0 +1,52 @@
+import { Injectable } from '@angular/core';
+import { MainService } from 'src/app/services/main.service';
+import { map } from 'rxjs/operators';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class QuiltWashingSendPageControlService {
+
+  constructor(
+    private mainService: MainService,
+  ) { }
+
+  // 字典
+  getDictionary(type) {
+    return this.mainService.getDictionary("list", type);
+  }
+
+  // 获取配置列表
+  getConfig(postData) {
+    return this.mainService.getFetchDataList("simple/data", "taskTypeConfig", postData);
+  }
+
+  // 获取其他临床服务任务类型列表
+  getTaskTypes(postData) {
+    return this.mainService.getFetchDataList("simple/data", "taskType", postData).pipe(map((v:any) => {
+      if(Array.isArray(v.list)){
+        v.list = v.list.map(vv => ({id: vv.id, taskName: vv.taskName}));
+      }else{
+        v.list = [];
+      }
+      return v;
+    }));
+  }
+
+  // 获取科室列表
+  getDepts(postData) {
+    return this.mainService.getFetchDataList("simple/data", "department", postData).pipe(map((v:any) => {
+      if(Array.isArray(v.list)){
+        v.list = v.list.map(vv => ({id: vv.id, dept: vv.dept}));
+      }else{
+        v.list = [];
+      }
+      return v;
+    }));
+  }
+
+  // simple增删改
+  simplePost(type, model, postData) {
+    return this.mainService.simplePost(type, model, postData);
+  }
+}

src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
   enableProdMode();
   if (window) {
     window.console.log = function () { };
-    console.info('v2.4.49');
+    console.info('v2.4.50');
   }
 }
 platformBrowserDynamic().bootstrapModule(AppModule)