Browse Source

文字修改,增加电话号码的展示

seimin 3 years ago
parent
commit
e7676499d7

+ 8 - 5
src/app/views/fuwutai/fuwutai.component.html

@@ -26,7 +26,7 @@
26
           <div [ngClass]="{'cot':true,'fourCol':patientCareCol==4,'sevenCol':patientCareCol==7}"
26
           <div [ngClass]="{'cot':true,'fourCol':patientCareCol==4,'sevenCol':patientCareCol==7}"
27
             *ngFor="let data of workerMessage">
27
             *ngFor="let data of workerMessage">
28
             <div class="first">
28
             <div class="first">
29
-              <span>{{data.name}}</span>
29
+              <span nz-tooltip [nzTooltipTitle]="data.name">{{data.name}}</span>
30
               <span>累计{{data.totalCount}}单</span>
30
               <span>累计{{data.totalCount}}单</span>
31
               <span class="times imptime"
31
               <span class="times imptime"
32
                 *ngIf="data.freetime === '今日还未接单'||data.freetime === null">{{data.freetime}}</span>
32
                 *ngIf="data.freetime === '今日还未接单'||data.freetime === null">{{data.freetime}}</span>
@@ -43,7 +43,7 @@
43
         <div id="cotAll" nz-row *ngIf="patientCareCol==6">
43
         <div id="cotAll" nz-row *ngIf="patientCareCol==6">
44
           <div nz-col nzSpan="4" class="cot col-6" *ngFor="let data of workerMessage">
44
           <div nz-col nzSpan="4" class="cot col-6" *ngFor="let data of workerMessage">
45
             <div class="first">
45
             <div class="first">
46
-              <span>{{data.name}}</span>
46
+              <span nz-tooltip [nzTooltipTitle]="data.name">{{data.name}}</span>
47
               <span class="times imptime"
47
               <span class="times imptime"
48
                 *ngIf="data.freetime === '今日还未接单'||data.freetime === null">{{data.freetime}}</span>
48
                 *ngIf="data.freetime === '今日还未接单'||data.freetime === null">{{data.freetime}}</span>
49
               <span class="times imptime imptime-green"
49
               <span class="times imptime imptime-green"
@@ -110,7 +110,8 @@
110
                   <span class="left gongdan_name" nz-tooltip
110
                   <span class="left gongdan_name" nz-tooltip
111
                     [nzTooltipTitle]="data.taskType.taskName+'('+data.gdcode+')'">{{data.taskType.isHalfInspect ===
111
                     [nzTooltipTitle]="data.taskType.taskName+'('+data.gdcode+')'">{{data.taskType.isHalfInspect ===
112
                     1?'半程陪检':data.taskType.taskName}}({{data.gdcode}})</span>
112
                     1?'半程陪检':data.taskType.taskName}}({{data.gdcode}})</span>
113
-                  <span>{{data.worker?data.worker.name:''}}</span>
113
+                  <span nz-tooltip
114
+                    [nzTooltipTitle]="data.worker?data.worker.phone:''">{{data.worker?data.worker.name:''}}</span>
114
                   <span class="right">
115
                   <span class="right">
115
                     <span [ngClass]="{'colorRed':data.timeOut==true}">{{data.gdState.name}}</span>
116
                     <span [ngClass]="{'colorRed':data.timeOut==true}">{{data.gdState.name}}</span>
116
                   </span>
117
                   </span>
@@ -276,7 +277,8 @@
276
                   <span class="left gongdan_name" nz-tooltip
277
                   <span class="left gongdan_name" nz-tooltip
277
                     [nzTooltipTitle]="data.taskType.taskName+'('+data.gdcode+')'">{{data.taskType.isHalfInspect ===
278
                     [nzTooltipTitle]="data.taskType.taskName+'('+data.gdcode+')'">{{data.taskType.isHalfInspect ===
278
                     1?'半程陪检':data.taskType.taskName}}({{data.gdcode}})</span>
279
                     1?'半程陪检':data.taskType.taskName}}({{data.gdcode}})</span>
279
-                  <span>{{data.worker?data.worker.name:''}}</span>
280
+                  <span nz-tooltip
281
+                    [nzTooltipTitle]="data.worker?data.worker.phone:''">{{data.worker?data.worker.name:''}}</span>
280
                   <span class="right">
282
                   <span class="right">
281
                     <span [ngClass]="{'colorRed':data.timeOut==true}">{{data.gdState.name}}</span>
283
                     <span [ngClass]="{'colorRed':data.timeOut==true}">{{data.gdState.name}}</span>
282
                   </span>
284
                   </span>
@@ -440,7 +442,8 @@
440
                   <span class="left gongdan_name" nz-tooltip
