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

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

@@ -235,6 +235,8 @@ export class PaymentOrderComponent implements OnInit {
       { title: '', index: 'key', type: 'checkbox', fixed: 'left', className: 'text-center' },
       { title: '付款单号', index: 'payCode', type: 'link', width: 180 },
       { title: '网络货运人', index: 'ltdName', width: 180 },
+      { title: '运单号', index: 'waybillCode', width: 180 },
+      { title: '费用号', index: 'feeCode', width: 180 },
       { title: '要求付款日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
       {
         title: '付款金额',

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

@@ -231,6 +231,8 @@ export class ReceiptOrderComponent implements OnInit {
     return [
       { title: '', index: 'key', type: 'checkbox', width: 60, fixed: 'left', className: 'text-center' },
       { title: '收款单号', index: 'brmcode', type: 'link', width: 180, className: 'text-left' },
+      { title: '订单号', index: 'billHCode',  width: 180, className: 'text-left' },
+      { title: '费用号', index: 'feeCode',  width: 180, className: 'text-left' },
       { title: '网络货运人', index: 'ltdName', width: 200, className: 'text-left' },
       { title: '到账日期', index: 'brmdate', type: 'date', width: 200, className: 'text-left' },
       { title: '收款账户', index: 'ltdaccountId', width: 200, className: 'text-left' },

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

@@ -242,6 +242,7 @@ export class ReceivableOrderComponent implements OnInit {
     return [
       { title: '', index: 'key', type: 'checkbox' },
       { title: '核销单号', index: 'ahxcode', type: 'link', width: 140 },
+      { title: '订单号', index: 'billHCode', type: 'link', width: 140 },
       { title: '网络货运人', index: 'ltdName', width: 160 },
       { title: '核销日期', index: 'ahxdate', type: 'date', width: 160 },
       { title: '付款账户', index: 'shipperaccount', width: 170 },

src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts

@@ -35,7 +35,7 @@ export class TransactionFlowComponent {
       Object.assign(requestOptions.body, {
         ...this.sf.value,
         createTime: {
-          start: this.sf.value.tcreateTimeime?.[0] || '',
+          start: this.sf.value.createTime?.[0] || '',
           end: this.sf.value.createTime?.[1] || ''
         }
       });
@@ -120,9 +120,9 @@ export class TransactionFlowComponent {
           type: 'string',
           title: '收支类型',
           enum: [
-            { label: '全部', value: '部' },
+            { label: '全部', value: '' },
-            { label: '收入', value: 1 },
+            { label: '收入', value: 2 },
-            { label: '支出', value: 2 }
+            { label: '支出', value: 1 }
           ],
           ui: {
             widget: 'select',

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

@@ -269,8 +269,8 @@
       </label>
     </sv-title>
     <sv label="法定代表人">
-      <input nz-input type="text" maxlength="32" [(ngModel)]="detailData.legalPersonIdentityVO.name" [readonly]="!isEdit"
+      <input nz-input type="text" maxlength="32" [(ngModel)]="detailData.legalPersonIdentityVO.name"
-        [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
+        [readonly]="!isEdit" [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
     <sv label="身份证号码">
       <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentityVO.certificateNumber" [readonly]="!isEdit"
@@ -354,8 +354,73 @@
         [placeholder]="isEdit?'':'-'">
     </sv>
   </sv-container>
+  <nz-divider></nz-divider>
+  <sv-container col="3" class="mt16">
+    <sv-title>合伙人信息</sv-title>
+    <sv label="合伙人名称">
+      <input nz-input type="text" [(ngModel)]="partnerInfo.partnerEnterpriseName" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        [placeholder]="isEdit?'':'-'">
+    </sv>
+    <sv label="手机号">
+      <input nz-input type="text" [(ngModel)]="partnerInfo.partnerContactMobile" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        [placeholder]="isEdit?'':'-'">
+    </sv>
+    <sv label="管理员">
+      <input nz-input type="text" [(ngModel)]="partnerInfo.partnerContactName + ' ' + partnerInfo.partnerContactMobile" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        [placeholder]="isEdit?'':'-'">
+    </sv>
+    <sv label="绑定时间">
+      <input nz-input type="text" [(ngModel)]="partnerInfo.enterprisePartnerRelTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        [placeholder]="isEdit?'':'-'">
+    </sv>
+    <sv label="结算时间段">
+      <input nz-input type="text" [(ngModel)]="partnerInfo.settStartTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        [placeholder]="isEdit?'':'-'">
+    </sv>
+  </sv-container>
+  <nz-divider></nz-divider>
+  <sv-container col="3" class="mt16">
+    <sv-title>渠道销售信息</sv-title>
+    <sv label="姓名">
+      <input nz-input type="text" [(ngModel)]="partnerInfo.channelName" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        [placeholder]="isEdit?'':'-'">
+    </sv>
+    <sv label="手机号">
+      <input nz-input type="text" [(ngModel)]="partnerInfo.channelMobile" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        [placeholder]="isEdit?'':'-'">
+    </sv>
+    <sv label="绑定时间">
+      <input nz-input type="text" [(ngModel)]="partnerInfo.enterpriseChannelRelTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
+        [placeholder]="isEdit?'':'-'">
+    </sv>
+  </sv-container>
+</nz-card>
+<nz-card>
+<nz-tabset >
+  <nz-tab nzTitle="修改合伙人记录">
+    <st #st [data]="service.$api_findEnterpricePartnerRelLog" [columns]="columns"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParamsCar }"
+    [res]="{ reName: { list: 'data'} }" [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }"
+    [loading]="false">
+    <ng-template st-row="remark" let-item let-index="index">
+      <span *ngIf="item.remark" class="overflowText" nz-tooltip [nzTooltipTitle]="item.remark">{{ item.remark }}</span>
+      <span *ngIf="item.remark === null">--</span>
+    </ng-template>
+  </st>
+  </nz-tab>
+  <nz-tab nzTitle="修改渠道销售记录">
+    <st #st1 multiSort bordered [columns]="recordColumns" [ps]="20" [data]="service.$api_findEnterpriceChannelRelLog"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
+    [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="false">
+    <ng-template st-row="remark" let-item let-index="index">
+      <span *ngIf="item.remark" class="overflowText" nz-tooltip [nzTooltipTitle]="item.remark">{{ item.remark }}</span>
+      <span *ngIf="item.remark === null">--</span>
+    </ng-template>
+</st>
+  </nz-tab>
+</nz-tabset>
 </nz-card>
-
 <ng-template #PopconfirmTempalte let-title="title" let-content="content">
   <div class="ant-popover-message">
     <i nz-icon nzType="info-circle" nzTheme="fill"></i>

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

@@ -43,4 +43,16 @@
       left: 106px;
     }
   }
+  .overflowText {
+    display: -webkit-box;
+    max-width: 155px;
+    height: 40px;
+    overflow: hidden;
+    text-align: left;
+    text-overflow: -o-ellipsis-lastline;
+    text-overflow: ellipsis;
+    -webkit-line-clamp: 2;
+    line-clamp: 2;
+    -webkit-box-orient: vertical;
+  }
 }

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

@@ -1,6 +1,7 @@
 import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { apiConf } from '@conf/api.conf';
+import { STColumn, STComponent } from '@delon/abc/st';
 import { DatePipe, _HttpClient } from '@delon/theme';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { fromEvent, Subscription } from 'rxjs';
@@ -13,11 +14,14 @@ import { UsermanageService } from '../../../../services/usercenter.service';
   providers: [DatePipe]
 })
 export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
+  @ViewChild('st') private readonly st!: STComponent;
+  @ViewChild('st1') private readonly st1!: STComponent;
   @ViewChild('approvedModal', { static: false })
   approvedModal!: any;
   @ViewChild('redectModal', { static: false })
   redectModal!: any;
-
+  columns: STColumn[] = [];
+  recordColumns!: STColumn[];
   detailData: any = { adminUserInfo: { name: '' }, legalPersonIdentityVO: { name: '' } };
   tempalateData = { ...this.detailData };
   suppliersData: any = {};
@@ -35,7 +39,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
   networkTransporter = null;
   roleId = null;
   customerServiceId = null;
-
+  partnerInfo: any = {};
   esignCheckStatus: any = {
     0: '不通过',
     1: '通过',
@@ -43,16 +47,31 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
   };
 
   billEvaluate = null;
-
   scrollTop = 0;
   subscribeScoll!: Subscription;
+  /**
+ * 查询参数
+ */
+  get reqParamsCar() {
+    const params = {
+      id: this.route.snapshot.params.id,
+      bindType: 0
+    }
+    return { ...params };
+  }
+  get reqParams() {
+    const params = {
+      id: this.route.snapshot.params.id,
+    }
+    return { ...params };
+  }
   constructor(
     public service: UsermanageService,
     private route: ActivatedRoute,
     private nzModalService: NzModalService,
     private router: Router,
     private datePipe: DatePipe
-  ) {}
+  ) { }
   ngOnDestroy(): void {
     this.subscribeScoll.unsubscribe();
   }
@@ -62,12 +81,80 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
       this.initData();
       this.loadltdId();
       this.loadRoles();
+      this.initST();
+      this.initRecordST()
       this.loadCustomerServices();
+      this.loadPartnerInfo()
     });
     this.subscribeScoll = fromEvent(window, 'scroll').subscribe(event => {
       this.scrollTop = document.documentElement.scrollTop;
     });
   }
+  /**
+* 初始化数据列表
+*/
+  initST() {
+    this.columns = [
+      { title: '修改后合伙人', index: 'newPartnerName', className: 'text-center' },
+      { title: '修改前合伙人', index: 'originalPartnerNamel', 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: '立即生效',
+        2: 'CRM审核后生效',
+        3: '审核通过生效',
+      } },
+      {
+        title: 'CRM审核状态', index: 'effectiveStatus',
+        type: 'enum',
+        enum: {
+          0: '已失效',
+          1: '未生效',
+          2: '已生效',
+        },
+        className: 'text-center'
+      },
+      { title: '修改时间', render: 'modifyTime', className: 'text-center' },
+      { title: '生效时间', render: '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: '修改时间', render: 'mybidDetailInfo', className: 'text-center' },
+      { title: '生效时间', index: 'eeffectiveTime', className: 'text-center' },
+      { title: '操作人', index: 'approvalUser', className: 'text-center' }
+    ];
+  }
+  loadPartnerInfo(){
+    this.service.request(this.service.$api_getEnterpriceRel, {id: this.route.snapshot.params.id}).subscribe(res => {
+      if (res) {
+        this.partnerInfo = res;
+      }
+    });
+  }
   loadltdId() {
     this.service.getNetworkFreightForwarder().subscribe(res => {
       if (res) {
@@ -273,7 +360,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
         res => {
           node.children = res.map((item: any) => ({ ...item, isLeaf: index === 1, value: item.regionCode, label: item.name }));
         },
-        _ => {},
+        _ => { },
         () => {
           resolve(node);
         }
@@ -286,7 +373,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
     this.isEdit = false;
   }
 
-  save(data: any){
+  save(data: any) {
     const dateil = { ...this.detailData };
     Object.assign(dateil.legalPersonIdentityVO, {
       validStartTime: this.datePipe.transform(dateil.legalPersonIdentityVO.validStartTime, 'yyyy-MM-dd'),

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

@@ -166,137 +166,6 @@ export class FreightComponentsListComponent implements OnInit {
             showRequired: false
           }
         },
-        lockedStatus8: {
-          type: 'string',
-          title: '公司所在地',
-          enum: [
-            { label: '全部', value: '' },
-            { label: '物流企业', value: 0 }
-          ],
-          default: '',
-          ui: {
-            widget: 'select',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          }
-        },
-        oftenUsedServices: {
-          type: 'string',
-          title: '常用服务',
-          enum: [
-            { label: '全部', value: '' },
-            { label: '整车服务', value: 0 },
-            { label: '大宗服务', value: 1 }
-          ],
-          default: '',
-          ui: {
-            widget: 'select',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          }
-        },
-        customerType: {
-          type: 'string',
-          title: '客户类型',
-          enum: [
-            { label: '全部', value: '' },
-            { label: '直客', value: 1 },
-            { label: '渠道客户', value: 20 }
-          ],
-          default: '',
-          ui: {
-            widget: 'select',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          }
-        },
-        contactName5: {
-          title: '渠道销售',
-          type: 'string',
-          ui: {
-            placeholder: '请输入',
-            showRequired: false,
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          }
-        },
-        partnerName: {
-          title: '合伙人',
-          type: 'string',
-          ui: {
-            placeholder: '请输入',
-            showRequired: false,
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          }
-        },
-        contactName3: {
-          title: '客服人员',
-          type: 'string',
-          ui: {
-            placeholder: '请输入',
-            showRequired: false,
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          }
-        },
-        contactName2: {
-          title: '审核人',
-          type: 'string',
-          ui: {
-            placeholder: '请输入',
-            showRequired: false,
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          }
-        },
-        applyDate: {
-          type: 'string',
-          title: '申请时间',
-          ui: {
-            widget: 'sl-from-to',
-            type: 'date',
-            format: 'yyyy-MM-dd',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          } as SFDateWidgetSchema,
-        },
-        applyDate1: {
-          type: 'string',
-          title: '审核时间',
-          ui: {
-            widget: 'sl-from-to',
-            type: 'date',
-            format: 'yyyy-MM-dd',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          } as SFDateWidgetSchema,
-        },
-        lockedStatus3: {
-          type: 'string',
-          title: '企业状态',
-          enum: [
-            { label: '全部', value: '' },
-            { label: '正常', value: 0 },
-            { label: '冻结', value: 1 }
-          ],
-          default: '',
-          ui: {
-            widget: 'select',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          }
-        },
         enterpriseType: {
           type: 'string',
           title: '企业类型',
@@ -322,26 +191,41 @@ export class FreightComponentsListComponent implements OnInit {
           default: '',
           ui: {
             widget: 'select',
-            placeholder: '请选择',
-            allowClear: true,
-            asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
             visibleIf: {
               expand: (value: boolean) => value
             }
           }
         },
-        // sou1r3ce: {
+        oftenUsedServices: {
-        //   type: 'string',
+          type: 'string',
-        //   title: '客户类型',
+          title: '常用服务',
-        //   enum: [{ label: '全部', value: '' }],
+          enum: [
-        //   default: '',
+            { label: '全部', value: '' },
-        //   ui: {
+            { label: '整车发货', value: 10 },
-        //     widget: 'select',
+            { label: '大宗发货', value: 20 }
-        //     visibleIf: {
+          ],
-        //       expand: (value: boolean) => value
+          default: '',
-        //     }
+          ui: {
-        //   }
+            widget: 'select',
-        // },
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        customerType: {
+          type: 'string',
+          title: '客户类型',
+          enum: [{ label: '全部', value: '' },
+          { label: '直客', value: 1 },
+          { label: '渠道客户', value: 20 }],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
         promotersTelephone: {
           title: '业务员',
           type: 'string',
@@ -353,28 +237,28 @@ export class FreightComponentsListComponent implements OnInit {
             }
           }
         },
-        // promotersTe1le3phone: {
+        partnerNamee: {
-        //   title: '合伙人',
+          title: '合伙人',
-        //   type: 'string',
+          type: 'string',
-        //   ui: {
+          ui: {
-        //     placeholder: '请输入',
+            placeholder: '请输入',
-        //     showRequired: false,
+            showRequired: false,
-        //     visibleIf: {
+            visibleIf: {
-        //       expand: (value: boolean) => value
+              expand: (value: boolean) => value
-        //     }
+            }
-        //   }
+          }
-        // },
+        },
-        // promotersTe1lep1hone: {
+        customerServiceId: {
-        //   title: '客服人员',
+          title: '客服人员',
-        //   type: 'string',
+          type: 'string',
-        //   ui: {
+          ui: {
-        //     placeholder: '请输入',
+            placeholder: '请输入',
-        //     showRequired: false,
+            showRequired: false,
-        //     visibleIf: {
+            visibleIf: {
-        //       expand: (value: boolean) => value
+              expand: (value: boolean) => value
-        //     }
+            }
-        //   }
+          }
-        // },
+        },
         approvalUserName: {
           title: '审核人',
           type: 'string',
@@ -442,13 +326,13 @@ export class FreightComponentsListComponent implements OnInit {
             }
           }
         },
-        source2: {
+        isExpired: {
           type: 'string',
           title: '证件是否过期',
           enum: [
             { label: '全部', value: '' },
-            { label: '是', value: 1 },
+            { label: '是', value: true },
-            { label: '否', value: 2 }
+            { label: '否', value: false }
           ],
           default: '',
           ui: {
@@ -506,8 +390,8 @@ export class FreightComponentsListComponent implements OnInit {
         width: 140
       },
       { title: '业务员', className: 'text-center', render: 'promotersTelephone', width: 150 },
-      // { title: '合伙人', className: 'text-center', render: 'promoter1sTelephone', width: 150 },
+      { title: '合伙人', className: 'text-center', render: 'partnerName', width: 150 },
-      // { title: '客服人员', className: 'text-center', render: 'promoter1sTelephone', width: 150 },
+      { title: '客服人员', className: 'text-center', render: 'customerServiceId', width: 150 },
       { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },
       {
         title: '注册渠道',
@@ -544,8 +428,9 @@ export class FreightComponentsListComponent implements OnInit {
       },
       {
         title: '操作',
-        width: '250px',
+        width: '200px',
-        className: 'text-center btnBox',
+        className: 'text-center block-td',
+        fixed: 'right',
         buttons: [
           {
             text: '查看',

src/app/routes/usercenter/services/usercenter.service.ts

@@ -154,6 +154,12 @@ export class UsermanageService extends ShipperBaseService {
   $api_batchUpdateEnterpricePartner = '/api/mdc/enterpriceRelLog/batchUpdateEnterpricePartner';
   // 渠道销售修改详情
   $api_partnerChannelUpdateDetaiList = '/api/mdc/enterpriceRelLog/partnerChannelUpdateDetaiList';
+  // 查询企业修改合伙人记录
+  $api_findEnterpricePartnerRelLog = '/api/mdc/enterpriceRelLog/findEnterpricePartnerRelLog';
+  // 查询企业修改渠道记录
+  $api_findEnterpriceChannelRelLog = '/api/mdc/enterpriceRelLog/findEnterpriceChannelRelLog';
+  // 查询企业合伙人渠道关系信息
+  $api_getEnterpriceRel = '/api/mdc/enterpriceRelLog/getEnterpriceRel';
 
   constructor(public injector: Injector, public nzModalService: NzModalService, private nzImageService: NzImageService) {
     super(injector);

src/app/shared/services/business/user.service.ts

@@ -152,16 +152,16 @@ export class EAUserService extends BaseService {
    * 加载用户菜单
    */
   async loadUserMenus() {
-    // return this.asyncRequest(this.$api_get_user_menus, {
+    return this.asyncRequest(this.$api_get_user_menus, {
-    //   appId: this.envSrv.getEnvironment().appId
+      appId: this.envSrv.getEnvironment().appId
-    // }).then(res => {
+    }).then(res => {
-    //   this.cacheSrv.set(cacheConf.menu, res);
+      this.cacheSrv.set(cacheConf.menu, res);
-    //   this.menuService.add(res);
+      this.menuService.add(res);
-    // });
-    this.request('assets/mocks/menu-data.json', {}, 'GET').subscribe((res: any) => {
-      this.cacheSrv.set(cacheConf.menu, res.menu);
-      this.menuService.add(res.menu);
     });
+    // this.request('assets/mocks/menu-data.json', {}, 'GET').subscribe((res: any) => {
+    //   this.cacheSrv.set(cacheConf.menu, res.menu);
+    //   this.menuService.add(res.menu);
+    // });
   }
 
   /**