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

src/app/routes/financial-management/components/refund-record/refund-record.component.html

@@ -32,8 +32,22 @@
 
     <st #st [data]="service.$api_get_refund_record_page" [columns]="columns" [req]="{  process: beforeReq }"
         [loading]="service.http.loading" [scroll]="{ x:'1200px' }">
-        <ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
+        <ng-template st-row="orderRefundCode" let-item let-index="index" let-column="column">
-            {{ item.bankName }} <br> {{ item.bankCardNumber }}
+            {{ item.orderRefundCode }} <br> {{ item.refundStatusLabel }}
+        </ng-template>
+        <ng-template st-row="refundAmount" let-item let-index="index" let-column="column">
+            {{ item.refundAmount |currency }}
+        </ng-template>
+        <ng-template st-row="billRefundPaymentVOS" let-item let-index="index" let-column="column">
+            <ng-container *ngFor="let bill of item.billRefundPaymentVOS">
+                {{ bill.paymentApplicationCode  }}<br>
+            </ng-container>
+        </ng-template>
+        <ng-template st-row="driver" let-item let-index="index" let-column="column">
+            {{ item.driverName }} <br> {{ item.driverTelephone }}<br>{{ item.driverLicencePlate }}
+        </ng-template>
+        <ng-template st-row="captain" let-item let-index="index" let-column="column">
+            {{ item.captainName }} <br> {{ item.captainTelephone }}
         </ng-template>
     </st>
 </nz-card>

src/app/routes/financial-management/components/refund-record/refund-record.component.ts

@@ -245,20 +245,13 @@ export class RefundRecordComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
-      { title: '退款单号', index: 'orderRefundCode', width: 180 },
+      { title: '退款单号', render: 'orderRefundCode', width: 180 },
       { title: '退款类型', index: 'refundType', width: 120 },
-      {
+      { title: '退款金额', render: 'refundAmount', width: 120 },
-        title: '退款金额',
+      { title: '退款时间', index: 'applyTime', width: 150 },
-        render: 'refundAmount',
-        width: 120,
-        type: 'widget',
-        className: 'text-right',
-        widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.refundAmount }) }
-      },
-      { title: '退款时间', index: 'applyTime', width: 100 },
       { title: '货主', index: 'shipperId', width: 100 },
       { title: '所属项目', index: 'enterpriseProjectName', width: 140 },
-      { title: '支付单', index: 'billRefundPaymentVOS.paymentApplicationCode', width: 100 },
+      { title: '支付单', render: 'billRefundPaymentVOS', width: 100 },
       { title: '订单号', index: 'billCode', width: 100 },
       { title: '货源号', index: 'resourceCode', width: 100 },
       { title: '司机', render: 'driver', width: 100 },

src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts

@@ -44,15 +44,15 @@ export class FreightConfigComponent implements OnInit {
         businessId: item.id,
         formatTypeList: (item: any[]) => [
           ...item,
-          {
+          // {
-            name: '权限配置',
+          //   name: '权限配置',
-            items: [
+          //   items: [
-              {
+          //     {
-                configType: 1,
+          //       configType: 1,
-                itemType: 999
+          //       itemType: 999
-              }
+          //     }
-            ]
+          //   ]
-          },
+          // },
           {
             name: '费率变更记录',
             items: [

src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts

@@ -18,8 +18,7 @@ import { BaseService } from 'src/app/shared/services';
 
 @Component({
   selector: 'app-dynamic-setting-modal',
-  templateUrl: './dynamic-setting-modal.component.html',
+  templateUrl: './dynamic-setting-modal.component.html'
-  styleUrls: ['./dynamic-setting-modal.component.less']
 })
 export class DynamicSettingModalComponent implements OnInit {
   tabs: any[] = [];