Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts

@@ -230,16 +230,16 @@ export class ReceivableOrderComponent implements OnInit {
             }
           }
         },
-        orderS3: {
-          type: 'string',
-          title: '费用号',
-          ui: {
-            placeholder: '请输入',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          }
-        },
+        // orderS3: {
+        //   type: 'string',
+        //   title: '费用号',
+        //   ui: {
+        //     placeholder: '请输入',
+        //     visibleIf: {
+        //       expand: (value: boolean) => value
+        //     }
+        //   }
+        // },
         remarks: {
           type: 'string',
           title: '核销备注',

src/app/routes/usercenter/components/freight/list/list.component.html

@@ -39,6 +39,15 @@
 
   <st #st [columns]="columns" [data]='service.$api_get_freight_list' [req]="{  process: beforeReq }"
     [res]="{  process: dataProcess }" [scroll]="{ x: '1200px' }" [page]=" {}" [loading]="loadingList">
+    <ng-template st-row="enterpriseName" let-item let-index="index">
+      <label>{{ item.enterpriseName }}</label><br>
+      <ng-container *ngIf="item.score!==null; else billEvaluateelseTemplate">
+        <nz-rate [ngModel]="item.score" nzDisabled></nz-rate>
+      </ng-container>
+      <ng-template #billEvaluateelseTemplate>
+        <p>暂无评价</p>
+      </ng-template>
+    </ng-template>
     <ng-template st-row="unifiedSocialCreditCode" let-item let-index="index">
       <label [ngStyle]="{'color': item.isExpired?'#ff4d4f':''}">{{ item.unifiedSocialCreditCode }}</label><br>
       <ng-container *ngIf="item.isExpired">

src/app/routes/usercenter/components/freight/list/list.component.ts

@@ -363,7 +363,7 @@ export class FreightComponentsListComponent implements OnInit {
   initST() {
     this.columns = [
       // { title: '', type: 'checkbox', className: 'text-center' },
-      { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 },
+      { title: '企业名称',  render: 'enterpriseName', width: 350 },
       { title: '统一社会信用代码', className: 'text-center', render: 'unifiedSocialCreditCode', width: 200 },
       {
         title: '公司所在地',