442
                   <span class="left gongdan_name" nz-tooltip
441
                     [nzTooltipTitle]="data.taskType.taskName+'('+data.gdcode+')'">{{data.taskType.isHalfInspect ===
443
                     [nzTooltipTitle]="data.taskType.taskName+'('+data.gdcode+')'">{{data.taskType.isHalfInspect ===
442
                     1?'半程陪检':data.taskType.taskName}}({{data.gdcode}})</span>
444
                     1?'半程陪检':data.taskType.taskName}}({{data.gdcode}})</span>
443
-                  <span>{{data.worker?data.worker.name:''}}</span>
445
+                  <span nz-tooltip
446
+                    [nzTooltipTitle]="data.worker?data.worker.phone:''">{{data.worker?data.worker.name:''}}</span>
444
                   <span class="right">
447
                   <span class="right">
445
                     <span [ngClass]="{'colorRed':data.timeOut==true}">{{data.gdState.name}}</span>
448
                     <span [ngClass]="{'colorRed':data.timeOut==true}">{{data.gdState.name}}</span>
446
                   </span>
449
                   </span>

+ 3 - 3
src/app/views/fuwutai/fuwutai.component.ts

@@ -816,7 +816,7 @@ export class FuwutaiComponent implements OnInit {
816
         this.orderRefreshTime = this.orderInfoTime;
816
         this.orderRefreshTime = this.orderInfoTime;
817
       }
817
       }
818
       if (this.workerRefreshTime == 0) {
818
       if (this.workerRefreshTime == 0) {
819
-        this.checkTab(-1);
819
+        this.checkTab(this.typeId);
820
         this.workerRefreshTime = this.workerInfoTime;
820
         this.workerRefreshTime = this.workerInfoTime;
821
       }
821
       }
822
     }, 1000);
822
     }, 1000);
@@ -2200,7 +2200,7 @@ export class FuwutaiComponent implements OnInit {
2200
           that.initOrderScope();
2200
           that.initOrderScope();
2201
           that.getOrderScope();
2201
           that.getOrderScope();
2202
           that.initControlView();
2202
           that.initControlView();
2203
-          that.checkTab(-1);
2203
+          that.checkTab(this.typeId);
2204
         } else {
2204
         } else {
2205
           that.showPromptModal("保存", false, data.msg);
2205
           that.showPromptModal("保存", false, data.msg);
2206
         }
2206
         }
@@ -2273,7 +2273,7 @@ export class FuwutaiComponent implements OnInit {
2273
     that.getOrderList(3);
2273
     that.getOrderList(3);
2274
     that.getOrderScope();
2274
     that.getOrderScope();
2275
     that.initControlView();
2275
     that.initControlView();
2276
-    that.checkTab(-1);
2276
+    that.checkTab(this.typeId);
2277
     that.msg.success("修改成功!", {
2277
     that.msg.success("修改成功!", {
2278
       nzDuration: 1000,
2278
       nzDuration: 1000,
2279
     });
2279
     });

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

@@ -271,7 +271,7 @@
271
                 <div class="tab borderB" nz-row>
271
                 <div class="tab borderB" nz-row>
272
                   <div nz-col nzSpan="6"
272
                   <div nz-col nzSpan="6"
273
                     [ngClass]="{'txtC':true,'cur':true, 'borderR':true,'checked':checkedTableType=='other'}"
273
                     [ngClass]="{'txtC':true,'cur':true, 'borderR':true,'checked':checkedTableType=='other'}"
274
-                    (click)="checkTable('other')">综合日志</div>
274
+                    (click)="checkTable('other')">其他任务建单</div>
275
                   <div nz-col nzSpan="6"
275
                   <div nz-col nzSpan="6"
276
                     [ngClass]="{'txtC':true,'cur':true, 'borderR':true,'checked':checkedTableType=='advice'}"
276
                     [ngClass]="{'txtC':true,'cur':true, 'borderR':true,'checked':checkedTableType=='advice'}"
277
                     (click)="checkTable('advice')">意见箱</div>
277
                     (click)="checkTable('advice')">意见箱</div>
@@ -284,7 +284,7 @@
284
                   </div>
284
                   </div>
285
                 </div>
285
                 </div>
286
               </div>
286
               </div>
287
-              <!-- 综合日志 -->
287
+              <!-- 其他任务建单 -->
288
               <div *ngIf="checkedTableType=='other'" style="flex: 1;height: 100%;position: relative;">
288
               <div *ngIf="checkedTableType=='other'" style="flex: 1;height: 100%;position: relative;">
289
                 <div class="otherBox">
289
                 <div class="otherBox">
290
                   <div class="otherBoxInner">
290
                   <div class="otherBoxInner">