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

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

@@ -92,7 +92,7 @@ export class RechargeRecordComponent implements OnInit {
             format: 'yyyy-MM-dd'
           } as SFDateWidgetSchema
         },
-        rechargeName: {
+        roleName: {
           type: 'string',
           title: '账户名称',
           ui: {
@@ -162,7 +162,7 @@ export class RechargeRecordComponent implements OnInit {
       { title: '网络货运人', index: 'ltdName', width: 160 },
       { title: '银行类型', index: 'bankTypeLabel', width: 100 },
       { title: '账户类型', index: 'accountTypeLabel', width: 100 },
-      { title: '账户名称', index: 'rechargeName', width: 160 },
+      { title: '账户名称', index: 'roleName', width: 160 },
       { title: '虚拟账户', index: 'virtualAccount', width: 100 },
       {
         title: '充值金额',

src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts

@@ -311,7 +311,7 @@ export class VoucherManagementComponent implements OnInit {
       { title: '帐套', index: 'ltdId', width: 200, format: item => `${item.vcltdcode}-${item.vcltdname}` },
       { title: '凭证时间', index: 'vctime', type: 'date', width: 200 },
       { title: '凭证类型', index: 'vctype', width: 200 },
-      { title: '序号', index: 'invmoney', width: 200, format: _ => '1' },
+      // { title: '序号', index: 'invmoney', width: 200, format: _ => '1' },
       { title: '摘要', index: 'remarks', width: 300 },
       { title: '币种', index: 'currency', width: 100 },
       {

src/app/routes/partner/partner-list/components/index/partner-list.component.html

@@ -51,8 +51,7 @@
       <se label="当前渠道销售"> 张三/13999999999 </se>
       <se label="渠道销售修改为" required>
         <nz-select ngModel="lucy" style="width: 100%">
-          <nz-option nzValue="jack" nzLabel="Jack"></nz-option>
-          <nz-option nzValue="lucy" nzLabel="Lucy"></nz-option>
+          <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of cannels"></nz-option>
         </nz-select>
       </se>
       <se label="备注" required>
@@ -60,20 +59,11 @@
       </se>
       <se label="一并转移的客户">
         <p style="margin-top: 8px">已选（0）</p>
-        <nz-table #rowSelectionTable [nzData]="customers" nzSize="small" nzBordered>
-          <thead>
-            <tr>
-              <th [nzChecked]="false"></th>
-              <th>客户名称</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr *ngFor="let data of rowSelectionTable.data">
-              <td [nzChecked]="data.checked"></td>
-              <td>{{ data.name }}</td>
-            </tr>
-          </tbody>
-        </nz-table>
+        <st #rest [data]="service.$api_get_enterprice_rel_list" [columns]="[
+        { title: '', index: 'key', type: 'checkbox' },
+        { title: '客户名称', index: 'enterpriceName' }
+        ]" [req]="{ process: beforeReq }" [loading]="service.http.loading"  [page]="{show:false}">
+        </st>
       </se>
       <se label="生效节点" required>
         <nz-radio-group>

src/app/routes/partner/partner-list/components/index/partner-list.component.ts

@@ -30,15 +30,12 @@ export class PartnerListComponent {
   @ViewChild('editCannel', { static: true })
   editCannel: any;
   customers: any[] = [];
+  cannels: any[] = [];
 
   selectItem: any = {};
 
   constructor(public service: PartnerListService, private nzModalService: NzModalService, private router: Router) {
-    this.service.getRebateConfig().subscribe(res => {
-      if (res) {
-        this.customers = res;
-      }
-    });
+    this.loadSelectOptions();
   }
 
   beforeReq = (requestOptions: STRequestOptions) => {
@@ -52,6 +49,19 @@ export class PartnerListComponent {
     return requestOptions;
   };
 
+  loadSelectOptions(){
+    this.service.getRebateConfig().subscribe(res => {
+      if (res) {
+        this.customers = res;
+      }
+    });
+    this.service.getChannel().subscribe(res => {
+      if (res) {
+        this.customers = res;
+      }
+    });
+  }
+
   auditPartner(item: any) {
     const modal = this.nzModalService.create({
       nzTitle: '审核',
@@ -371,7 +381,7 @@ export class PartnerListComponent {
       {
         title: '操作',
         fixed: 'right',
-        width: '140px',
+        width: '150px',
         buttons: [
           { type: 'divider' },
           {

src/app/routes/partner/partner-list/services/partner-list.service.ts

@@ -27,6 +27,8 @@ export class PartnerListService extends ShipperBaseService {
   $api_resend_crm = '/api/mdc/partner/reSendCrm';
   // 查询合伙人修改渠道渠道销售记录
   $api_get_personal_channel_list = '/api/mdc/partnerChannelRelLog/list/page';
+  // 查询客户关系列表-不分页
+  $api_get_enterprice_rel_list = '/api/mdc/enterpriceRelLog/list';
   // 冻结/启用企业业
   $api_lock_freight = '/api/mdc/cuc/enterpriseInfo/operate/lock';
 

src/app/shared/services/business/shipper-base.service.ts

@@ -21,6 +21,8 @@ export class ShipperBaseService extends BaseService {
   $api_getSysConfigTreeByParentFullKey = `/api/mdc/pbc/sysConfig/getSysConfigTreeByParentFullKey`;
   // 获取全部返佣配置
   $api_get_rebate_config = `/api/mdc/rebateConfig/list/listRebateConfig`;
+  // 获取渠道销售管理集合
+  $api_get_channel = `/api/mdc/channelSalesManagement/list/listChannelSalesManagement`;
   constructor(public injector: Injector) {
     super(injector);
   }
@@ -254,4 +256,23 @@ export class ShipperBaseService extends BaseService {
       })
     );
   }
+
+  /**
+   * 获取渠道销售管理集合
+   * @returns
+   */
+  getChannel() {
+    const params = {};
+    return this.request(this.$api_get_channel, params, 'POST').pipe(
+      map(res => {
+        if (res) {
+          return res.map((m: any) => {
+            return { label: m.name, value: m.id };
+          });
+        } else {
+          return [];
+        }
+      })
+    );
+  }
 }