Merge branch 'develop' of http://git.dashitech.com/seimin/zy-pc

package-lock.json

@@ -10164,7 +10164,6 @@
     },
     "node_modules/npm/node_modules/lodash._baseindexof": {
       "version": "3.1.0",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
@@ -10179,19 +10178,16 @@
     },
     "node_modules/npm/node_modules/lodash._bindcallback": {
       "version": "3.0.1",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/npm/node_modules/lodash._cacheindexof": {
       "version": "3.0.2",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/npm/node_modules/lodash._createcache": {
       "version": "3.1.2",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -10205,7 +10201,6 @@
     },
     "node_modules/npm/node_modules/lodash._getnative": {
       "version": "3.9.1",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
@@ -10221,7 +10216,6 @@
     },
     "node_modules/npm/node_modules/lodash.restparam": {
       "version": "3.6.1",
-      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },

src/app/components/configurationCenter/configuration-hospital/configuration-hospital.component.less

@@ -100,6 +100,7 @@
       }
       .contentBody2{
         flex: 1;
+        margin-bottom: 16px;
       }
       .address{
         flex: 1;

src/app/components/configurationCenter/configuration-hospital/configuration-hospital.component.ts

@@ -29,14 +29,8 @@ export class ConfigurationHospitalComponent implements OnInit {
   btnLoading: boolean = false; //提交按钮loading状态
   submitMessageForm(): void {
     this.btnLoading = true;
-    let postData:any = {
-      hosId: this.currentHospital.id,
-      // workdayClassId: this.dataInfo.workdayClassId,
-      // holidayClassId: this.dataInfo.holidayClassId,
-    };
-    // postData = { ...this.dataInfo, ...postData };
     this.mainService
-      .simplePost("addData", "hospitalConfig", postData)
+      .simplePost("addListData", "hospitalConfig", this.hospitalList)
       .subscribe((result) => {
         this.btnLoading = false;
         let msg = "保存";

src/app/components/select-menu/select-menu.component.html

@@ -3,17 +3,11 @@
     <div class="title">配置中心<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
     </div>
     <div class="content">
-      <div class="content_item" (click)="toIncidentConfig()">
+      <div class="content_item" (click)="clickHandle(item)" *ngFor="let item of configurationCenterMenus">
         <div class="name">
-          <i class="icon_transport transport-shijianpeizhi5"></i>事件配置
+          <i class="icon_transport" [ngClass]="item.icon"></i>{{item.title}}
         </div>
-        <div class="tips">故障现象、优先级、数据字典、系统配置、消息通知、科室绑定人员...</div>
-      </div>
-      <div class="content_item" (click)="toOtherConfig()">
-        <div class="name">
-          <i class="icon_transport transport-disanfang"></i>第三方配置
-        </div>
-        <div class="tips">微信配置、呼叫中心...</div>
+        <div class="tips ellipsis-multiline">{{item.remark}}</div>
       </div>
     </div>
     <div class="display_flex justify-content_flex-center">

src/app/components/select-menu/select-menu.component.less

@@ -34,12 +34,13 @@
 
     .content {
       width: 100%;
+      min-height: 97px;
       margin-top: 12px;
       display: flex;
       flex-wrap: wrap;
       gap: 16px;
       .content_item{
-        flex: 1;
+        width: 205px;
         height: 97px;
         background-color: #F9FAFB;
         border: 1px solid #EEEEEE;

src/app/components/select-menu/select-menu.component.ts

@@ -1,7 +1,6 @@
 import { Component, OnInit, Output, Input } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import { Router } from "@angular/router";
-import { ToolService } from '../../services/tool.service';
 
 @Component({
   selector: 'app-select-menu',
@@ -13,16 +12,18 @@ export class SelectMenuComponent implements OnInit {
   @Input() iShowMenuModal: boolean = false;//模态框
   allHospital: any;//所有院区
   hosLoading: boolean = false;//确定按钮的loading
+  configurationCenterMenus: any[] = [];//配置中心菜单
   constructor(
     private router: Router,
   ) { }
 
-  ngOnInit() {}
-  toIncidentConfig(){
-    this.router.navigateByUrl("configurationCenter/incidentConfig");
+  ngOnInit() {
+    let menus = JSON.parse(localStorage.getItem("menu"));
+    let configurationCenter = menus.find(item => item.link == 'configurationCenter');
+    this.configurationCenterMenus = configurationCenter ? (configurationCenter.childrens || []) : [];
   }
-  toOtherConfig(){
-    this.router.navigateByUrl("configurationCenter/otherConfig");
+  clickHandle(item){
+    this.router.navigateByUrl("configurationCenter/" + item.link);
   }
   // 隐藏模态框
   hideModal() {

src/app/views/assets-consumable/assets-consumable-routing.module.ts

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

src/app/views/assets-consumable/assets-consumable.component.html

@@ -0,0 +1,144 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl='16' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">耗材名称</span>：
+          <input nz-input class="formItem" placeholder="请输入耗材名称" [(ngModel)]="searchDto.name" />
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">关联产品</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+            (nzOnSearch)="changeInp('search', 'assetProduct', $event)" nzAllowClear nzPlaceHolder="请选择关联产品" [(ngModel)]="searchDto.productId">
+            <ng-container *ngFor="let option of assetProductsearchList">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.name + '(' + option.brand + ')' + '(' + option.model + ')'" [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>
+      <div nz-col nzLg="8" class="list-template__btns">
+        <button nz-button class="btn default ml8" (click)='search()'>搜索</button>
+        <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
+        <button nz-button *ngIf="coopBtns.add" class="btn default ml8" (click)="addModal()">新增</button>
+      </div>
+    </div>
+    <div class="list-template__bottom">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="14%">耗材名称</th>
+            <th nzWidth="14%">型号</th>
+            <th nzWidth="14%">库存</th>
+            <th nzWidth="14%">单位</th>
+            <th nzWidth="14%">供应商</th>
+            <th nzWidth="14%">单价(元)</th>
+            <th nzWidth="16%">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let i = index">
+            <td>{{data.name}}</td>
+            <td>{{data.model}}</td>
+            <td>{{data.stock}}</td>
+            <td>{{data.unit}}</td>
+            <td>{{data.supplierDTO?.name}}</td>
+            <td>{{data.price}}</td>
+            <td>
+              <div class="coop">
+                <span *ngIf="coopBtns.edit" (click)="edit($event, data)">编辑</span>
+                <span *ngIf="coopBtns.del" (click)="showDelModal($event, data,'您确认要删除吗？','删除','del')">删除</span>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" nzShowSizeChanger
+          (nzPageIndexChange)="getList(0)" (nzPageSizeChange)="getList(0)">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+
+  <!-- 新增/编辑模态框 -->
+  <div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modal">
+    <div class="modalBody">
+      <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hideAddModal()"></i></div>
+      <div class="content">
+        <form nz-form [formGroup]="validateForm" class="addForm">
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired>耗材名称</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入耗材名称!">
+              {{productDto.name}}
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired>型&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入型号!">
+              {{productDto.model}}
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired>单&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入耗材单位!">
+              {{productDto.unit}}
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="productId">产&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;品</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请选择产品!">
+              <nz-select (nzOnSearch)="changeInp('add', 'assetProduct', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch formControlName="productId" nzPlaceHolder="请选择产品" (ngModelChange)="changeAssetProduct($event)">
+                <ng-container *ngFor="let option of assetProductaddList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.name + '(' + option.brand + ')' + '(' + option.model + ')'" [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>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="supplierId">供&nbsp;应&nbsp;商</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请选择供应商!">
+              <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="supplierId" nzPlaceHolder="请选择供应商">
+                <ng-container *ngFor="let option of companyList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [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>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="stock">库存</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请填写库存!">
+              <nz-input-number class="w100" nz-input formControlName="stock" nzPlaceHolder="请填写库存" [nzMin]="0" [nzStep]="0.01" [nzPrecision]="2"></nz-input-number>
+            </nz-form-control>
+          </nz-form-item>
+          <nz-form-item>
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="price">单价</nz-form-label>
+            <nz-form-control [nzSpan]="19" nzErrorTip="请填写单价!">
+              <nz-input-number class="w100" nz-input formControlName="price" nzPlaceHolder="请填写单价" [nzMin]="0" [nzStep]="0.01" [nzPrecision]="2"></nz-input-number>
+            </nz-form-control>
+          </nz-form-item>
+        </form>
+      </div>
+      <div class="display_flex justify-content_flex-center">
+        <button nzType="primary" nz-button (click)="submitForm()" [nzLoading]="btnLoading">确认</button>
+        <button class="btn cancel" nz-button nzType="default" (click)="hideAddModal()">取消</button>
+      </div>
+    </div>
+  </div>
+  <!-- 模态框 -->
+  <app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+    (confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+</div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>

src/app/views/assets-consumable/assets-consumable.component.less

@@ -0,0 +1,176 @@
+@import "../../../../src/theme.less";
+
+:host {
+  ::ng-deep .ant-calendar-picker {
+    width: 100% !important;
+  }
+  .list-template__top{
+    overflow: visible!important;
+  }
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 350px;
+    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;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      padding: 16px 0;
+
+      .busyList{
+        display: flex;
+        margin-bottom: 8px;
+        .busyContent{
+          margin-right: 8px;
+          flex: 1;
+        }
+      }
+
+      & > 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: 14px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+      .workAssignmentTips {
+        font-size: 12px;
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 16px;
+        max-height: 497px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 0;
+
+            .ant-form-item-label {
+              text-align: left;
+            }
+
+            .desc {
+              margin-top: 5px;
+            }
+          }
+
+          .datesControl {
+            margin-top: -16px;
+
+            .ant-form-item-label {
+              line-height: 40px;
+            }
+          }
+
+          .timer {
+            .ant-form-item-label {
+              width: 100%;
+              text-align: left;
+            }
+
+            .numInp {
+              margin-right: 5px;
+            }
+
+            .line {
+              margin-right: 5px;
+            }
+          }
+
+          .timer2 {
+            .ant-form-item-label {
+              line-height: 20px;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+      }
+    }
+  }
+}

src/app/views/assets-consumable/assets-consumable.component.ts

@@ -0,0 +1,358 @@
+import { Component, OnInit } from "@angular/core";
+import { ActivatedRoute, Router } from "@angular/router";
+import { FormBuilder, Validators, FormGroup } from "@angular/forms";
+
+import { MainService } from "../../services/main.service";
+import { ToolService } from "../../services/tool.service";
+import { NzMessageService } from 'ng-zorro-antd';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+@Component({
+  selector: "app-assets-consumable",
+  templateUrl: "./assets-consumable.component.html",
+  styleUrls: ["./assets-consumable.component.less"],
+})
+export class AssetsConsumableComponent implements OnInit {
+  constructor(
+    private fb: FormBuilder,
+    private mainService: MainService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) {}
+
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+  modal: boolean = false; //新增/编辑模态框
+  add: boolean; //true:新增；false:编辑
+  validateForm: FormGroup; //新增/编辑表单
+  coopData: any; //当前操作列
+  currentHospital; //当前院区
+
+  btnLoading: boolean = false; //提交按钮loading状态
+
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  nextSchemeName = ""; //下一个开启的方案名称
+  modelName = ""; //模态框名称
+
+  changeInpSubject = new Subject(); //防抖
+  showDropdown:boolean = false;
+
+  ngOnInit() {
+    //防抖
+    this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      if(v[1] === 'assetProduct'){
+        this.getAssetProductList(v[0], v[2]);
+      }
+    });
+    this.currentHospital = this.tool.getCurrentHospital();
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+    this.getList(1);
+    this.getAssetProductList('search', '');
+    this.getAssetProductList('add', '');
+  }
+
+  // 初始化增删改按钮
+  coopBtns: any = {};
+
+  // 搜索
+  search() {
+    this.getList(1);
+  }
+  // 重置
+  reset() {
+    this.searchDto = {};
+    this.getList(1);
+  }
+
+  // 表格数据
+  searchDto: any = {};
+  productDto:any = {};
+  loading1 = false;
+  getList(type) {
+    if (type == 1) {
+      this.pageIndex = 1;
+    }
+    let data = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      consumable: {
+        hosId: this.currentHospital.id,
+        ...this.searchDto,
+      },
+    };
+    data.consumable.status = data.consumable.status ? { id: data.consumable.status } : undefined;
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "consumable", data)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.listOfData = data.list;
+          this.listLength = data.totalNum;
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 新增弹框
+  disableDutyId:boolean = false;
+  addModal() {
+    this.modelName = "新增";
+    this.add = true; //新增
+    this.modal = true;
+    this.productDto = {};
+    this.initForm();
+    if(this.currentHospital.type && this.currentHospital.type.value === '6'){
+      this.disableDutyId = true;
+      this.validateForm.controls.dutyId.setValue(this.currentHospital.id);
+    }else{
+      this.disableDutyId = false;
+    }
+  }
+  //关闭新增/编辑弹框
+  hideAddModal() {
+    this.modal = false;
+    this.initForm();
+  }
+
+  // 编辑
+  edit(e, data) {
+    e.stopPropagation();
+    console.log(data);
+    this.initForm();
+    this.modelName = "编辑";
+    this.add = false;
+    this.modal = true;
+    this.coopData = data;
+    this.productDto = {
+      name: data.name,
+      model: data.model,
+      unit: data.unit,
+    }
+    this.validateForm.controls.productId.setValue(data.productId);
+    this.validateForm.controls.supplierId.setValue(data.supplierId);
+    this.validateForm.controls.stock.setValue(data.stock);
+    this.validateForm.controls.price.setValue(data.price);
+
+    if(data.assetProductDTO){
+      this.companyList = data.assetProductDTO.supplierList || [];
+    }
+
+    this.getAssetProductList('add', '', true);
+  }
+
+  // 初始化新增form表单
+  initForm() {
+    this.validateForm = this.fb.group({
+      productId: [null, [Validators.required]],
+      supplierId: [null, [Validators.required]],
+      stock: [0, [Validators.required]],
+      price: [0, [Validators.required]],
+    });
+  }
+
+  // 边输边搜节流阀
+  isLoading = false;
+  changeInp(type, model, e) {
+    this.isLoading = true;
+    this.changeInpSubject.next([type, model, e]);
+  }
+
+  // 获取产品列表
+  assetProductsearchList: any = [];
+  assetProductaddList: any = [];
+  consumableId:any; // 大类为维修耗材id
+  async getAssetProductList(type, keyword, init = false) {
+    if(!this.consumableId){
+      let result = await this.getProductCategoryTypeList(1);
+      let productCategoryTypeList = result.list || []; // 获取大类
+      // 大类为维修耗材
+      let consumable = productCategoryTypeList.find(v => v.value == '维修耗材');
+      if(!consumable){
+        this['assetProduct' + type + 'List'] = [];
+        this.isLoading = false;
+        return;
+      }
+      this.consumableId = consumable.id;
+    }
+    let postData:any = {
+      assetProduct: {
+        name: keyword,
+        hosId: this.currentHospital.id,
+        mainType: this.consumableId,
+      },
+      idx: 0,
+      sum: 20,
+    };
+    console.log(this.coopData)
+    this.mainService
+      .getFetchDataList("simple/data", "assetProduct", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        if(init){
+          // 回显
+          let assetProductList = data.list || [];
+          let flag = assetProductList.some(v => v.id == this.coopData.productId);
+          if(!flag){
+            assetProductList.unshift(this.coopData.assetProductDTO);
+            this['assetProduct' + type + 'List'] = assetProductList;
+          }
+        }else{
+          this['assetProduct' + type + 'List'] = data.list || [];
+        }
+      });
+  }
+
+  //获取大类
+  getProductCategoryTypeList(level:number) {
+    let postData = {
+      dictionaryTree: {
+        deleted: 0,
+        level: 1,
+        key: 'product_category_type',
+      },
+      idx: 0,
+      sum: 9999,
+    };
+    return this.mainService.getFetchDataList("simple/data", "dictionaryTree", postData).toPromise();
+  }
+
+  // 获取供应商
+  companyList: any = [];
+
+  // 修改产品
+  changeAssetProduct(id){
+    let obj = this.assetProductaddList.find(v => v.id == id);
+    console.log(obj);
+    this.productDto = obj || {};
+    this.companyList = obj.supplierList || [];
+    this.validateForm.controls.supplierId.setValue(null);
+  }
+
+  // 新增/编辑表单提交
+  submitForm(): void {
+    for (const i in this.validateForm.controls) {
+      this.validateForm.controls[i].markAsDirty();
+      this.validateForm.controls[i].updateValueAndValidity();
+    }
+    if (this.validateForm.invalid) {
+      return;
+    }
+
+    console.log(this.validateForm.value)
+
+    this.btnLoading = true;
+    let postData:any = {};
+
+    if (this.add) {
+      //增加
+      postData = {
+        consumable: {
+          hosId: this.currentHospital.id,
+          name: this.productDto.name,
+          model: this.productDto.model,
+          unit: this.productDto.unit,
+          productId: this.validateForm.value.productId,
+          supplierId: this.validateForm.value.supplierId,
+          stock: this.validateForm.value.stock,
+          price: this.validateForm.value.price,
+        }
+      };
+    } else {
+      //编辑
+      postData = {
+        consumable:{
+          ...this.coopData,
+          ...{
+            hosId: this.currentHospital.id,
+            name: this.productDto.name,
+            model: this.productDto.model,
+            unit: this.productDto.unit,
+            productId: this.validateForm.value.productId,
+            supplierId: this.validateForm.value.supplierId,
+            stock: this.validateForm.value.stock,
+            price: this.validateForm.value.price,
+          }
+        }
+      };
+    }
+    this.mainService
+      .coopData("addData", "consumable", postData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        this.hideAddModal();
+        let msg = "";
+        if (this.add) {
+          msg = "新增";
+        } else {
+          msg = "修改";
+        }
+        if (result.status == 200) {
+          this.showPromptModal(msg, true, "");
+        } else {
+          this.showPromptModal(msg, false, result.msg);
+        }
+      });
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList(0);
+  }
+
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    e,
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    e.stopPropagation();
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "del") {
+      //删除
+      this.mainService
+        .simplePost("rmvData", "consumable", [this.coopData.id])
+        .subscribe((data) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.status == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }
+  }
+}

src/app/views/assets-consumable/assets-consumable.module.ts

@@ -0,0 +1,19 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { AssetsConsumableRoutingModule } from './assets-consumable-routing.module';
+import { AssetsConsumableComponent } from './assets-consumable.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    AssetsConsumableComponent
+  ],
+  imports: [
+    CommonModule,
+    AssetsConsumableRoutingModule,
+    ShareModule
+  ]
+})
+export class AssetsConsumableModule { }

src/app/views/hospital-config/hospital-config.component.ts

@@ -351,7 +351,7 @@ export class HospitalConfigComponent implements OnInit {
   }
   // 获取系统配置列表
   getHospitalConfigList(hosId) {
-    let postData = { idx: 0, sum: 100, hospitalConfig: { hosId } };
+    let postData = { idx: 0, sum: 100, hospitalConfig: { hosId, model: 'hsms' } };
     return this.mainService.getFetchDataList(
       "simple/data",
       "hospitalConfig",

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

@@ -583,6 +583,11 @@ const routes: Routes = [
         path: "assetsProductManagement",
         loadChildren: () => import("../assets-product-management/assets-product-management.module").then((m) => m.AssetsProductManagementModule),
       },
+      // 耗材库
+      {
+        path: "assetsConsumable",
+        loadChildren: () => import("../assets-consumable/assets-consumable.module").then((m) => m.AssetsConsumableModule),
+      },
     ],
   },
 ];

src/common.less

@@ -149,6 +149,14 @@
 .wd{
   word-break: break-all;
 }
+
+.ellipsis-multiline {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2; /* 定义显示的行数 */
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 // list模板样式 end
 
 // 滚动条样式