浏览代码

三方公司

seimin 8 月之前
父节点
当前提交
ff305b77cf

+ 1 - 1
proxy.conf.json

@@ -1,6 +1,6 @@
1 1
 {
2 2
   "/service": {
3
-		"target": "http://192.168.3.108",
3
+		"target": "http://192.168.4.105",
4 4
     "logLevel": "debug",
5 5
     "changeOrigin": true,
6 6
     "pathRewrite": {

+ 1 - 0
src/app/views/medical-waste-batch-out-of-storage/medical-waste-batch-out-of-storage.component.ts

@@ -170,6 +170,7 @@ export class MedicalWasteBatchOutOfStorageComponent implements OnInit {
170 170
       company: {
171 171
         hosId: this.hosId,
172 172
         transType: dictionary,
173
+        busiType: { key: 'company_busi_type', value: '1' },
173 174
       },
174 175
     };
175 176
     this.mainService

+ 33 - 85
src/app/views/tripartite-company/tripartite-company.component.html

@@ -3,33 +3,20 @@
3 3
     <div class="list-template__top" nz-row>
4 4
       <div nz-col nzXl='16' class="list-template__searchBox">
5 5
         <div class="list-template__searchItem">
6
-          <span class="label">科室</span>:
7
-          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
8
-            (nzOnSearch)="changeInp('search', 'department', $event)" nzAllowClear nzPlaceHolder="请选择科室" [(ngModel)]="searchDto.deptId">
9
-            <ng-container *ngFor="let option of departmentSearchList">
10
-              <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
11
-            </ng-container>
12
-            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
13
-              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
14
-            </nz-option>
15
-          </nz-select>
6
+          <span class="label">公司名称</span>:
7
+          <input nz-input class="formItem" placeholder="请输入公司名称" [(ngModel)]="searchDto.name" />
16 8
         </div>
17 9
         <div class="list-template__searchItem">
18
-          <span class="label">楼栋</span>:
19
-          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
20
-            (nzOnSearch)="changeInp('search', 'building', $event)" nzAllowClear nzPlaceHolder="请选择楼栋" [(ngModel)]="searchDto.buildId">
21
-            <ng-container *ngFor="let option of buildingSearchList">
22
-              <nz-option *ngIf="!isLoading" [nzLabel]="option.buildingName" [nzValue]="option.id"></nz-option>
10
+          <span class="label">公司分类</span>:
11
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear nzPlaceHolder="请选择公司分类" [(ngModel)]="searchDto.companyTypeIds">
12
+            <ng-container *ngFor="let option of companyTypeList">
13
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.name" nzValue="{{option.id}}"></nz-option>
23 14
             </ng-container>
24 15
             <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
25 16
               <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
26 17
             </nz-option>
27 18
           </nz-select>
28 19
         </div>
29
-        <div class="list-template__searchItem">
30
-          <span class="label">名称</span>:
31
-          <input nz-input class="formItem" placeholder="请输入名称" [(ngModel)]="searchDto.name" />
32
-        </div>
33 20
       </div>
34 21
       <div nz-col nzLg="8" class="list-template__btns">
35 22
         <button nz-button class="btn default ml8" (click)='search()'>搜索</button>
@@ -53,12 +40,12 @@
53 40
         </thead>
54 41
         <tbody>
55 42
           <tr *ngFor="let data of listOfData;let i = index">
43
+            <td>{{data.code}}</td>
56 44
             <td>{{data.name}}</td>
57
-            <td>{{data.departmentDTO?.dept}}</td>
58
-            <td>{{data.buildingDTO?.buildingName}}</td>
59
-            <td>{{data.floorDTO?.floorName}}</td>
60
-            <td>{{data.tagIdsList|dataToName:'name':' '}}</td>
61
-            <td>{{data.signType?.name}}</td>
45
+            <td>{{data.nickName}}</td>
46
+            <td>{{data.companyTypeList | dataToName:'name':','}}</td>
47
+            <td>{{data.contacts}}</td>
48
+            <td>{{data.mphone}}</td>
62 49
             <td>
63 50
               <div class="coop">
64 51
                 <span *ngIf="coopBtns.edit" (click)="edit($event, data)">编辑</span>
@@ -79,81 +66,45 @@
79 66
   <!-- 新增/编辑模态框 -->
80 67
   <div class="save display_flex justify-content_flex-center align-items_center add" *ngIf="modal">
81 68
     <div class="modalBody">
82
-      <div class="title">{{modelName}}巡检点<i class="icon_transport transport-guanbi" (click)="hideAddModal()"></i></div>
69
+      <div class="title">{{modelName}}<i class="icon_transport transport-guanbi" (click)="hideAddModal()"></i></div>
83 70
       <div class="content">
84 71
         <form nz-form [formGroup]="validateForm" class="addForm">
85 72
           <nz-form-item>
86
-            <nz-form-label [nzSpan]="5" nzRequired nzFor="name">名&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;称</nz-form-label>
87
-            <nz-form-control [nzSpan]="19" nzErrorTip="请输入称!">
73
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="name">公司全称</nz-form-label>
74
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入公司全称!">
88 75
               <nz-input-group>
89
-                  <input formControlName="name" nz-input placeholder="请输入称">
76
+                  <input formControlName="name" nz-input placeholder="请输入公司全称">
90 77
               </nz-input-group>
91 78
             </nz-form-control>
92 79
           </nz-form-item>
93 80
           <nz-form-item>
94
-            <nz-form-label [nzSpan]="5" nzRequired nzFor="deptId">关联科室</nz-form-label>
95
-            <nz-form-control [nzSpan]="19" nzErrorTip="请选择关联科室!">
96
-              <nz-select (nzOnSearch)="changeInp('add', 'department', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="deptId" nzPlaceHolder="请选择关联科室" (ngModelChange)="changeDepartment($event)" [nzDisabled]="!add" (nzOpenChange)="changeInp('add', 'department', '')">
97
-                <ng-container *ngFor="let option of departmentAddList">
98
-                  <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
99
-                </ng-container>
100
-                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
101
-                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
102
-                </nz-option>
103
-              </nz-select>
104
-            </nz-form-control>
105
-          </nz-form-item>
106
-          <nz-form-item>
107
-            <nz-form-label [nzSpan]="5" nzRequired nzFor="buildId">楼&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;栋</nz-form-label>
108
-            <nz-form-control [nzSpan]="19" nzErrorTip="请选择楼栋!">
109
-              <nz-select (nzOnSearch)="changeInp('add', 'building', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="buildId" nzPlaceHolder="请选择楼栋" (ngModelChange)="changeBuilding($event)">
110
-                <ng-container *ngFor="let option of buildingAddList">
111
-                  <nz-option *ngIf="!isLoading" [nzLabel]="option.buildingName" [nzValue]="option.id"></nz-option>
112
-                </ng-container>
113
-                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
114
-                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
115
-                </nz-option>
116
-              </nz-select>
81
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="nickName">公司简称</nz-form-label>
82
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入公司简称!">
83
+              <nz-input-group>
84
+                  <input formControlName="nickName" nz-input placeholder="请输入公司简称">
85
+              </nz-input-group>
117 86
             </nz-form-control>
118 87
           </nz-form-item>
119 88
           <nz-form-item>
120
-            <nz-form-label [nzSpan]="5" nzRequired nzFor="floorId">楼&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;层</nz-form-label>
121
-            <nz-form-control [nzSpan]="19" nzErrorTip="请选择楼层!">
122
-              <nz-select (nzOnSearch)="changeInp('add', 'floor', $event)" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear formControlName="floorId" nzPlaceHolder="请选择楼层">
123
-                <ng-container *ngFor="let option of floorList">
124
-                  <nz-option *ngIf="!isLoading" [nzLabel]="option.floorName" [nzValue]="option.id"></nz-option>
125
-                </ng-container>
126
-                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
127
-                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
128
-                </nz-option>
129
-              </nz-select>
89
+            <nz-form-label [nzSpan]="5" nzRequired nzFor="companyTypeIds">公司分类</nz-form-label>
90
+            <nz-form-control [nzSpan]="19" nzErrorTip="请选择公司分类!">
91
+              <nz-checkbox-group formControlName="companyTypeIds"></nz-checkbox-group>
130 92
             </nz-form-control>
131 93
           </nz-form-item>
132 94
           <nz-form-item>
133
-            <nz-form-label [nzSpan]="5" nzRequired nzFor="tagIds">标&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;签</nz-form-label>
134
-            <nz-form-control [nzSpan]="19" nzErrorTip="请选择标签!">
135
-              <nz-select (ngModelChange)="changeTags($event)" nzMode="tags" nzAllowClear formControlName="tagIds" nzPlaceHolder="请选择标签">
136
-                <ng-container *ngFor="let option of tagList">
137
-                  <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.name"></nz-option>
138
-                </ng-container>
139
-                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
140
-                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
141
-                </nz-option>
142
-              </nz-select>
95
+            <nz-form-label [nzSpan]="5" nzFor="contacts">联&nbsp;系&nbsp;人</nz-form-label>
96
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入联系人!">
97
+              <nz-input-group>
98
+                  <input formControlName="contacts" nz-input placeholder="请输入联系人">
99
+              </nz-input-group>
143 100
             </nz-form-control>
144 101
           </nz-form-item>
145 102
           <nz-form-item>
146
-            <nz-form-label [nzSpan]="5" nzRequired nzFor="signType">签到模式</nz-form-label>
147
-            <nz-form-control [nzSpan]="19" nzErrorTip="请选择签到模式!">
148
-              <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="signType" nzShowSearch
149
-                nzPlaceHolder="请选择签到模式" nzServerSearch>
150
-                <ng-container *ngFor="let data of dispatchMethods">
151
-                  <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.value"></nz-option>
152
-                </ng-container>
153
-                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
154
-                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
155
-                </nz-option>
156
-              </nz-select>
103
+            <nz-form-label [nzSpan]="5" nzFor="mphone">联系电话</nz-form-label>
104
+            <nz-form-control [nzSpan]="19" nzErrorTip="请输入联系电话!">
105
+              <nz-input-group>
106
+                  <input formControlName="mphone" nz-input placeholder="请输入联系电话">
107
+              </nz-input-group>
157 108
             </nz-form-control>
158 109
           </nz-form-item>
159 110
         </form>
@@ -172,6 +123,3 @@
172 123
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
173 124
   [info]="promptInfo">
174 125
 </app-prompt-modal>
175
-
176
-<!-- 遮罩 -->
177
-<app-mask *ngIf="maskFlag"></app-mask>

+ 29 - 277
src/app/views/tripartite-company/tripartite-company.component.ts

@@ -1,12 +1,10 @@
1 1
 import { Component, OnInit } from "@angular/core";
2
-import { ActivatedRoute, Router } from "@angular/router";
2
+import { ActivatedRoute } from "@angular/router";
3 3
 import { FormBuilder, Validators, FormGroup } from "@angular/forms";
4 4
 
5 5
 import { MainService } from "../../services/main.service";
6 6
 import { ToolService } from "../../services/tool.service";
7 7
 import { NzMessageService } from 'ng-zorro-antd';
8
-import { Subject } from 'rxjs';
9
-import { debounceTime } from 'rxjs/operators';
10 8
 @Component({
11 9
   selector: "app-tripartite-company",
12 10
   templateUrl: "./tripartite-company.component.html",
@@ -17,7 +15,6 @@ export class TripartiteCompanyComponent implements OnInit {
17 15
     private fb: FormBuilder,
18 16
     private mainService: MainService,
19 17
     private route: ActivatedRoute,
20
-    private router: Router,
21 18
     private tool: ToolService,
22 19
     private message: NzMessageService,
23 20
   ) {}
@@ -41,29 +38,13 @@ export class TripartiteCompanyComponent implements OnInit {
41 38
   nextSchemeName = ""; //下一个开启的方案名称
42 39
   modelName = ""; //模态框名称
43 40
 
44
-  changeInpSubject = new Subject(); //防抖
45 41
   showDropdown:boolean = false;
46 42
 
47 43
   ngOnInit() {
48
-    //防抖
49
-    this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
50
-      if(v[1] === 'department'){
51
-        this.getDeparts(v[0], v[2]);
52
-      } else if(v[1] === 'building'){
53
-        this.getBuildings(v[0], v[2]);
54
-      } else if(v[1] === 'floor'){
55
-        this.getFloors(v[0], v[2], this.validateForm.value.buildId);
56
-      }
57
-    });
58 44
     this.currentHospital = this.tool.getCurrentHospital();
59 45
     this.coopBtns = this.tool.initCoopBtns(this.route);
60 46
     this.getList(1);
61
-    this.getDeparts('search', '');
62
-    this.getDeparts('add', '');
63
-    this.getTags('add', '');
64
-    this.getBuildings('add', '');
65
-    this.getBuildings('search', '');
66
-    this.getDispatchMethods();
47
+    this.getCompanyType();
67 48
   }
68 49
 
69 50
   // 初始化增删改按钮
@@ -91,6 +72,7 @@ export class TripartiteCompanyComponent implements OnInit {
91 72
       sum: this.pageSize,
92 73
       company: {
93 74
         hosId: this.currentHospital.id,
75
+        busiType: { key: 'company_busi_type', value: '2' },
94 76
         ...this.searchDto,
95 77
       },
96 78
     };
@@ -123,245 +105,23 @@ export class TripartiteCompanyComponent implements OnInit {
123 105
 
124 106
   // 初始化新增form表单
125 107
   initForm() {
126
-    this.floorList = [];
127 108
     this.validateForm = this.fb.group({
128 109
       name: ['', [Validators.required, Validators.pattern(/\S/)]],
129
-      deptId: [null, [Validators.required]],
130
-      buildId: [null, [Validators.required]],
131
-      floorId: [null, [Validators.required]],
132
-      tagIds: [[], [Validators.required]],
133
-      signType: [null, [Validators.required]],
110
+      nickName: ['', [Validators.required]],
111
+      companyTypeIds: [this.companyTypeList.map(v => ({ label: v.name, value: v.id, checked: false })), [Validators.required]],
112
+      contacts: [''],
113
+      mphone: [''],
134 114
     });
135 115
   }
136 116
 
137
-  // 边输边搜节流阀
138
-  isLoading = false;
139
-  changeInp(type, model, e) {
117
+  //获取公司分类
118
+  isLoading:boolean = false;
119
+  companyTypeList:any[] = [];
120
+  getCompanyType() {
140 121
     this.isLoading = true;
141
-    this.changeInpSubject.next([type, model, e]);
142
-  }
143
-
144
-  // 获取所有科室
145
-  departmentAddList: any = []; //所有所属科室
146
-  departmentSearchList: any = []; //所有所属科室(搜索)
147
-  getDeparts(type, keyword, init = false) {
148
-    let postData:any = {
149
-      department: {
150
-        // searchType: 1,// 简单查询
151
-        dept: keyword,
152
-        cascadeHosId: this.currentHospital.id,
153
-      },
154
-      idx: 0,
155
-      sum: 20,
156
-    };
157
-    if(type === 'add'){
158
-      postData.department.bussType = 'inspection';
159
-    }
160
-    this.mainService
161
-      .getFetchDataList("data", "department", postData)
162
-      .subscribe((data) => {
163
-        if (type == "search") {
164
-          this.departmentSearchList = data.list;
165
-        } else if (type == "add") {
166
-          this.departmentAddList = data.list;
167
-        }
168
-
169
-        this.isLoading = false;
170
-
171
-        if(init && this.coopData && this.coopData.departmentDTO){
172
-          let deptId = this.coopData.departmentDTO.id;
173
-          let flag = this.departmentAddList.some(v => v.id == deptId);
174
-          if(!flag){
175
-            this.departmentAddList.unshift(this.coopData.departmentDTO)
176
-          }
177
-          this.validateForm.controls.deptId.setValue(this.coopData.departmentDTO.id);
178
-        }
179
-      });
180
-  }
181
-
182
-  // 获取标签
183
-  tagList: any = [];
184
-  tagListCopy: any = [];
185
-  getTags(type, keyword) {
186
-    let postData = {
187
-      tag: {
188
-        hosId: this.currentHospital.id,
189
-        modelType: { value: 'inspection' },
190
-      },
191
-      idx: 0,
192
-      sum: 50,
193
-    };
194
-    this.mainService
195
-      .getFetchDataList("simple/data", "tag", postData)
196
-      .subscribe((data) => {
197
-        this.tagList = data.list;
198
-        this.tagListCopy = JSON.parse(JSON.stringify(this.tagList));
199
-        this.isLoading = false;
200
-      });
201
-  }
202
-
203
-  // 获取楼栋
204
-  buildingAddList: any = [];
205
-  buildingSearchList: any = [];
206
-  getBuildings(type, keyword, init = false) {
207
-    let postData = {
208
-      building: {
209
-        simpleQuery: true,
210
-        buildingName: keyword,
211
-        cascadeHosId: this.currentHospital.id,
212
-      },
213
-      idx: 0,
214
-      sum: 20,
215
-    };
216
-    this.mainService
217
-      .getFetchDataList("simple/data", "building", postData)
218
-      .subscribe((data) => {
219
-        if (type == "search") {
220
-          this.buildingSearchList = data.list;
221
-        } else if (type == "add") {
222
-          this.buildingAddList = data.list;
223
-        }
224
-        this.isLoading = false;
225
-
226
-        if(init && this.coopData && this.coopData.buildingDTO){
227
-          let buildId = this.coopData.buildingDTO.id;
228
-          let flag = this.buildingAddList.some(v => v.id == buildId);
229
-          if(!flag){
230
-            this.buildingAddList.unshift(this.coopData.buildingDTO)
231
-          }
232
-          this.validateForm.controls.buildId.setValue(this.coopData.buildingDTO.id);
233
-        } else if (this.deptDto && this.deptDto.building){
234
-          let buildId = this.deptDto.building.id;
235
-          let flag = this.buildingAddList.some(v => v.id == buildId);
236
-          if(!flag){
237
-            this.buildingAddList.unshift(this.deptDto.building)
238
-          }
239
-          this.validateForm.controls.buildId.setValue(this.deptDto.building.id);
240
-        }
241
-      });
242
-  }
243
-
244
-  // 修改关联科室
245
-  deptDto:any = null;
246
-  changeDepartment(deptId){
247
-    if(this.add){
248
-      console.log(deptId)
249
-      this.deptDto = this.departmentAddList.find(v => v.id == deptId);
250
-      console.log(this.deptDto);
251
-      if(this.deptDto && this.deptDto.dept && !this.validateForm.value.name){
252
-        this.validateForm.controls.name.setValue(this.deptDto.dept);
253
-      }
254
-
255
-      if(this.deptDto && this.deptDto.building){
256
-        this.getBuildings('add', '');
257
-      }
258
-
259
-      if(this.deptDto && this.deptDto.floor){
260
-        this.noChangeBuilding = true;
261
-        this.getFloors('add', '', this.deptDto.building.id, false, true);
262
-      }
263
-    }
264
-  }
265
-
266
-  // 修改楼栋
267
-  noChangeBuilding:boolean = false;
268
-  changeBuilding(buildId?){
269
-    console.log(buildId)
270
-    if(!this.noChangeBuilding){
271
-      this.validateForm.controls.floorId.setValue(null);
272
-      this.getFloors('add', '', this.validateForm.value.buildId);
273
-    }
274
-    this.noChangeBuilding = false;
275
-  }
276
-
277
-  // 获取楼层
278
-  floorList: any = [];
279
-  getFloors(type, keyword, buildId, init = false, isNoChangeBuilding = false) {
280
-    console.log(isNoChangeBuilding)
281
-    if(!buildId){
282
-      this.floorList = [];
283
-      return;
284
-    }
285
-    let postData = {
286
-      floor: {
287
-        floorName: keyword,
288
-        buildId,
289
-        // hosId: this.currentHospital.id,
290
-      },
291
-      idx: 0,
292
-      sum: 20,
293
-    };
294
-    this.mainService
295
-      .getFetchDataList("simple/data", "floor", postData)
296
-      .subscribe((data) => {
297
-        this.floorList = data.list;
298
-        this.isLoading = false;
299
-
300
-        if(init && this.coopData && this.coopData.floorDTO){
301
-          let floorId = this.coopData.floorDTO.id;
302
-          let flag = this.floorList.some(v => v.id == floorId);
303
-          if(!flag){
304
-            this.floorList.unshift(this.coopData.floorDTO)
305
-          }
306
-          this.validateForm.controls.floorId.setValue(this.coopData.floorDTO.id);
307
-        } else if (isNoChangeBuilding && this.deptDto && this.deptDto.floor){
308
-          let floorId = this.deptDto.floor.id;
309
-          let flag = this.floorList.some(v => v.id == floorId);
310
-          if(!flag){
311
-            this.floorList.unshift(this.deptDto.floor)
312
-          }
313
-          this.validateForm.controls.floorId.setValue(this.deptDto.floor.id);
314
-        }
315
-      });
316
-  }
317
-
318
-  // 选择标签
319
-  changeTags(tags){
320
-    if(tags.length){
321
-      let flag = tags.every(v => {
322
-        return this.tagListCopy.map(vv => vv.name).includes(v);
323
-      })
324
-
325
-      if(flag){
326
-        return;
327
-      }
328
-
329
-      let tagName = tags[tags.length - 1];
330
-      let postData = {
331
-        tag: {
332
-          name: tagName,
333
-          hosId: this.currentHospital.id,
334
-          modelType: { value: 'inspection' },
335
-        }
336
-      }
337
-      this.isLoading = true;
338
-      this.mainService
339
-      .coopData("addData", "tag", postData)
340
-      .subscribe((result) => {
341
-        this.isLoading = false;
342
-        console.log(result);
343
-        if(result.status == 200){
344
-          this.tagListCopy.unshift(result.data)
345
-          console.log(this.tagListCopy);
346
-        } else if (result.status == 10001){
347
-          // 名称重复
348
-          this.tagListCopy.unshift(result.data)
349
-          console.log(this.tagListCopy);
350
-        } else {
351
-          tags.pop();
352
-          this.message.warning(result.msg || '请求数据失败')
353
-        }
354
-      });
355
-    }
356
-  }
357
-
358
-  //获取填写方式
359
-  dispatchMethods:any[] = [];
360
-  getDispatchMethods() {
361
-    this.isLoading = true;
362
-    this.mainService.getDictionary("list", "inspection_node_sign_type").subscribe((data) => {
122
+    this.mainService.getDictionary("list", "company_type").subscribe((data) => {
363 123
       this.isLoading = false;
364
-      this.dispatchMethods = data || [];
124
+      this.companyTypeList = data || [];
365 125
     });
366 126
   }
367 127
 
@@ -376,28 +136,20 @@ export class TripartiteCompanyComponent implements OnInit {
376 136
     }
377 137
 
378 138
     console.log(this.validateForm.value)
379
-    console.log(this.tagListCopy);
380 139
 
381 140
     this.btnLoading = true;
382 141
     let postData:any = {};
383 142
 
384
-    let tagNames = this.validateForm.value.tagIds;
385
-    let tags = this.tagListCopy;
386
-    let tagIds = tagNames.map(name =>{
387
-      return tags.find(v => v.name === name).id;
388
-    })
389
-
390 143
     if (this.add) {
391 144
       //增加
392 145
       postData = {
393 146
         company: {
394 147
           name: this.validateForm.value.name,
395
-          deptId: this.validateForm.value.deptId,
396
-          buildId: this.validateForm.value.buildId,
397
-          floorId: this.validateForm.value.floorId,
398
-          tagIds: tagIds.toString(),
399
-          signType: this.dispatchMethods.find(v => v.value === this.validateForm.value.signType),
400
-          hosId: this.currentHospital.id,
148
+          nickName: this.validateForm.value.nickName,
149
+          companyTypeIds: this.validateForm.value.companyTypeIds.filter(v => v.checked).map(v => v.value).toString(),
150
+          contacts: this.validateForm.value.contacts,
151
+          mphone: this.validateForm.value.mphone,
152
+          busiType: { key: 'company_busi_type', value: '2' },
401 153
         }
402 154
       };
403 155
     } else {
@@ -407,15 +159,16 @@ export class TripartiteCompanyComponent implements OnInit {
407 159
           ...this.coopData,
408 160
           ...{
409 161
             name: this.validateForm.value.name,
410
-            deptId: this.validateForm.value.deptId,
411
-            buildId: this.validateForm.value.buildId,
412
-            floorId: this.validateForm.value.floorId,
413
-            tagIds: tagIds.toString(),
414
-            signType: this.dispatchMethods.find(v => v.value === this.validateForm.value.signType),
162
+            nickName: this.validateForm.value.nickName,
163
+            companyTypeIds: this.validateForm.value.companyTypeIds.filter(v => v.checked).map(v => v.value).toString(),
164
+            contacts: this.validateForm.value.contacts,
165
+            mphone: this.validateForm.value.mphone,
166
+            busiType: { key: 'company_busi_type', value: '2' },
415 167
           }
416 168
         }
417 169
       };
418 170
     }
171
+    console.log(postData);
419 172
     this.mainService
420 173
       .coopData("addData", "company", postData)
421 174
       .subscribe((result) => {
@@ -429,8 +182,6 @@ export class TripartiteCompanyComponent implements OnInit {
429 182
         }
430 183
         if (result.status == 200) {
431 184
           this.showPromptModal(msg, true, "");
432
-        } else if (result.status == 10001) {
433
-          this.showPromptModal(msg, false, "关联科室重复");
434 185
         } else {
435 186
           this.showPromptModal(msg, false, result.msg);
436 187
         }
@@ -446,10 +197,11 @@ export class TripartiteCompanyComponent implements OnInit {
446 197
     this.add = false;
447 198
     this.modal = true;
448 199
     this.coopData = data;
449
-    this.validateForm.controls.name.setValue(data.name); //名称
450
-    this.validateForm.controls.deptId.setValue(data.deptId);
451
-    this.validateForm.controls.tagIds.setValue(data.tagIdsList.map(v => v.name));
452
-    this.validateForm.controls.signType.setValue(data.signType.value);
200
+    this.validateForm.controls.name.setValue(data.name);
201
+    this.validateForm.controls.nickName.setValue(data.nickName);
202
+    this.validateForm.controls.companyTypeIds.setValue(this.companyTypeList.map(v => ({label: v.name, value: v.id, checked: data.companyTypeIds.includes(v.id)})));
203
+    this.validateForm.controls.contacts.setValue(data.contacts);
204
+    this.validateForm.controls.mphone.setValue(data.mphone);
453 205
 
454 206
     if(data.deptId){
455 207
       this.getDeparts('add', '', true);

+ 21 - 17
src/app/views/unit-management/unit-management.component.ts

@@ -63,6 +63,7 @@ export class UnitManagementComponent implements OnInit {
63 63
       sum: this.pageSize,
64 64
       company: {
65 65
         hosId: this.hosId,
66
+        busiType: { key: 'company_busi_type', value: '1' },
66 67
       },
67 68
     };
68 69
     this.loading1 = true;
@@ -185,37 +186,40 @@ export class UnitManagementComponent implements OnInit {
185 186
     }
186 187
     if (that.validateForm.invalid) return;
187 188
     that.btnLoading = true;
188
-    let data:any = {
189
-      name: that.validateForm.value.name,
190
-      transType: { id: that.validateForm.value.transType },
191
-      contacts: that.validateForm.value.contacts,
192
-      mphone: that.validateForm.value.mphone,
193
-      businessCode: that.validateForm.value.businessCode,
194
-      address: that.validateForm.value.address,
195
-      hosId: that.hosId,
196
-      laborers: [],
197
-      carNo: "",
189
+    let postData:any = {
190
+      company:{
191
+        name: that.validateForm.value.name,
192
+        transType: { id: that.validateForm.value.transType },
193
+        contacts: that.validateForm.value.contacts,
194
+        mphone: that.validateForm.value.mphone,
195
+        businessCode: that.validateForm.value.businessCode,
196
+        address: that.validateForm.value.address,
197
+        hosId: that.hosId,
198
+        laborers: [],
199
+        carNo: "",
200
+        busiType: { key: 'company_busi_type', value: '1' },
201
+      }
198 202
     };
199 203
     // 司机信息
200 204
     if(that.validateForm.value.laborerName0 && that.validateForm.value.laborerPhone0){
201
-      data.laborers = [{name: that.validateForm.value.laborerName0, mphone: that.validateForm.value.laborerPhone0}];
205
+      postData.company.laborers = [{name: that.validateForm.value.laborerName0, mphone: that.validateForm.value.laborerPhone0}];
202 206
       this.laborers.forEach(v => {
203
-        data.laborers.push({name: that.validateForm.value[v[0].name], mphone: that.validateForm.value[v[1].name]})
207
+        postData.company.laborers.push({name: that.validateForm.value[v[0].name], mphone: that.validateForm.value[v[1].name]})
204 208
       })
205 209
     }
206 210
     // 车牌号信息
207 211
     if(that.validateForm.value.carNo0){
208
-      data.carNo = that.validateForm.value.carNo0;
212
+      postData.company.carNo = that.validateForm.value.carNo0;
209 213
       this.carNos.forEach(v => {
210
-        data.carNo += "," + that.validateForm.value[v.name];
214
+        postData.company.carNo += "," + that.validateForm.value[v.name];
211 215
       })
212 216
     }
213 217
     if (!that.add) {
214
-      data = {...this.coopData, ...data};
218
+      postData.company = {...this.coopData, ...postData.company};
215 219
     }
216
-    console.log(data);
220
+    console.log(postData);
217 221
     that.mainService
218
-      .simplePost("addData", "company", data)
222
+      .coopData("addData", "company", postData)
219 223
       .subscribe((data) => {
220 224
         that.btnLoading = false;
221 225
         that.hideModal();