maotao il y a 1 mois
Parent
commit
f8ec30d4a0

+ 2 - 2
src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component.html

@@ -11,7 +11,7 @@
11 11
 			</div>
12 12
       <overlay-scrollbars #osComponentRef1 class="contentBody">
13 13
         <nz-spin nzSimple [nzSpinning]="categoryLoading1" class="mt8 text_align_center"></nz-spin>
14
-        <div [hidden]="categoryLoading1" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory1.id }" (click)="clickCategory(item, 1)" *ngFor="let item of categoryList1">{{ item.workName }}</div>
14
+        <div [hidden]="categoryLoading1" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory1.id }" (click)="clickCategory(item, 1)" *ngFor="let item of categoryList1">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral.value}}分</div>
15 15
       </overlay-scrollbars>
16 16
     </div>
17 17
     <div class="address">
@@ -24,7 +24,7 @@
24 24
 			</div>
25 25
       <overlay-scrollbars #osComponentRef2 class="contentBody">
26 26
         <nz-spin nzSimple [nzSpinning]="categoryLoading2" class="mt8 text_align_center"></nz-spin>
27
-        <div [hidden]="categoryLoading2" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory2.id }" (click)="clickCategory(item, 2)" *ngFor="let item of categoryList2">{{ item.workName }}</div>
27
+        <div [hidden]="categoryLoading2" class="contentItem" [title]="item.workName" [ngClass]="{ active: item.id === activeCategory2.id }" (click)="clickCategory(item, 2)" *ngFor="let item of categoryList2">{{ item.workName }} - {{item.workUnit}} - {{item.wage}}元 - {{item.integral.value}}分</div>
28 28
       </overlay-scrollbars>
29 29
     </div>
30 30
   </div>

+ 6 - 0
src/app/share/order-detail/order-detail.component.html

@@ -129,6 +129,7 @@
129 129
                     }"
130 130
                   ></i>
131 131
                   <p>{{ step.operationName }}</p>
132
+									<p>{{ step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):'' }}</p>
132 133
                   <p>{{ step.record ? step.record.operationtime : "" }}</p>
133 134
                   <p
134 135
                     *ngIf="
@@ -255,6 +256,7 @@
255 256
                     }"
256 257
                   ></i>
257 258
                   <p>{{ step.operationName }}</p>
259
+									<p>{{ step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
258 260
                   <p>{{ step.record ? step.record.operationtime : "" }}</p>
259 261
                   <p
260 262
                     *ngIf="
@@ -364,6 +366,7 @@
364 366
                     }"
365 367
                   ></i>
366 368
                   <p>{{ step.operationName }}</p>
369
+									<p>{{ step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
367 370
                   <p>{{ step.record ? step.record.operationtime : "" }}</p>
368 371
                   <p
369 372
                     *ngIf="
@@ -473,6 +476,7 @@
473 476
                     }"
474 477
                   ></i>
475 478
                   <p>{{ step.operationName }}</p>
479
+									<p>{{ step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
476 480
                   <p>{{ step.record ? step.record.operationtime : "" }}</p>
477 481
                   <p
478 482
                     *ngIf="
@@ -716,6 +720,7 @@
716 720
                     }"
717 721
                   ></i>
718 722
                   <p>{{ step.operationName }}</p>
723
+									<p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
719 724
                   <p>{{ step.record ? step.record.operationtime : "" }}</p>
720 725
                   <p
721 726
                     *ngIf="
@@ -944,6 +949,7 @@
944 949
                   }"
945 950
                 ></i>
946 951
                 <p>{{ step.operationName }}</p>
952
+								<p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
947 953
                 <p>{{ step.record ? step.record.operationtime : "" }}</p>
948 954
                 <p
949 955
                   *ngIf="