解决冲突

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

@@ -43,14 +43,8 @@
     </div>
 </nz-card>
 <nz-card>
-  <!-- 数据列表 -->
-  <st
-    #st
-    [data]="service.$api_freight_config_page"
-    [columns]="columns"
-    [req]="{ process: beforeReq }"
-    [loading]="service.http.loading"
-    [scroll]="{ x: '1200px', y: '500px' }"
-  >
-  </st>
+    <!-- 数据列表 -->
+    <st #st [columns]="columns" [data]='service.$api_freight_config_page' [req]="{  process: beforeReq }"
+        [scroll]="{ x: '1200px' }" [loading]="service.http.loading">
+    </st>
 </nz-card>

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

@@ -161,26 +161,26 @@ export class FreightConfigComponent implements OnInit {
 
   initST(): STColumn[] {
     return [
-      { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 250 },
-      { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 250 },
+      { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 },
+      { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 160 },
       {
         title: '货源单费率',
         className: 'text-right',
-        index: 'goodsSurchargeRatio',
-        width: 140,
-        format: item => `${item.goodsSurchargeRatio}%`
+        index: 'contractSurchargeRatio',
+        width: 130,
+        format: item => `${item.contractSurchargeRatio}%`
       },
       {
         title: '合同单费率',
         className: 'text-right',
-        index: 'contractSurchargeRatio',
-        width: 140,
-        format: item => `${item.contractSurchargeRatio}%`
+        index: 'goodsSurchargeRatio',
+        width: 130,
+        format: item => `${item.goodsSurchargeRatio}%`
       },
       {
         title: '合同单业务量（元）',
         index: 'contractQuota',
-        width: 180,
+        width: 140,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.contractQuota }) }
@@ -188,7 +188,7 @@ export class FreightConfigComponent implements OnInit {
       {
         title: '货源单业务量（元）',
         index: 'goodsQuota',
-        width: 180,
+        width: 140,
         type: 'widget',
         className: 'text-right',
         widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.goodsQuota }) }
@@ -201,7 +201,7 @@ export class FreightConfigComponent implements OnInit {
       },
       {
         title: '操作',
-        width: '110px',
+        width: '90px',
         fixed: 'right',
         className: 'text-center',
         buttons: [