Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Taric Xin
2022-04-26 16:20:13 +08:00
parent ba1c5115c0 cabc2b0285
commit eda2549643
4 changed files with 105 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,19 +4,28 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-02-24 20:09:49 * @Date : 2022-02-24 20:09:49
* @LastEditors : Shiming * @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 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * 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> <nz-card>
<!-- 数据列表 --> <!-- 数据列表 -->
<sv-container col="1"> <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-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-title>业务量和管理费比例配置</sv-title>
@ -28,53 +37,77 @@
</sv> </sv>
<sv col="1"> <sv col="1">
<div style='width: 850px'> <div style="width: 850px">
<app-rebate-table #table [(data)]='tabelData'></app-rebate-table> <app-rebate-table #table [(data)]="tabelData"></app-rebate-table>
</div> </div>
</sv> </sv>
<sv-title>关联合伙人配置</sv-title> <sv-title>关联合伙人配置</sv-title>
<sv label="合伙人选择"> <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="1" nzLabel="全部合伙人"></nz-option>
<nz-option nzValue="2" nzLabel="新注册合伙人"></nz-option> <nz-option nzValue="2" nzLabel="新注册合伙人"></nz-option>
<nz-option nzValue="3" nzLabel="自定义合伙人"></nz-option> <nz-option nzValue="3" nzLabel="自定义合伙人"></nz-option>
</nz-select> </nz-select>
<span *ngIf="addStatus" style="padding-left: 15px; color: #0000FF;" (click)="add()">添加</span> <span *ngIf="addStatus" style="padding-left: 15px; color: #0000ff" (click)="add()">添加</span>
<st *ngIf="partnerPeopleList?.length > 0" #st [data]="partnerPeopleList" [columns]="columns" <st
*ngIf="partnerPeopleList?.length > 0"
#st
[data]="partnerPeopleList"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' } }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' } }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100] }" [loading]="false" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100] }"
[scroll]="{ x: '1000' }"> [loading]="false"
[scroll]="{ x: '1000' }"
>
</st> </st>
</sv> </sv>
<sv label="优先级" col="1"> <sv label="优先级" col="1">
<nz-select [(ngModel)]="priority" [disabled]="hiden" style="max-width: 400px; min-width: 200px;margin-left: 28px;"> <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="1" nzLabel="1">1</nz-option>
<nz-option nzValue=2 nzLabel="2">2</nz-option> <nz-option nzValue="2" nzLabel="2">2</nz-option>
<nz-option nzValue=3 nzLabel="3">3</nz-option> <nz-option nzValue="3" nzLabel="3">3</nz-option>
<nz-option nzValue=4 nzLabel="4">4</nz-option> <nz-option nzValue="4" nzLabel="4">4</nz-option>
<nz-option nzValue=5 nzLabel="5">5</nz-option> <nz-option nzValue="5" nzLabel="5">5</nz-option>
</nz-select> </nz-select>
</sv> </sv>
<sv label="规则说明" col="1"> <sv label="规则说明" col="1">
<sf #sf mode="edit" [disabled]="hiden" [formData]="formData" [schema]="schema1" [ui]="{ '*': { spanLabelFixed: 10, grid: { span: 16 }} }" <sf
button="none"> </sf> #sf
mode="edit"
[disabled]="hiden"
[formData]="formData"
[schema]="schema1"
[ui]="{ '*': { spanLabelFixed: 10, grid: { span: 16 } } }"
button="none"
>
</sf>
</sv> </sv>
<sv label="备注" col="1" style="margin-top: 16px;"> <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> <textarea
[disabled]="hiden"
style="max-width: 400px; min-width: 200px; margin-left: 40px"
rows="4"
nz-input
[(ngModel)]="remarke"
></textarea>
</sv> </sv>
</sv-container> </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" (click)="goBack()">取消</button>
<button nz-button nzType="primary" style="margin-left: 48px" (click)="save()" <button nz-button nzType="primary" style="margin-left: 48px" (click)="save()" acl [acl-ability]="['SUPPLY-VEHICLE-AMEND-submitChange']"
acl [acl-ability]="['SUPPLY-VEHICLE-AMEND-submitChange']">提交</button >提交</button
> >
</div> </div>
</nz-card> </nz-card>

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

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-03-21 09:26:45 * @Date : 2022-03-21 09:26:45
* @LastEditors : Shiming * @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 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -196,4 +196,5 @@ export class ParterRebateManageMentAddComponent implements OnInit {
this.addStatus = false; this.addStatus = false;
} }
} }
} }

5
src/app/routes/partner/system-config/components/config/config.component.html
View File

@ -170,7 +170,9 @@
<nz-radio-group [(ngModel)]="everyDay" style="display: block;" > <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> <label nz-radio [nzValue]="1" class="mt-sm">每天<span style="margin-left: 30px; color: #0200ff; cursor: pointer;">添加时间段</span></label>
</nz-radio-group> </nz-radio-group>
<div style="display: flex;"> <br />
<div >
<div>
<nz-time-picker [(ngModel)]="time" [nzDefaultOpenValue]="defaultOpenValue"></nz-time-picker>--<nz-time-picker <nz-time-picker [(ngModel)]="time" [nzDefaultOpenValue]="defaultOpenValue"></nz-time-picker>--<nz-time-picker
[(ngModel)]="time" [(ngModel)]="time"
[nzDefaultOpenValue]="defaultOpenValue" [nzDefaultOpenValue]="defaultOpenValue"
@ -183,6 +185,7 @@
></nz-time-picker> ></nz-time-picker>
</div> </div>
</div> </div>
</div>
</div> </div>

14
src/app/routes/usercenter/components/freight/list/list.component.html
View File

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