Merge branch 'weiyu' into develop
This commit is contained in:
		| @ -31,7 +31,7 @@ | |||||||
|         </div> |         </div> | ||||||
|     </div> |     </div> | ||||||
|     <st #st [data]="service.$api_invoicedBillInfo_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}" |     <st #st [data]="service.$api_invoicedBillInfo_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}" | ||||||
|         [loading]="false" [scroll]="{ x:'1200px' }"> |         [loading]="false" [scroll]="{ x:'1200px', y: scrollY }"> | ||||||
|         <ng-template st-row="serviceType" let-item let-index="index"> |         <ng-template st-row="serviceType" let-item let-index="index"> | ||||||
|             <span>{{item.billTypeLabel + item.serviceTypeLabel}}</span> |             <span>{{item.billTypeLabel + item.serviceTypeLabel}}</span> | ||||||
|         </ng-template> |         </ng-template> | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user