资产优化

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

@@ -103,7 +103,7 @@
           <nz-form-item>
             <nz-form-label [nzSpan]="5" nzRequired nzFor="productId">关联产品</nz-form-label>
             <nz-form-control [nzSpan]="19" nzErrorTip="请选择关联产品!">
-              <nz-select (nzOnSearch)="changeInp('add', 'assetProduct', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="productId" nzPlaceHolder="请选择关联产品" (ngModelChange)="changeAssetProduct($event)" (nzOpenChange)="changeInp('add', 'assetProduct', '')">
+              <nz-select (nzOnSearch)="changeInp('add', 'assetProduct', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch formControlName="productId" nzPlaceHolder="请选择关联产品" (ngModelChange)="changeAssetProduct($event)" (nzOpenChange)="changeInp('add', 'assetProduct', '')">
                 <ng-container *ngFor="let option of assetProductList">
                   <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
                 </ng-container>
@@ -177,7 +177,7 @@
           <nz-form-item>
             <nz-form-label [nzSpan]="5" nzRequired nzFor="supplierId">供应商</nz-form-label>
             <nz-form-control [nzSpan]="19" nzErrorTip="请选择供应商!">
-              <nz-select (nzOnSearch)="changeInp('add', 'company', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="supplierId" nzPlaceHolder="请选择供应商" (nzOpenChange)="changeInp('add', 'company', '')">
+              <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>

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

@@ -55,8 +55,6 @@ export class AssetsInfoComponent implements OnInit {
         this.getFloors(v[0], v[2], this.validateForm.value.buildId);
       } else if(v[1] === 'assetProduct'){
         this.getAssetProductList(v[0], v[2]);
-      } else if(v[1] === 'company'){
-        this.getCompanyList(v[0], v[2]);
       } else if(v[1] === 'hospital'){
         this.getDutyList(v[0], v[2]);
       }
@@ -67,7 +65,6 @@ export class AssetsInfoComponent implements OnInit {
     this.getDeparts('search', '');
     this.getDeparts('add', '');
     this.getAssetProductList('add', '');
-    this.getCompanyList('add', '');
     this.getDutyList('add', '');
     this.getBuildings('add', '');
     this.getDispatchMethods();
@@ -206,24 +203,6 @@ export class AssetsInfoComponent implements OnInit {
 
   // 获取供应商
   companyList: any = [];
-  getCompanyList(type, keyword, init = false) {
-    let postData:any = {
-      company: {
-        name: keyword,
-        busiType: {key: "company_busi_type", value: "2"},
-        hosId: this.currentHospital.id,
-      },
-      idx: 0,
-      sum: 20,
-    };
-    this.mainService
-      .getFetchDataList("simple/data", "company", postData)
-      .subscribe((data) => {
-        this.companyList = data.list || [];
-
-        this.isLoading = false;
-      });
-  }
 
   // 获取责任部门
   dutyList: any = [];
@@ -275,7 +254,8 @@ export class AssetsInfoComponent implements OnInit {
     let obj = this.assetProductList.find(v => v.id == id);
     console.log(obj);
     this.validateForm.controls.brand.setValue(obj.brand);
-    this.validateForm.controls.supplierId.setValue((Array.isArray(obj.supplierList) && obj.supplierList.length) ? obj.supplierList[0].id : null);
+    this.companyList = obj.supplierList || [];
+    this.validateForm.controls.supplierId.setValue(null);
   }
 
   // 修改楼栋

src/app/views/tripartite-company/tripartite-company.component.html

@@ -98,7 +98,7 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label [nzSpan]="5" nzFor="contacts">联&nbsp;系&nbsp;人</nz-form-label>
+            <nz-form-label [nzSpan]="5" nzFor="contacts">&nbsp;&nbsp;联&nbsp;系&nbsp;人</nz-form-label>
             <nz-form-control [nzSpan]="19" nzErrorTip="请输入联系人!">
               <nz-input-group>
                   <input formControlName="contacts" nz-input placeholder="请输入联系人">
@@ -106,7 +106,7 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
-            <nz-form-label [nzSpan]="5" nzFor="mphone">联系电话</nz-form-label>
+            <nz-form-label [nzSpan]="5" nzFor="mphone">&nbsp;&nbsp;联系电话</nz-form-label>
             <nz-form-control [nzSpan]="19" nzErrorTip="请输入联系电话!">
               <nz-input-group>
                   <input formControlName="mphone" nz-input placeholder="请输入联系电话">

src/app/views/tripartite-company/tripartite-company.component.ts

@@ -136,6 +136,11 @@ export class TripartiteCompanyComponent implements OnInit {
     }
 
     console.log(this.validateForm.value)
+    let companyList = this.validateForm.value.companyTypeIds.filter(v => v.checked);
+    if(!companyList.length){
+      this.message.info("请选择公司分类");
+      return;
+    }
 
     this.btnLoading = true;
     let postData:any = {};
@@ -146,7 +151,7 @@ export class TripartiteCompanyComponent implements OnInit {
         company: {
           name: this.validateForm.value.name,
           nickName: this.validateForm.value.nickName,
-          companyTypeIds: this.validateForm.value.companyTypeIds.filter(v => v.checked).map(v => v.value).toString(),
+          companyTypeIds: companyList.map(v => v.value).toString(),
           contacts: this.validateForm.value.contacts,
           mphone: this.validateForm.value.mphone,
           busiType: { key: 'company_busi_type', value: '2' },