seimin 1 年之前
父節點
當前提交
adf5cc185f

+ 1 - 1
proxy.conf.json

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

+ 2 - 2
src/app/share/businessData-detail-modal/businessData-detail-modal.component.html

@@ -46,8 +46,8 @@
46
               </div>
46
               </div>
47
               <div class="list-template__searchItem">
47
               <div class="list-template__searchItem">
48
                 <span class="label">检验项目</span>:
48
                 <span class="label">检验项目</span>:
49
-                <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch
50
-                  nzPlaceHolder="请选择检验项目" [(ngModel)]="searchCriteria.specimenDesc" (ngModelChange)="selectStype($event)">
49
+                <nz-select style="width: 210px;" class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch
50
+                  nzPlaceHolder="请选择检验项目" [(ngModel)]="searchCriteria.specimenDesc" (ngModelChange)="selectDesc($event)">
51
                   <nz-option *ngFor="let option of specimenDescList" [nzLabel]="option.nameNum" [nzValue]="option.id"></nz-option>
51
                   <nz-option *ngFor="let option of specimenDescList" [nzLabel]="option.nameNum" [nzValue]="option.id"></nz-option>
52
                 </nz-select>
52
                 </nz-select>
53
               </div>
53
               </div>

+ 11 - 2
src/app/share/businessData-detail-modal/businessData-detail-modal.component.ts

@@ -61,7 +61,15 @@ export class BusinessDataDetailModalComponent implements OnInit {
61
   // 切换标本类型下拉框
61
   // 切换标本类型下拉框
62
   selectStype(e){
62
   selectStype(e){
63
     console.log(e);
63
     console.log(e);
64
-    this.getSpecimen(1)
64
+    this.searchCriteria.specimenDesc = 0;
65
+    this.getSpecimenDesc();
66
+    this.getSpecimen(1);
67
+  }
68
+
69
+  // 切换标本类型下拉框
70
+  selectDesc(e){
71
+    console.log(e);
72
+    this.getSpecimen(1);
65
   }
73
   }
66
 
74
 
67
   // 分页获取数据
75
   // 分页获取数据
@@ -112,12 +120,13 @@ export class BusinessDataDetailModalComponent implements OnInit {
112
     let postData = {
120
     let postData = {
113
       "hosId": this.hosId,
121
       "hosId": this.hosId,
114
       "gdId": this.orderId,
122
       "gdId": this.orderId,
123
+      "stype": this.searchCriteria.stype || undefined,
115
     };
124
     };
116
     this.mainService.specimenCount(postData).subscribe((data:any) => {
125
     this.mainService.specimenCount(postData).subscribe((data:any) => {
117
       data.data = data.data || [];
126
       data.data = data.data || [];
118
       let specimenDescList:any = [{ id: 0, name: '全部', nameNum: '全部' }];
127
       let specimenDescList:any = [{ id: 0, name: '全部', nameNum: '全部' }];
119
       specimenDescList[0].nameNum = `全部(${data.total})`;
128
       specimenDescList[0].nameNum = `全部(${data.total})`;
120
-      this.specimenDescList = specimenDescList.concat( data.data.map(v => ({id: --this.id, name: v[0] || '', nameNum: (v[0] || '') + `(${v[1]})`})));
129
+      this.specimenDescList = specimenDescList.concat( data.data.map(v => ({id: --this.id, name: v[0] || '', nameNum: (v[0] ? v[0].slice(0, 15) + (v[0].length >= 15 ? '...' : '') : '') + `(${v[1]})`})));
121
     })
130
     })
122
   }
131
   }
123
 
132