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

2022-04-26 16:20:13 +08:00
parent ba1c5115c0 cabc2b0285
commit eda2549643
4 changed files with 105 additions and 64 deletions
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
+++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
@ -4,77 +4,110 @@
 * @Author       : Shiming
 * @Date         : 2022-02-24 20:09:49
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-26 14:04:41
+ * @LastEditTime : 2022-04-26 15:50:41
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
-<page-header-wrapper [title]="titleText"> </page-header-wrapper>
+<page-header-wrapper [title]="titleText" [logo]="logo"
+  ><ng-template #logo>
+    <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
+      <i nz-icon nzType="left" nzTheme="outline"></i>
+    </button>
+  </ng-template>
+</page-header-wrapper>
 <nz-card>
  <!-- 数据列表 -->
  <sv-container col="1">
-    <sv label="配置名称">  <input style="max-width: 400px;" nz-input placeholder="请输入" [disabled]="hiden"  [(ngModel)]="configName" /></sv>
+    <sv label="配置名称"> <input style="max-width: 400px" nz-input placeholder="请输入" [disabled]="hiden" [(ngModel)]="configName" /></sv>

    <sv-title>固定结算费率配置</sv-title>

-   <sv label="固定结算费率"> <nz-input-number [disabled]="hiden"  [(ngModel)]="accountingRate" [nzPrecision]="precision" nzPlaceHolder="请输入"></nz-input-number>&nbsp;%</sv>
+    <sv label="固定结算费率">
+      <nz-input-number [disabled]="hiden" [(ngModel)]="accountingRate" [nzPrecision]="precision" nzPlaceHolder="请输入"></nz-input-number
+      >&nbsp;%</sv
+    >

    <sv-title>业务量和管理费比例配置</sv-title>

    <sv label="选择配置类型">
-    <nz-radio-group [(ngModel)]="configType" [disabled]="hiden" >
+      <nz-radio-group [(ngModel)]="configType" [disabled]="hiden">
        <label nz-radio nzValue="1">按全部等级配置</label>
        <label nz-radio nzValue="2">按不同等级配置</label>
      </nz-radio-group>
    </sv>

-    <sv col="1" >
-      <div style='width: 850px'>
-        <app-rebate-table  #table [(data)]='tabelData'></app-rebate-table>
+    <sv col="1">
+      <div style="width: 850px">
+        <app-rebate-table #table [(data)]="tabelData"></app-rebate-table>
      </div>
    </sv>

    <sv-title>关联合伙人配置</sv-title>

    <sv label="合伙人选择">
-    <nz-select [(ngModel)]="partnerType" [disabled]="hiden" (ngModelChange)="changePartner(partnerType)" style="max-width: 400px; min-width: 200px;">
+      <nz-select
+        [(ngModel)]="partnerType"
+        [disabled]="hiden"
+        (ngModelChange)="changePartner(partnerType)"
+        style="max-width: 400px; min-width: 200px"
+      >
        <nz-option nzValue="1" nzLabel="全部合伙人"></nz-option>
        <nz-option nzValue="2" nzLabel="新注册合伙人"></nz-option>
        <nz-option nzValue="3" nzLabel="自定义合伙人"></nz-option>
      </nz-select>
-    <span *ngIf="addStatus" style="padding-left: 15px; color: #0000FF;" (click)="add()">添加</span>
-    <st  *ngIf="partnerPeopleList?.length > 0" #st [data]="partnerPeopleList" [columns]="columns"
+      <span *ngIf="addStatus" style="padding-left: 15px; color: #0000ff" (click)="add()">添加</span>
+      <st
+        *ngIf="partnerPeopleList?.length > 0"
+        #st
+        [data]="partnerPeopleList"
+        [columns]="columns"
        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' } }"
        [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
-    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100] }" [loading]="false"
-    [scroll]="{ x: '1000' }">
+        [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100] }"
+        [loading]="false"
+        [scroll]="{ x: '1000' }"
+      >
      </st>
    </sv>

    <sv label="优先级" col="1">
-    <nz-select [(ngModel)]="priority" [disabled]="hiden"  style="max-width: 400px; min-width: 200px;margin-left: 28px;">
-      <nz-option nzValue=1 nzLabel="1">1</nz-option>
-      <nz-option nzValue=2 nzLabel="2">2</nz-option>
-      <nz-option nzValue=3 nzLabel="3">3</nz-option>
-      <nz-option nzValue=4 nzLabel="4">4</nz-option>
-      <nz-option nzValue=5 nzLabel="5">5</nz-option>
+      <nz-select [(ngModel)]="priority" [disabled]="hiden" style="max-width: 400px; min-width: 200px; margin-left: 28px">
+        <nz-option nzValue="1" nzLabel="1">1</nz-option>
+        <nz-option nzValue="2" nzLabel="2">2</nz-option>
+        <nz-option nzValue="3" nzLabel="3">3</nz-option>
+        <nz-option nzValue="4" nzLabel="4">4</nz-option>
+        <nz-option nzValue="5" nzLabel="5">5</nz-option>
      </nz-select>
    </sv>

