seimin 3 年之前
父節點
當前提交
3ad4c895b3

+ 1 - 1
proxy.conf.json

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

+ 4 - 2
src/app/views/task-type-management/task-type-management.component.html

@@ -600,7 +600,8 @@
600 600
           <input nz-input class="mb8 w100" [(ngModel)]="carryingCourses[indexs].name" placeholder="请选择科室名称" nzSize="" />
601 601
           <nz-form-label class="label" nzRequired>默认科室</nz-form-label>
602 602
           <nz-select class="mb8 w100" nzShowSearch nzAllowClear nzPlaceHolder="请选择默认科室"
603
-            [(ngModel)]="departmentStrategy.id" (ngModelChange)="depa(departmentStrategy,'clear')">
603
+            [(ngModel)]="departmentStrategy.id" (ngModelChange)="depa(departmentStrategy,'clear')"
604
+            [nzLoading]="yLoading">
604 605
             <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of departmentData"></nz-option>
605 606
           </nz-select>
606 607
           <div *ngIf="depaShow1">
@@ -645,7 +646,8 @@
645 646
           </div>
646 647
 
647 648
           <nz-form-label class="label" nzRequired>检验方式</nz-form-label>
648
-          <nz-select class="mb8 w100" nzShowSearch nzAllowClear nzPlaceHolder="请选择检验方式" [(ngModel)]="checkoutMethod.id">
649
+          <nz-select class="mb8 w100" nzShowSearch nzAllowClear nzPlaceHolder="请选择检验方式" [(ngModel)]="checkoutMethod.id"
650
+            [nzLoading]="yLoading">
649 651
             <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of checkoutData"></nz-option>
650 652
           </nz-select>
651 653
           <!-- 静配自动建单 -->

+ 8 - 0
src/app/views/task-type-management/task-type-management.component.ts

@@ -1552,6 +1552,8 @@ export class TaskTypeManagementComponent implements OnInit {
1552 1552
     });
1553 1553
   }
1554 1554
   //检验方式获取
1555
+  yNum = 0;
1556
+  yLoading = false;
1555 1557
   getcheckout() {
1556 1558
     var that = this;
1557 1559
     //静配type
@@ -1623,7 +1625,13 @@ export class TaskTypeManagementComponent implements OnInit {
1623 1625
     if (this.association.value == "other") {
1624 1626
       this.jyfsType = "other_method";
1625 1627
     }
1628
+    this.yNum++;
1629
+    this.yLoading = true;
1626 1630
     that.mainService.getDictionary("list", this.jyfsType).subscribe((data) => {
1631
+      this.yNum--;
1632
+      if(this.yNum === 0){
1633
+        this.yLoading = false;
1634
+      }
1627 1635
       this.checkoutData = data;
1628 1636
     });
1629 1637
   }