瀏覽代碼

护士端其他临床服务工号开启时必填

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

+ 3 - 3
src/app/views/hushijiandan/hushijiandan.component.html

@@ -1309,10 +1309,10 @@
1309
                                       style="width: 100%; margin: 10px auto 0"
1309
                                       style="width: 100%; margin: 10px auto 0"
1310
                                       *ngIf="buildMsg.reserveUserSwitch == 1"
1310
                                       *ngIf="buildMsg.reserveUserSwitch == 1"
1311
                                     >
1311
                                     >
1312
-                                      <p>工号:</p>
1313
-                                      <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchAccount($event)" nzPlaceHolder="请选择" [(ngModel)]="account" (ngModelChange)="changeAccount($event)">
1312
+                                      <p><span class="red">*</span>工号:</p>
1313
+                                      <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchAccount($event)" nzPlaceHolder="请选择工号" [(ngModel)]="account" (ngModelChange)="changeAccount($event)">
1314
                                         <ng-container *ngFor="let option of accountList">
1314
                                         <ng-container *ngFor="let option of accountList">
1315
-                                          <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id">
1315
+                                          <nz-option *ngIf="!isLoading" [nzLabel]="option.account + '-' + option.name" [nzValue]="option.id">
1316
                                           </nz-option>
1316
                                           </nz-option>
1317
                                         </ng-container>
1317
                                         </ng-container>
1318
                                         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
1318
                                         <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>

+ 6 - 0
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -745,6 +745,7 @@ export class HushijiandanComponent implements OnInit {
745
     this.positionY = this.osComponentRef2.osInstance().scroll().position.y; //内容滚动的距离
745
     this.positionY = this.osComponentRef2.osInstance().scroll().position.y; //内容滚动的距离
746
     this.selectOtherId = item.id;
746
     this.selectOtherId = item.id;
747
     this.newShortcutOrder(item, "other");
747
     this.newShortcutOrder(item, "other");
748
+    this.account = null;
748
   }
749
   }
749
   selectIncidentId; //选中的id
750
   selectIncidentId; //选中的id
750
   incidentClick(item) {
751
   incidentClick(item) {
@@ -2733,6 +2734,11 @@ export class HushijiandanComponent implements OnInit {
2733
     let postData;
2734
     let postData;
2734
     that.buildType = "other";
2735
     that.buildType = "other";
2735
     if (that.buildType == "other") {
2736
     if (that.buildType == "other") {
2737
+      if(this.buildMsg.reserveUserSwitch == 1 && !this.userAccount){
2738
+        this.message.info('请选择工号!');
2739
+        this.loading5 = false;
2740
+        return;
2741
+      }
2736
       // 其他
2742
       // 其他
2737
       postData = {
2743
       postData = {
2738
         workOrder: {
2744
         workOrder: {