拉取代码

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

@@ -11,7 +11,7 @@
 			</div>
       <overlay-scrollbars #osComponentRef1 class="contentBody">
         <nz-spin nzSimple [nzSpinning]="categoryLoading1" class="mt8 text_align_center"></nz-spin>
-        <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>
+        <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>
       </overlay-scrollbars>
     </div>
     <div class="address">
@@ -24,7 +24,7 @@
 			</div>
       <overlay-scrollbars #osComponentRef2 class="contentBody">
         <nz-spin nzSimple [nzSpinning]="categoryLoading2" class="mt8 text_align_center"></nz-spin>
-        <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>
+        <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>
       </overlay-scrollbars>
     </div>
   </div>

src/app/share/order-detail/order-detail.component.html

@@ -129,6 +129,7 @@
                     }"
                   ></i>
                   <p>{{ step.operationName }}</p>
+									<p>{{ step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):'' }}</p>
                   <p>{{ step.record ? step.record.operationtime : "" }}</p>
                   <p
                     *ngIf="
@@ -255,6 +256,7 @@
                     }"
                   ></i>
                   <p>{{ step.operationName }}</p>
+									<p>{{ step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
                   <p>{{ step.record ? step.record.operationtime : "" }}</p>
                   <p
                     *ngIf="
@@ -364,6 +366,7 @@
                     }"
                   ></i>
                   <p>{{ step.operationName }}</p>
+									<p>{{ step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
                   <p>{{ step.record ? step.record.operationtime : "" }}</p>
                   <p
                     *ngIf="
@@ -473,6 +476,7 @@
                     }"
                   ></i>
                   <p>{{ step.operationName }}</p>
+									<p>{{ step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
                   <p>{{ step.record ? step.record.operationtime : "" }}</p>
                   <p
                     *ngIf="
@@ -716,6 +720,7 @@
                     }"
                   ></i>
                   <p>{{ step.operationName }}</p>
+									<p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
                   <p>{{ step.record ? step.record.operationtime : "" }}</p>
                   <p
                     *ngIf="
@@ -944,6 +949,7 @@
                   }"
                 ></i>
                 <p>{{ step.operationName }}</p>
+								<p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
                 <p>{{ step.record ? step.record.operationtime : "" }}</p>
                 <p
                   *ngIf="