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

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

@@ -97,8 +97,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
   initST() {
     this.columns = [
       { title: '修改后合伙人', index: 'newPartnerName', className: 'text-center' },
-      { title: '修改前合伙人', index: 'originalPartnerNamel', className: 'text-center' },
+      { title: '修改前合伙人', index: 'originalPartnerName', className: 'text-center' },
-      { title: '备注', render: 'remark', className: 'text-center' },
       { title: '结算起算日', index: 'settStartTime', className: 'text-center' },
       { title: '生效节点', index: 'effectiveNode', className: 'text-center', type: 'enum', enum: {
         1: '立即生效',
@@ -115,38 +114,38 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
         },
         className: 'text-center'
       },
-      { title: '修改时间', render: 'modifyTime', className: 'text-center' },
-      { title: '生效时间', index: 'effectiveTime', className: 'text-center' },
-      { title: '操作人', render: 'approvalUser', className: 'text-center' },
-
-    ];
-  }
-  /**
-   * 初始化数据列表
-   */
-  initRecordST() {
-    this.recordColumns = [
-      { title: '修改后渠道销售', index: 'newChannelName', className: 'text-center' },
-      { title: '修改前渠道销售地', index: 'originalChannelName', className: 'text-center' },
-      { title: '备注', render: 'remark', className: 'text-center' },
-      { title: '生效节点', index: 'effectiveNode', className: 'text-center', type: 'enum', enum: {
-        1: '立即生效',
-        2: 'CRM审核后生效',
-        3: '审核通过生效',
-      } },
-      {
-        title: 'CRM审核状态', index: 'effectiveStatus',
-        type: 'enum',
-        enum: {
-          0: '已失效',
-          1: '未生效',
-          2: '已生效',
-        },
-        className: 'text-center'
-      },
       { title: '修改时间', index: 'modifyTime', className: 'text-center' },
       { title: '生效时间', index: 'effectiveTime', className: 'text-center' },
-      { title: '操作人', index: 'modifyUserId', className: 'text-center' }
+      { title: '操作人', index: 'modifyUserId', className: 'text-center' },
+      { title: '备注', render: 'remark', className: 'text-center' },
+    ];
+  }
+  /**
+   * 初始化数据列表
+   */
+  initRecordST() {
+    this.recordColumns = [
+      { title: '修改后渠道销售', index: 'newChannelName', className: 'text-center' },
+      { title: '修改前渠道销售地', index: 'originalChannelName', className: 'text-center' },
+      { title: '生效节点', index: 'effectiveNode', className: 'text-center', type: 'enum', enum: {
+        1: '立即生效',
+        2: 'CRM审核后生效',
+        3: '审核通过生效',
+      } },
+      {
+        title: 'CRM审核状态', index: 'effectiveStatus',
+        type: 'enum',
+        enum: {
+          0: '已失效',
+          1: '未生效',
+          2: '已生效',
+        },
+        className: 'text-center'
+      },
+      { title: '修改时间', index: 'modifyTime', className: 'text-center' },
+      { title: '生效时间', index: 'effectiveTime', className: 'text-center' },
+      { title: '操作人', index: 'modifyUserId', className: 'text-center' },
+      { title: '备注', render: 'remark', className: 'text-center' },
     ];
   }
   loadPartnerInfo(){