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

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-07 17:54:06
+ * @LastEditTime : 2022-05-09 11:25:41
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -30,7 +30,7 @@ module.exports = {
   // },
   '//api': {
     target: {
-      host: 'tms-api-test.eascs.com',
+      host: 'tms-api-dev.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts

@@ -127,7 +127,6 @@ export class OrderManagementReceiptsAuditComponent extends BasicTableComponent i
     this.initST();
     setTimeout(() => {
       this.st.load();
-      this.getGoodsSourceStatistical();
     }, 500);
   }
   ngOnInit(): void {

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-04-29 17:28:23
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-06 14:20:04
+ * @LastEditTime : 2022-05-09 11:33:34
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\index\\partner-list.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -13,11 +13,15 @@
 <nz-card class="search-box" nzBordered>
   <div nz-row nzGutter="8">
     <div nz-col [nzXl]="_$expand ? 24 : 17" [nzLg]="24" [nzSm]="24" [nzXs]="24">
-      <sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
+      <sf
-        [compact]="true" [button]="'none'"></sf>
+        #sf
+        [schema]="searchSchema"
+        [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
+        [compact]="true"
+        [button]="'none'"
+      ></sf>
     </div>
-    <div nz-col [nzXl]="_$expand ? 24 : 7" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
+    <div nz-col [nzXl]="_$expand ? 24 : 7" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right" [class.expend-options]="_$expand">
-      [class.expend-options]="_$expand">
       <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
       <button nz-button nzType="link" (click)="expandToggle()">
@@ -30,20 +34,40 @@
 
 <nz-card class="content-box" nzBordered>
   <div class="d-flex align-items-center mb-md mt-md">
-    <button nz-button (click)="this.routeTo('/partner/partner-list/add-etp-partner')" nzType="primary"  acl  [acl-ability]="['ENTERPRISE-saveEnterprise']">新增企业合伙人</button>
+    <button
-    <button nz-button (click)="this.routeTo('/partner/partner-list/add-personal-partner')"
+      nz-button
-      nzType="primary"  acl  [acl-ability]="['ENTERPRISE-savePersonally']">新增个人合伙人</button>
+      (click)="this.routeTo('/partner/partner-list/add-etp-partner')"
+      nzType="primary"
+      acl
+      [acl-ability]="['ENTERPRISE-saveEnterprise']"
+      >新增企业合伙人</button
+    >
+    <button
+      nz-button
+      (click)="this.routeTo('/partner/partner-list/add-personal-partner')"
+      nzType="primary"
+      acl
+      [acl-ability]="['ENTERPRISE-savePersonally']"
+      >新增个人合伙人</button
+    >
   </div>
 
-  <st #st [data]="service.$api_get_partner_page" [columns]="columns" [req]="{ process: beforeReq }"
+  <st
-    [loading]="service.http.loading" [scroll]="{ x: '1200px' }" [page]="{}">
+    #st
+    [data]="service.$api_get_partner_page"
+    [columns]="columns"
+    [req]="{ process: beforeReq }"
+    [loading]="service.http.loading"
+    [scroll]="{ x: '1200px' }"
+    [page]="{}"
+  >
   </st>
 </nz-card>
 
 <ng-template #editTemplate>
   <div nz-row nzGutter="8">
     <div nz-col nzSpan="24" se-container [labelWidth]="120">
-      <se [col]="1" label="合伙人名称"> {{selectItem?.enterpriseName || selectItem?.contactName}} </se>
+      <se [col]="1" label="合伙人名称"> {{ selectItem?.enterpriseName || selectItem?.contactName }} </se>
       <se [col]="1" label="返佣模板" required>
         <nz-select [(ngModel)]="templateId" style="width: 100%">
           <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of customers"></nz-option>
@@ -57,8 +81,8 @@
 <ng-template #editCannel>
   <div nz-row nzGutter="8">
     <div nz-col nzSpan="24" se-container [labelWidth]="140" [col]="1">
-      <se label="合伙人名称"> {{selectItem?.enterpriseName || selectItem?.contactName}} </se>
+      <se label="合伙人名称"> {{ selectItem?.enterpriseName || selectItem?.contactName }} </se>
-      <se label="当前渠道销售"> {{selectItem?.channelIdLabel}} </se>
+      <se label="当前渠道销售"> {{ selectItem?.channelIdLabel }} </se>
       <se label="渠道销售修改为" required>
         <nz-select [(ngModel)]="cannelItem.channelId" style="width: 100%">
           <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of cannels"></nz-option>
@@ -68,21 +92,32 @@
         <textarea rows="3" nz-input [(ngModel)]="cannelItem.remark"></textarea>
       </se>
       <se label="一并转移的客户">
-        <p style="margin-top: 8px">已选（{{selectedRows?.length}}）</p>
+        <p style="margin-top: 8px">已选（{{ selectedRows?.length }}）</p>
-        <st #rest [data]="service.$api_get_enterprice_rel_list" [columns]="[
+        <st
-        { title: '', index: 'key', type: 'checkbox' },
+          #rest
-        { title: '客户名称', index: 'enterpriceName' }
+          [data]="service.$api_get_enterprice_rel_list"
-        ]" [req]="{ process: beforeReq,params:{effectiveStatus:2 ,newPartnerId:selectItem.id} }"
+          [columns]="[
-          [loading]="service.http.loading" [page]="{show:false}" (change)="stChange($event)">
+            { title: '', index: 'key', type: 'checkbox' },
+            { title: '客户名称', index: 'enterpriseName' }
+          ]"
+          [res]="{ reName: { list: 'data', total: 'data.total' } }"
+          [req]="{ process: beforeReq, params: { effectiveStatus: 2, newPartnerId: selectItem.id } }"
+          [loading]="service.http.loading"
+          [page]="{ show: false }"
+          
+          (change)="stChange($event)"
+        >
         </st>
       </se>
       <se label="生效节点" required>
         <nz-radio-group [(ngModel)]="cannelItem.effectiveNode">
           <label nz-radio [nzValue]="1">修改成功后立即生效</label>
-          <label nz-radio [nzValue]="2">CRM流程审核通过后生</label>
+          <!-- <label nz-radio [nzValue]="2">CRM流程审核通过后生效</label> -->
         </nz-radio-group>
       </se>
     </div>
   </div>
-  <p class="text-center mt-md">客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，成为渠道销售的直客</p>
+  <p class="text-center mt-md"
+    >客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，成为渠道销售的直客</p
+  >
 </ng-template>

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

@@ -162,7 +162,7 @@ export class PartnerListComponent {
     const modal = this.nzModalService.confirm({
       nzTitle: '确定提交吗？',
       nzOnOk: () => {
-        this.cannelItem.enterpriseIdList = this.selectedRows.map(row => row.id);
+        this.cannelItem.enterpriseIdList = this.selectedRows.map(row => row.enterpriseId);
         this.service
           .request(this.service.$api_update_partner_channel_by_id, {
             ...this.cannelItem,

src/app/routes/ticket-management/components/billing-order/billing-order.component.ts

@@ -213,7 +213,7 @@ export class BillingOrderComponent extends BasicTableComponent {
         className: 'text-center',
         index: 'paymentMethodRate',
         width: 130,
-        format: record => `${record.paymentMethodRate * 100}%`
+        format: record => `${(record.paymentMethodRate*100).toFixed(2)}%`
       },
       { title: '货主名称', index: 'shipperAppUserName', width: '180px', className: 'text-center' },
       { title: '所属项目', index: 'enterpriseProjectName', width: '180px', className: 'text-center' },

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

@@ -106,10 +106,9 @@ export class EditPartnerComponentsAddComponent implements OnInit {
           } as SFRadioWidgetSchema,
           enum: [
             { label: '修改成功后立即生效', value: 1 },
-            { label: 'CRM流程审核后生效', value: 2 },
+            // { label: 'CRM流程审核通过后生效', value: 2 },
-            { label: 'CRM流程审核通过后生效', value: 3 }
+          ],
-          ]
+        },
-        }
       },
       required: ['channelId', 'remark', 'effectiveNode']
     };

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

@@ -80,10 +80,9 @@ export class EditSaleComponentsAddComponent implements OnInit {
           } as SFRadioWidgetSchema,
           enum: [
             { label: '修改成功后立即生效', value: 1 },
-            { label: 'CRM流程审核后生效', value: 2 },
+            // { label: 'CRM流程审核通过后生效', value: 2 },
-            { label: 'CRM流程审核通过后生效', value: 3 }
+          ],
-          ]
+        },
-        }
       },
       required: ['channelId', 'remark', 'effectiveNode']
     };