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-04-25 10:32:29
+ * @LastEditTime : 2022-04-27 11:21:30
  * @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/partner/partner-routing.module.ts

@@ -49,7 +49,6 @@ import { BannerComponentsAddComponent } from './knowledge/banner/components/add/
 import { PersonalPartnerDetailComponent } from './partner-list/components/personal-partner-detail/personal-partner-detail.component';
 import { ParterAdviceFeedbackListComponent } from './advice-feedback/components/list/list.component';
 import { ParterAdviceFeedbackDetailComponent } from './advice-feedback/components/feedback-detail/feedback-detail.component';
-import { PartnerSystemConfigComponent } from './system-config/components/config/config.component';
 
 const routes: Routes = [
   {
@@ -153,12 +152,6 @@ const routes: Routes = [
       { path: 'record/detail/:id', component: PartnerRecordedDetailComponent }
     ]
   },
-  {
-    path: 'config',
-    children: [
-      { path: '', component: PartnerSystemConfigComponent },
-    ]
-  },
   {
     path: 'knowledge',
     children: [

src/app/routes/partner/partner.module.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-09 14:34:55
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-20 15:45:20
+ * @LastEditTime : 2022-04-27 11:28:31
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\partner.module.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -63,7 +63,6 @@ import { ParterAdviceFeedbackListComponent } from './advice-feedback/components/
 import { ParterAdviceFeedbackDetailComponent } from './advice-feedback/components/feedback-detail/feedback-detail.component';
 import { ParterRebateManageMentAddPartnerListComponent } from './rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component';
 import { ChannelLogModalComponent } from './partner-list/components/channel-log-modal/channel-log-modal.component';
-import { PartnerSystemConfigComponent } from './system-config/components/config/config.component';
 
 const COMPONENTS: any[] = [
   PartnerBusinessStatisticsIndexComponent,
@@ -117,7 +116,6 @@ const COMPONENTS: any[] = [
   ParterAdviceFeedbackDetailComponent,
   ParterRebateManageMentAddPartnerListComponent,
   ChannelLogModalComponent,
-  PartnerSystemConfigComponent
 ];
 
 @NgModule({

src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-28 14:53:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-22 10:30:33
+ * @LastEditTime : 2022-04-27 14:12:45
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add-partnerlist\\add-partnerlist.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -25,6 +25,5 @@
         [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false"
         [scroll]="{ x: '1000' }">
       </st>
-    <button style="float: right;" *ngIf="selectedIndex===0" (click)="batchReply()" nz-button nzType="primary" acl
+    <button style="float: right;" *ngIf="selectedIndex===0" (click)="batchReply()" nz-button nzType="primary">批量选择</button>
-      [acl-ability]="['AbnormalAppear-batchReply']">批量选择</button>
 </nz-card>

src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts

@@ -55,7 +55,6 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit {
         {
           text: '添加',
           click: _record => this.add(_record),
-          acl: { ability: ['AbnormalAppear-reply'] }
         }
       ]
     }

src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-26 20:44:56
+ * @LastEditTime : 2022-04-27 13:38:57
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -102,7 +102,7 @@
         style="max-width: 400px; min-width: 200px; margin-left: 40px"
         rows="4"
         nz-input
-        [(ngModel)]="remarke"
+        [(ngModel)]="remark"
       ></textarea>
     </sv>
   </sv-container>

src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-21 09:26:45
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-26 21:06:50
+ * @LastEditTime : 2022-04-27 13:44:19
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -31,7 +31,7 @@ export class ParterRebateManageMentAddComponent implements OnInit {
   hiden: boolean = false;
   configName: string = '';
   partnerType: string = '';
-  remarke: string = '';
+  remark: string = '';
   accountingRate: Number = 0;
   priority: string = '';
   partnerPeopleList: any = [];
@@ -50,7 +50,7 @@ export class ParterRebateManageMentAddComponent implements OnInit {
     private modal: NzModalService,
     public shipperservice: ShipperBaseService
   ) {}
-  columns: STColumn[] =[]
+  columns: STColumn[] = [];
   initSF(data?: any) {
     this.schema1 = {
       properties: {
@@ -59,7 +59,6 @@ export class ParterRebateManageMentAddComponent implements OnInit {
           title: '',
           disabled: this.hiden,
           ui: {
-            
             widget: 'tinymce',
             loadingTip: 'loading...',
             config: {
@@ -89,7 +88,7 @@ export class ParterRebateManageMentAddComponent implements OnInit {
             text: '移除',
             click: _record => this.delete(_record),
             iif: () => {
-              return !this.hiden
+              return !this.hiden;
             },
             acl: { ability: ['AbnormalAppear-reply'] }
           }
@@ -99,8 +98,8 @@ export class ParterRebateManageMentAddComponent implements OnInit {
   }
   ngOnInit() {
     if (this.ar.snapshot?.queryParams?.id) {
-      this.titleText= '查看'
+      this.titleText = '查看';
-      this.hiden= true
+      this.hiden = true;
       this.initSF();
       this.initData(this.ar.snapshot?.queryParams?.id);
     }
@@ -144,27 +143,34 @@ export class ParterRebateManageMentAddComponent implements OnInit {
     });
   }
   save() {
-    console.log(this.configName);
+    if(!this.configName) {
-    // if(!this.configName) {
+      this.service.msgSrv.warning('请输入配置名称！');
-    //   this.service.msgSrv.warning('请输入配置名称！');
+      return
-    //   return
+    }
-    // }
+    if(!this.accountingRate) {
-    // if(!this.accountingRate) {
+      this.service.msgSrv.warning('请输入固定结算费率！');
-    //   this.service.msgSrv.warning('请输入固定结算费率！');
+      return
-    //   return
+    }
-    // }
+    if(!this.partnerType) {
-    // if(!this.partnerType) {
+      this.service.msgSrv.warning('请选择合伙人范围！');
-    //   this.service.msgSrv.warning('请选择合伙人范围！');
+      return
-    //   return
+    }
-    // }
+    if(this.partnerType == '3' && this.partnerPeopleList?.length == 0)  {
-    // if(this.partnerType == '3' && this.partnerPeopleList?.length == 0)  {
+      this.service.msgSrv.warning('请选择合伙人！');
-    //   this.service.msgSrv.warning('请选择合伙人！');
+      return
-    //   return
+    }
-    // }
+    let real = false;
     this.table.data.forEach((element: any) => {
-        console.log(element);
+      if (element.startAmount > element.endAmount) {
-        
+        real = true;
+        return;
+      }
     });
+    if (real) {
+      this.service.msgSrv.warning('初始业务量不能超过到达业务量！');
+      return;
+    }
+
     const params = {
       accountingRate: this.accountingRate,
       configName: this.configName,
@@ -173,15 +179,15 @@ export class ParterRebateManageMentAddComponent implements OnInit {
       priority: this.priority, // 优先级
       partnerIds: this.partnerId,
       ruleDescription: this.sf.value.ruleDescription,
-      remarke: this.remarke,
+      remark: this.remark,
       partnerType: this.partnerType
     };
-    // this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => {
+    this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => {
-    //   if (res) {
+      if (res) {
-    //     this.service.msgSrv.success('新增成功！');
+        this.service.msgSrv.success('新增成功！');
-    //     this.router.navigate(['/partner/rebate/setting']);
+        this.router.navigate(['/partner/rebate/setting']);
-    //   }
+      }
-    // });
+    });
   }
   initData(id: string) {
     this.service.request(this.service.$api_get_getPartnerRebateConfigInfo, { id: id }).subscribe((res: any) => {
@@ -195,9 +201,9 @@ export class ParterRebateManageMentAddComponent implements OnInit {
         this.partnerPeopleList = res?.partnerListVOs;
         this.priority = res?.priority + '';
         this.formData = { ruleDescription: res?.ruleDescription };
-        this.remarke = res.remark;
+        this.remark = res.remark;
       }
-    })
+    });
   }
   changePartner(value: any) {
     if (value == '3') {
@@ -206,5 +212,4 @@ export class ParterRebateManageMentAddComponent implements OnInit {
       this.addStatus = false;
     }
   }
- 
 }

src/app/routes/partner/system-config/services/config.service.ts

@@ -1,12 +0,0 @@
-import { Injectable, Injector } from '@angular/core';
-import { BaseService } from '@shared';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class ConfigService extends BaseService {
-
-  constructor(public injector: Injector) {
-    super(injector);
-  }
-}

src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-04-21 13:49:22
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-27 10:56:40
+ * @LastEditTime : 2022-04-27 11:29:10
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\basic-setting\\basic-setting.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->

src/app/routes/sys-setting/components/config/config.component.html

@@ -1,4 +1,3 @@
-<nz-card>
   <div nz-row [nzGutter]="8">
     <div nz-col nzSpan="20" style="overflow: scroll">
       <nz-card class="card-height" [nzBordered]="null" nzSize="small" *ngIf="selectedTab === 0">
@@ -72,7 +71,6 @@
       </div>
     </div>
   </div>
-</nz-card>
 
 <ng-template #auditTimes let-data="data" let-title="title">
   <div *ngIf="auditTimeStatus" >

src/app/routes/sys-setting/components/config/config.component.ts

@@ -2,8 +2,8 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { SFComponent, SFSchema, SFUploadWidgetSchema } from '@delon/form';
 import { NzUploadFile } from 'ng-zorro-antd/upload';
 import { Observable, Observer, of } from 'rxjs';
-import { ConfigService } from '../../services/config.service';
 import { apiConf } from '@conf/api.conf';
+import { SystemService } from '../../services/system.service';
 const IMAGECONFIG = {
   previewFile: (file: NzUploadFile) => of(file.url),
   action: apiConf.waterFileUpload,
@@ -95,7 +95,7 @@ export class PartnerSystemConfigComponent implements OnInit {
   //   showRequired: true
   // };
  
-  constructor(private service: ConfigService) {}
+  constructor(private service: SystemService) {}
 
   ngOnInit() {
     this.initSF();

src/app/routes/sys-setting/sys-setting.module.ts

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-12-03 15:23:05
- * @LastEditTime : 2022-03-09 14:08:38
+ * @LastEditTime : 2022-04-27 11:28:48
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting.module.ts
@@ -38,6 +38,7 @@ import { OrganizationManagementComponent } from './components/organization-manag
 import { OrganizationModalComponent } from './components/organization-management/organization-modal/organization-modal.component';
 import { ApiAuthModalComponent } from './components/organization-management/api-auth-modal/api-auth-modal.component';
 import { MenuTreeComponent } from './components/organization-management/menu-tree/menu-tree.component';
+import { PartnerSystemConfigComponent } from './components/config/config.component';
 
 const COMPONENTS = [
   StaffManagementComponent,
@@ -57,7 +58,8 @@ const COMPONENTS = [
   InsuranceSetComponent,
   NoTeManagementComponent,
   SmsTemplateComponent,
-  OrganizationManagementComponent
+  OrganizationManagementComponent,
+  PartnerSystemConfigComponent
 ];
 const NOTROUTECOMPONENTS = [
   BuyerTranspowerComponent,

src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts

@@ -247,7 +247,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
           enum: [
             { label: '全部', value: '' },
             { label: '整车', value: '1' },
-            { label: '大宗', value: '2' }
+            { label: '大宗', value: '2' },
           ],
           ui: {
             widget: 'select',
@@ -305,7 +305,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
       { title: '订单完成日期', index: 'billfinTime', type: 'date', width: 150 },
       { title: '开票状态', index: 'vatappStsLabel', width: 100 },
       { title: '所属项目', index: 'projectIdName', width: 140 },
-      { title: '订单类型', index: 'billType', width: 100, type: 'enum', enum: { 1: '整车', 2: '大宗' } },
+      { title: '订单类型', index: 'billTypeLabel', width: 100,},
       { title: '装货地', index: 'loadingfrom', width: 220 },
       { title: '卸货地', index: 'loadingto', width: 220 },
       { title: '货物信息', index: 'goodsinfo', width: 150 },

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(){

src/app/shared/components/rebate-table/rebate-table.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-25 20:18:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-26 20:46:19
+ * @LastEditTime : 2022-04-27 14:09:04
  * @FilePath     : \\tms-obc-web\\src\\app\\shared\\components\\rebate-table\\rebate-table.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -20,8 +20,8 @@
                 <tr>
                     <th rowspan="2" nzWidth="60px" nzAlign="center" nzLeft>序号</th>
                     <th nzWidth="220px" nzAlign="center" >合伙人等级</th>
-                    <th nzWidth="160px" nzAlign="center" >初始业务量（万/月）</th>
+                    <th nzWidth="160px" *ngIf="type == '2'"  nzAlign="center" >初始业务量（万/月）</th>
-                    <th nzWidth="160px" nzAlign="center" >到达业务量（万/月）</th>
+                    <th nzWidth="160px" *ngIf="type == '2'"  nzAlign="center" >到达业务量（万/月）</th>
                     <th nzWidth="160px" nzAlign="center" >管理费比例%</th>
                     <th rowspan="2" nzWidth="60px" nzAlign="center" nzRight *ngIf="type == '2'">操作</th>
                 </tr>
@@ -45,7 +45,7 @@
                             </nz-select>
                         </div>
                     </td>
-                    <td nzWidth="160px" nzAlign="center" >
+                    <td nzWidth="160px" nzAlign="center" *ngIf="type == '2'" >
                         <div   >
                             <nz-input-group  nzPrefix="=" >
                             <nz-input-number nzPrefix="=" [(ngModel)]="item.startAmount" [nzMin]="0" [nzMax]="99999999"nzSize="small"  (ngModelChange)="changeendAmount($event,i)"
@@ -55,7 +55,7 @@
                      
                         </div>
                     </td>
-                    <td nzWidth="160px" nzAlign="center" >
+                    <td nzWidth="160px" nzAlign="center" *ngIf="type == '2'"  >
                         <div   >
                             <nz-input-group  nzPrefix="＜">
                             <nz-input-number [(ngModel)]="item.endAmount" [nzMin]="0" [nzMax]="99999999" nzSize="small" >
@@ -64,15 +64,16 @@
                         </div>
                     </td>
                     <td nzWidth="160px" nzAlign="center" >
-                        <div >
+                        <div class="three" style="text-align: center;">
                             <nz-input-group [nzAddOnAfter]="addOnAfterTemplate2">
                             <nz-input-number [(ngModel)]="item.managementFeeRatio" [nzMin]="0"  [nzMax]="100"nzSize="small" 
                                >
-                            </nz-input-number>
-                        </nz-input-group>
                                <ng-template #addOnAfterTemplate2>
                                 <span >%</span>
                             </ng-template>
+                            </nz-input-number>
+                            </nz-input-group>
+                       
                         </div>
                     </td>
                     <td nzWidth="60px" nzAlign="center" nzRight *ngIf="type == '2'">

src/app/shared/components/rebate-table/rebate-table.component.less

@@ -18,5 +18,8 @@
     .ant-input-affix-wrapper {
         border: none
     }
+    .three .ant-input-affix-wrapper {
+        width: 50% !important;
+    }
     
 }