Merge branch 'develop'

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-28 16:08:43
+ * @LastEditTime : 2022-05-05 13:51:19
  * @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/channel-sales/components/edit/edit.component.html

@@ -1,5 +1,5 @@
-<sf #sf [ui]="ui" [schema]="schema" [button]="'none'" [formData]="record">
+  <sf #sf [loading]="service.http.loading" [ui]="ui" [schema]="schema" [button]="'none'" [formData]="record">
-</sf>
+  </sf>
 
 <div *nzModalFooter>
   <button nz-button nzType="default" (click)="close()">取消</button>

src/app/routes/partner/channel-sales/components/list/list.component.ts

@@ -127,11 +127,13 @@ export class ParterChannelSalesListComponent implements OnInit {
           {
             text: '编辑',
             acl: { ability: ['channelSales-edit'] },
+            iif: (item) => {return item.stateLocked == false},
             click: (_record, _modal, _instance) => this.edit(_record),
           },
           {
             text: '冻结',
             acl: { ability: ['channelSales-frozen'] },
+            iif: (item) => {return item.stateLocked == false},
             click: (_record, _modal, _instance) => this.stop(_record),
           }
         ]

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

@@ -66,8 +66,7 @@ const routes: Routes = [
   {
     path: 'channel-sales',
     children: [
-      { path: '', component: ParterChannelSalesListComponent,
+      { path: '', component: ParterChannelSalesListComponent, data: { guard: { ability: ['channelSales-search'] } } },
-      data: { guard: { ability: ['channelSales-search'] } } },
       { path: 'list', component: ParterChannelSalesListComponent },
       { path: 'edit', component: ParterChannelSalesEditComponent }
     ]
@@ -75,10 +74,8 @@ const routes: Routes = [
   {
     path: 'level-config',
     children: [
-      { path: '', component: ParterLevelConfigListComponent,
+      { path: '', component: ParterLevelConfigListComponent, data: { guard: { ability: ['LevelConfig-search'] } } },
-      data: { guard: { ability: ['LevelConfig-search'] } }  },
+      { path: 'list', component: ParterLevelConfigListComponent, data: { guard: { ability: ['LevelConfig-search'] } } },
-      { path: 'list', component: ParterLevelConfigListComponent ,
-      data: { guard: { ability: ['LevelConfig-search'] } } },
       { path: 'edit', component: ParterLevelConfigEditComponent }
     ]
   },
@@ -154,7 +151,7 @@ const routes: Routes = [
   {
     path: 'scrollimg',
     children: [
-      { path: '', component: ScrollImgComponentsListComponent },
+      { path: '', component: ScrollImgComponentsListComponent, data: { guard: { ability: ['scrollimg-search'] } } },
       { path: 'list', component: ScrollImgComponentsListComponent, data: { guard: { ability: ['scrollimg-search'] } } },
       { path: 'detail', component: ScrollimgComponentsAddComponent }
     ]

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-29 16:23:18
+ * @LastEditTime : 2022-05-05 14:04:53
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -155,21 +155,35 @@ export class ParterRebateManageMentAddComponent implements OnInit {
       this.service.msgSrv.warning('请选择合伙人范围！');
       return
     }
+    if(!this.priority) {
+      this.service.msgSrv.warning('请选择优先级！');
+      return
+    }
+    if(!this.sf?.value.ruleDescription) {
+      this.service.msgSrv.warning('请输入规则说明！');
+      return
+    }
+    if(!this.remark) {
+      this.service.msgSrv.warning('请输入备注！');
+      return
+    }
     if(this.partnerType == '3' && this.partnerPeopleList?.length == 0)  {
       this.service.msgSrv.warning('请选择合伙人！');
       return
     }
     let real = false;
+    if(this.configType == '2')  {
     this.table.data.forEach((element: any) => {
       if (element.startAmount > element.endAmount) {
         real = true;
         return;
       }
     });
-    // if (real) {
+  }
-    //   this.service.msgSrv.warning('初始业务量不能超过到达业务量！');
+    if (real) {
-    //   return;
+      this.service.msgSrv.warning('初始业务量不能超过到达业务量！');
-    // }
+      return;
+    }
 
     const params = {
       accountingRate: this.accountingRate,

src/app/routes/sys-setting/components/organization-management/api-auth-modal/api-auth-modal.component.html

@@ -1,12 +1,8 @@
 <nz-card [nzLoading]="loadingInfo" [nzBordered]="false">
-    <se-container se-container="1">
-        <se label="接口权限" required [labelWidth]="120">
     <app-menu-tree #menu (changeData)="getData($event)" [appId]="params.appId"
         [isAuthorityIdDTOList]="roleInfoData.authority || []"
         [authorityAssistId]="roleInfoData.authorityAssistId || []">
     </app-menu-tree>
-        </se>
-    </se-container>
 </nz-card>
 
 <div class="modal-footer">

src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts

@@ -152,9 +152,7 @@ export class ETCInvoicedListComponent implements OnInit {
       { title: '订单号', index: 'billCode', width: 200 },
       {
         title: '开票状态',
-        index: 'invoicingStatus',
+        index: 'invoicingStatusLabel',
-        type: 'enum',
-        enum: { '0': '待开票', '1': '开票中', '2': '已开票', '3': '开票失败' },
         width: 120
       },
       { title: '订单类型', index: 'billTypeLabel', width: 120 },

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

@@ -365,8 +365,8 @@
       <nz-rate [ngModel]="item.evaluateFraction" nzDisabled></nz-rate>
     </sv>
   </sv-container>
-  <nz-divider></nz-divider>
+  <!-- <nz-divider></nz-divider> -->
-  <sv-container col="3" class="mt16">
+  <!-- <sv-container col="3" class="mt16">
     <sv-title>合伙人信息</sv-title>
     <sv label="合伙人名称">
       {{partnerInfo.partnerContactName}}
@@ -376,8 +376,7 @@
         [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"
@@ -387,9 +386,9 @@
       <input nz-input type="text" [(ngModel)]="partnerInfo.settStartTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
         [placeholder]="isEdit?'':'-'">
     </sv>
-  </sv-container>
+  </sv-container> -->
-  <nz-divider></nz-divider>
+  <!-- <nz-divider></nz-divider> -->
-  <sv-container col="3" class="mt16">
+  <!-- <sv-container col="3" class="mt16">
     <sv-title>渠道销售信息</sv-title>
     <sv label="姓名">
       <input nz-input type="text" [(ngModel)]="partnerInfo.channelName" [readonly]="!isEdit" [nzBorderless]="!isEdit"
@@ -403,9 +402,9 @@
       <input nz-input type="text" [(ngModel)]="partnerInfo.enterpriseChannelRelTime" [readonly]="!isEdit"
         [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
     </sv>
-  </sv-container>
+  </sv-container> -->
 </nz-card>
-<nz-card>
+<!-- <nz-card>
   <nz-tabset>
     <nz-tab nzTitle="修改合伙人记录">
       <st #st [data]="service.$api_findEnterpricePartnerRelLog" [columns]="columns"
@@ -432,7 +431,7 @@
       </st>
     </nz-tab>
   </nz-tabset>
-</nz-card>
+</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/list.component.html

@@ -25,7 +25,7 @@
 <!-- [data]="service.$api_get_supplier_page" -->
 <nz-card class="table-box">
   <div class="header_box">
-    <label class="page_title"> <label class="driver">|</label> 预收款余额</label>
+    <label class="page_title"> <label class="driver">|</label> 企业列表</label>
     <div class="mr-sm">
       <button nz-button nzDanger [nzLoading]="loadingList" (click)="openDrawer()" acl
         [acl-ability]="['USERCENTER-FREIGHT-LIST-list']">筛选</button>
@@ -38,12 +38,12 @@
           <li nz-menu-item (click)="creat()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-save']">
             新增企业
           </li>
-          <li nz-menu-item (click)="editPartner()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-partner']">
+          <!-- <li nz-menu-item (click)="editPartner()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-partner']">
             修改合伙人
           </li>
           <li nz-menu-item (click)="editSale()" acl [acl-ability]="['USERCENTER-FREIGHT-LIST-sale']">
             修改渠道销售
-          </li>
+          </li> -->
         </ul>
       </nz-dropdown-menu>
     </div>
@@ -51,7 +51,7 @@
 
 
   <st #st [columns]="columns" [data]='service.$api_get_freight_list' [req]="{  process: beforeReq }"
-    [res]="{  process: dataProcess }" [scroll]="{ x: '1200px' }" [page]=" {}" [loading]="loadingList">
+    [res]="{  process: dataProcess }" [scroll]="{ x: '1200px',y:scrollY }" [page]=" {}" [loading]="loadingList">
     <ng-template st-row="enterpriseName" let-item let-index="index">
       <label>{{ item.enterpriseName }}</label><br>
       <ng-container *ngIf="item.score!==null; else billEvaluateelseTemplate">

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

@@ -467,14 +467,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen
             text: '分配客服人员',
             click: item => this.showService(item)
           },
-          {
+          // {
-            text: '修改合伙人',
+          //   text: '修改合伙人',
-            click: item => this.editPartner(item)
+          //   click: item => this.editPartner(item)
-          },
+          // },
-          {
+          // {
-            text: '修改渠道销售',
+          //   text: '修改渠道销售',
-            click: item => this.editSale(item)
+          //   click: item => this.editSale(item)
-          }
+          // }
         ]
       }
     ];

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

@@ -43,8 +43,6 @@ export class RebateTableComponent implements OnInit {
       this.data = [
         {
           gradeConfigId: '0',
-          startAmount: 0,
-          endAmount: 0,
           managementFeeRatio: 0,
         }
       ];