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

proxy.conf.js

@@ -20,7 +20,7 @@ module.exports = {
   // }
   '//api': {
     target: {
-      host: 'tms-api-test.eascs.com',
+      host: 'tms-api-dev.eascs.com',
       protocol: 'https:',
       port: 443
     },

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

@@ -71,6 +71,9 @@ export class PartnerListComponent {
       nzComponentParams: { info: { ...item, enterpriseName: item.enterpriseName || item.contactName }, sourcePage: '合伙人审核列表' },
       nzFooter: null
     });
+    modal.afterClose.subscribe(res => {
+      modal.destroy();
+    });
   }
 
   editTemplateAction(item: any) {
@@ -102,6 +105,7 @@ export class PartnerListComponent {
           .subscribe(res => {
             if (res) {
               this.service.msgSrv.success('修改成功');
+              this.st.load(1);
               this.nzModalService.closeAll();
             }
           });
@@ -161,6 +165,7 @@ export class PartnerListComponent {
             if (res) {
               this.service.msgSrv.success('修改成功');
               this.nzModalService.closeAll();
+              this.st.load(1);
             }
           });
       }
@@ -185,6 +190,7 @@ export class PartnerListComponent {
             } else {
               this.service.msgSrv.warning('发起失败');
             }
+            this.st.load(1);
           });
       }
     });

src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts

@@ -112,6 +112,7 @@ export class PartnerAuditModalComponent implements OnInit {
     };
     this.service
       .request(this.service.$api_audit_partner, {
+        ...params,
         auditStatusEnum: params.auditStatusEnum,
         id: params.id,
         approvalOpinion: params.approvalOpinion,

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

@@ -16,8 +16,8 @@
                 <p style="margin-bottom: 0">{{ detailData?.enterpriseName }}</p>
               </div>
               <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
-                <nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.stateLocked === 0"> </nz-badge>
+                <nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.lockedStatus === 0"> </nz-badge>
-                <nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.stateLocked === 1"></nz-badge>
+                <nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.lockedStatus === 1"></nz-badge>
               </div>
             </div>
             <div nz-row>
@@ -46,12 +46,12 @@
             </ng-container>
             <ng-container *ngIf="detailData?.approvalStatus != 10">
               <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
-                (nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked"
+                (nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.lockedStatus"
                 acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
                 启用
               </button>
               <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
-                (nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked"
+                (nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.lockedStatus"
                 acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
                 冻结
               </button>

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

@@ -117,8 +117,10 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
   freezeOrResume(type: number) {
     this.service.http
       .post(this.service.$api_lock_freight, {
-        id: this.route.snapshot.params.id,
+        appUserId: [this.detailData.appUserId],
-        statedLocked: !!type
+        freezeOrResume: !!type,
+        pageName: '合伙人详情',
+        telephone: this.detailData.adminUserInfo.mobile
       })
       .subscribe(res => {
         if (res.data === true) {
@@ -138,7 +140,7 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
     const modal = this.nzModalService.create({
       nzTitle: '审核',
       nzContent: PartnerAuditModalComponent,
-      nzComponentParams: { info: { ...this.detailData, isPass },sourcePage:'合伙人审核详情'  },
+      nzComponentParams: { info: { ...this.detailData, isPass }, sourcePage: '合伙人审核详情' },
       nzFooter: null
     });
   }

src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html

@@ -16,8 +16,8 @@
                 <p style="margin-bottom: 0">{{ detailData?.adminUserInfo?.name }}</p>
               </div>
               <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
-                <nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.stateLocked === 0"> </nz-badge>
+                <nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.lockedStatus === 0"> </nz-badge>
-                <nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.stateLocked === 1"></nz-badge>
+                <nz-badge nzStatus="error" nzText="冻结" *ngIf="detailData?.lockedStatus === 1"></nz-badge>
               </div>
             </div>
             <div nz-row>
@@ -46,12 +46,12 @@
             </ng-container>
             <ng-container *ngIf="detailData?.approvalStatus != 10">
               <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
-                (nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked"
+                (nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.lockedStatus"
                 acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
                 启用
               </button>
               <button [disabled]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
-                (nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked"
+                (nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.lockedStatus"
                 acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-D-lock']">
                 冻结
               </button>

src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts

@@ -92,8 +92,10 @@ export class PersonalPartnerDetailComponent implements OnInit {
   freezeOrResume(type: number) {
     this.service.http
       .post(this.service.$api_lock_freight, {
-        id: this.route.snapshot.params.id,
+        appUserId: [this.detailData.appUserId],
-        statedLocked: !!type
+        freezeOrResume: !!type,
+        pageName: '合伙人详情',
+        telephone: this.detailData.adminUserInfo.mobile
       })
       .subscribe(res => {
         if (res.data === true) {

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

@@ -38,7 +38,7 @@ export class PartnerListService extends ShipperBaseService {
   // 渠道销售修改详情
   $api_get_partner_change_list = '/api/mdc/partnerChannelRelLog/partnerChannelUpdateDetaiList';
   // 冻结/启用企业业
-  $api_lock_freight = '/api/mdc/cuc/enterpriseInfo/operate/lock';
+  $api_lock_freight = '/api/mdc/cuc/userApp/freezeOrResume';
 
   // 根据地区code查询列表
   $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode';

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

@@ -297,7 +297,7 @@ export class ShipperBaseService extends BaseService {
       map(res => {
         if (res) {
           return res.map((m: any) => {
-            return { label: `${m.employeeVO?.empName}/${m.employeeVO?.mobile}`, value: m.userAppId };
+            return { label: `${m.employeeVO?.empName}/${m.employeeVO?.mobile}`, value: m.id };
           });
         } else {
           return [];