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:
wangshiming
2022-04-21 16:43:44 +08:00
parent 082ea67ac7 fdab52cd5a
commit d543764df1
8 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy.conf.js
View File

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

15
src/app/routes/datatable/components/dataindex/dataindex.component.ts
View File

@ -337,15 +337,16 @@ export class DatatableDataindexComponent implements OnInit {
const chart = new Chart({
container: el,
autoFit: true,
height: 400,
height: 400
});
chart.data(data);
// 设置坐标轴
chart.scale({
pre: { alias: '同期业绩完成率', min: 0, max: 1 },
pre2: { min: 0, max: 1 },
quantity: { min: 0, max: 1000000 },
pre: { alias: '同期业绩完成率', min: 0, max: 1, formatter: val => val * 100 + '%' },
pre2: { alias: '业绩完成率', min: 0, max: 1, formatter: val => val * 100 + '%' },
quantity: { alias: '业绩量 (万)', min: 0, max: 1000000 }
});
// 设置
chart.legend({
custom: true,
items: [
@ -358,9 +359,7 @@ export class DatatableDataindexComponent implements OnInit {
grid: null,
title: null,
label: {
formatter: val => {
return +val * 100 + '%';
}
formatter: val => +val * 100 + '%'
}
});
chart.axis('pre2', false);

2
src/app/routes/partner/partner-list/components/index/partner-list.component.html
View File

@ -58,7 +58,7 @@
<textarea rows="3" nz-input [(ngModel)]="cannelItem.remark"></textarea>
</se>
<se label="一并转移的客户">
<p style="margin-top: 8px">已选（0）</p>
<p style="margin-top: 8px">已选（{{selectedRows?.length}}）</p>
<st #rest [data]="service.$api_get_enterprice_rel_list" [columns]="[
{ title: '', index: 'key', type: 'checkbox' },
{ title: '客户名称', index: 'enterpriceName' }

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

@ -379,12 +379,13 @@ export class PartnerListComponent {
return [
{
title: '合伙人名称',
index: 'contactName',
width: 180
index: 'enterpriseName',
width: 180,
format: item => (item.partnerType ? `${item.enterpriseName || item.contactName}` : '')
},
{ title: '付款编码', index: 'payCode', width: 160 },
{ title: '邀请码', index: 'invitationCode', className: 'text-center', width: 130 },
{ title: '企业管理员', index: 'adminName', width: 150 },
{ title: '企业管理员', index: 'contactName', width: 150, format: item => (item.partnerType ? `${item.contactName}` : '') },
{ title: '手机号', index: 'contactMobile', className: 'text-center', width: 150 },
{ title: '类型', index: 'partnerType', className: 'text-center', width: 130, type: 'enum', enum: { 1: '企业', 2: '个人' } },
{ title: '注册渠道', index: 'source', type: 'enum', enum: { 1: '合伙人注册', 2: '平台添加' }, width: 130 },

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

@ -123,7 +123,7 @@
</sv>
<sv label="身份证有效期" col="1">
<nz-date-picker [(ngModel)]="detailData.adminUserInfo.validStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
[nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
[nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 140px" class="calendar">
</nz-date-picker>
-
<ng-container
@ -131,7 +131,7 @@
<label style="padding-left: 11px">长期</label>
</ng-container>
<nz-date-picker [(ngModel)]="detailData.adminUserInfo.validEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
[nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
[nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 140px" class="calendar">
</nz-date-picker>
<ng-container *ngIf="isEdit">
<label nz-checkbox [ngModel]="!!!detailData.adminUserInfo.validEndTime"
@ -214,7 +214,7 @@
</sv>
<sv label="身份证有效期" col="1">
<nz-date-picker [(ngModel)]="detailData.legalPersonIdentity.validStartTime" [nzDisabled]="!isEdit"
nzPlaceHolder=" " [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px"
nzPlaceHolder=" " [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 140px"
class="calendar"></nz-date-picker>
-
<ng-container
@ -222,7 +222,7 @@
<label style="padding-left: 11px">长期</label>
</ng-container>
<nz-date-picker [(ngModel)]="detailData.legalPersonIdentity.validEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
[nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
[nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 140px" class="calendar">
</nz-date-picker>
<ng-container *ngIf="isEdit">
<label nz-checkbox [ngModel]="!!!detailData.legalPersonIdentity.validEndTime"

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

@ -97,7 +97,7 @@
</sv>
<sv label="身份证有效期" col="1">
<nz-date-picker [(ngModel)]="detailData.adminUserInfo.validStartTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
[nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
[nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 140px" class="calendar">
</nz-date-picker>
-
<ng-container
@ -105,7 +105,7 @@
<label style="padding-left: 11px">长期</label>
</ng-container>
<nz-date-picker [(ngModel)]="detailData.adminUserInfo.validEndTime" [nzDisabled]="!isEdit" nzPlaceHolder=" "
[nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 100px" class="calendar">
[nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''" style="width: 140px" class="calendar">
</nz-date-picker>
<ng-container *ngIf="isEdit">
<label nz-checkbox [ngModel]="!!!detailData.adminUserInfo.validEndTime"

2
src/app/routes/partner/partner-list/services/partner-list.service.ts
View File

@ -31,7 +31,7 @@ export class PartnerListService extends ShipperBaseService {
// 查询合伙人修改渠道渠道销售记录
$api_get_personal_channel_list = '/api/mdc/partnerChannelRelLog/list/page';
// 查询客户关系列表-不分页
$api_get_enterprice_rel_list = '/api/mdc/EnterpriseRelLog/list';
$api_get_enterprice_rel_list = '/api/mdc/enterpriseRelLog/list';
// 校验合伙人是否可修改渠道销售 true:可以修改 false：不可以修改
$api_check_partenr_change_channel = '/api/mdc/partner/updateChannelCheck';
// 根据手机号查询实名信息

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

@ -343,14 +343,14 @@ export class ShipperBaseService extends BaseService {
* @returns
*/
getChannel(params = {}, containerAll = false) {
return this.request(this.$api_get_channel, params, 'POST').pipe(
return this.request(this.$api_get_channel, params).pipe(
map(res => {
if (res) {
const obj = [];
if (containerAll) {
obj.push({ label: '全部', value: '' });
}
return [...obj, ...res.map((m: any) => ({ label: `${m.employeeVO?.empName}/${m.employeeVO?.mobile}`, value: m.id }))];
return [...obj, ...res.map((m: any) => ({ label: `${m.name}/${m.telephone}`, value: m.id }))];
} else {
return [];
}