-   <sv label="规则说明" col="1" >
-    <sf #sf mode="edit" [disabled]="hiden"  [formData]="formData" [schema]="schema1" [ui]="{ '*': { spanLabelFixed: 10, grid: { span: 16 }} }"
-    button="none"> </sf>
+    <sv label="规则说明" col="1">
+      <sf
+        #sf
+        mode="edit"
+        [disabled]="hiden"
+        [formData]="formData"
+        [schema]="schema1"
+        [ui]="{ '*': { spanLabelFixed: 10, grid: { span: 16 } } }"
+        button="none"
+      >
+      </sf>
    </sv>

-   <sv label="备注" col="1" style="margin-top: 16px;">
-    <textarea [disabled]="hiden"  style="max-width: 400px; min-width: 200px;margin-left: 40px;" rows="4" nz-input [(ngModel)]="remarke"></textarea>
+    <sv label="备注" col="1" style="margin-top: 16px">
+      <textarea
+        [disabled]="hiden"
+        style="max-width: 400px; min-width: 200px; margin-left: 40px"
+        rows="4"
+        nz-input
+        [(ngModel)]="remarke"
+      ></textarea>
    </sv>
-
  </sv-container>

- <div class="align-center" style="margin-top: 15px;" *ngIf="!hiden">
+  <div class="align-center" style="margin-top: 15px" *ngIf="!hiden">
    <button nz-button nzType="primary" (click)="goBack()">取消</button>
-  <button  nz-button nzType="primary" style="margin-left: 48px" (click)="save()"
-  acl  [acl-ability]="['SUPPLY-VEHICLE-AMEND-submitChange']">提交</button
+    <button nz-button nzType="primary" style="margin-left: 48px" (click)="save()" acl [acl-ability]="['SUPPLY-VEHICLE-AMEND-submitChange']"
+      >提交</button
    >
-</div>
+  </div>
 </nz-card>
--- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
+++ b/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 11:04:46
+ * @LastEditTime : 2022-04-26 15:51:04
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -196,4 +196,5 @@ export class ParterRebateManageMentAddComponent implements OnInit {
      this.addStatus = false;
    }
  }
+ 
 }
--- a/src/app/routes/partner/system-config/components/config/config.component.html
+++ b/src/app/routes/partner/system-config/components/config/config.component.html
@ -170,7 +170,9 @@
    <nz-radio-group [(ngModel)]="everyDay" style="display: block;" >
        <label nz-radio  [nzValue]="1" class="mt-sm">每天<span style="margin-left: 30px; color: #0200ff; cursor: pointer;">添加时间段</span></label>
        </nz-radio-group>
-        <div style="display: flex;">
+        <br />
+        <div >
+          <div>
            <nz-time-picker [(ngModel)]="time" [nzDefaultOpenValue]="defaultOpenValue"></nz-time-picker>--<nz-time-picker
              [(ngModel)]="time"
              [nzDefaultOpenValue]="defaultOpenValue"
@ -183,6 +185,7 @@
            ></nz-time-picker>
          </div>
          </div>
+   </div>

     </div>

--- a/src/app/routes/usercenter/components/freight/list/list.component.html
+++ b/src/app/routes/usercenter/components/freight/list/list.component.html
@ -33,7 +33,7 @@
    </div>
  </div>
 </nz-card>
-<nz-card [nzExtra]="extraTemplate" >
+<nz-card [nzExtra]="extraTemplate">
  <!-- 数据列表 -->
  <!-- [data]="service.$api_get_supplier_page" -->

@ -58,11 +58,13 @@
      {{ item.contacter }}<br>/{{item.mobile}}
    </ng-template>
    <ng-template st-row="partnerName" let-item let-index="index">
-      {{ item.partnerName }}<br>/{{item.promotersTelephone}}
+      {{ item.partnerName }}<br>/{{item.partnerMobile}}
    </ng-template>
    <ng-template st-row="promotersTelephone" let-item let-index="index">
-      <a acl [acl-ability]="['USERCENTER-FREIGHT-LIST-salesman']" (click)="addPromoter(item)">{{ item.promotersTelephone
-        || '添加' }}</a>
+      <!-- <a acl [acl-ability]="['USERCENTER-FREIGHT-LIST-salesman']" (click)="addPromoter(item)">{{ item.channelName
+        }}<br>{{ item.channelMobile
+        || '添加' }}</a> -->
+      {{ item.channelName }}<br>{{ item.channelMobile }}
    </ng-template>
  </st>
 </nz-card>
@ -78,7 +80,9 @@
 </ng-template>
 <ng-template #extraTemplate>
  <div>
-    <button nz-button nzType="primary" (click)="editPartner()"  acl  [acl-ability]="['ORDER-RISK-batchAudit']"> 修改合伙人 </button>
-    <button nz-button nzType="primary" (click)="editSale()"  acl  [acl-ability]="['ORDER-RISK-batchAudit']"> 修改渠道销售 </button>
+    <button nz-button nzType="primary" (click)="editPartner()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 修改合伙人
+    </button>
+    <button nz-button nzType="primary" (click)="editSale()" acl [acl-ability]="['ORDER-RISK-batchAudit']"> 修改渠道销售
+    </button>
  </div>
 </ng-template>