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-24 17:47:51 +08:00
parent 594f7bee0e 06d9a86246
commit 44bb14b64f
10 changed files with 141 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy.conf.js
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming
* @LastEditTime : 2022-04-22 14:01:00
* @LastEditTime : 2022-04-24 16:40:24
* @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
},

2
src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
View File

@ -210,7 +210,7 @@ export class WithdrawalsDetailComponent implements OnInit {
enum: [
{label: '全部', value: ''},
{label: '是', value: '1'},
{label: '否', value: '2'}
{label: '否', value: '0'}
],
ui: {
widget: 'select',

7
src/app/routes/partner/channel-sales/components/edit/edit.component.ts
View File

@ -16,6 +16,7 @@ export class ParterChannelSalesEditComponent implements OnInit {
schema!: SFSchema;
ui!: SFUISchema;
i: any;
sts: any;
type: any;
record:any;
currentOAItem:any;
@ -29,13 +30,15 @@ export class ParterChannelSalesEditComponent implements OnInit {
) {}
ngOnInit(): void {
if(!this.sts) {
this.service.request(this.service.$api_getChannelSalesInfo, {id:this.i?.id}).subscribe(res => {
if(res){
this.record = res;
this.initSF();
}
});
}
this.initSF();
});
}
initSF() {

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

@ -112,6 +112,7 @@ export class ParterChannelSalesListComponent implements OnInit {
nzWidth:600,
nzTitle: '新增',
nzContent: ParterChannelSalesEditComponent,
nzComponentParams: {sts: 'add'}
});
modalRef.afterClose.subscribe(res => {
if (res) {

28
src/app/routes/partner/level-config/components/list/list.component.ts
View File

@ -21,7 +21,7 @@ export class ParterLevelConfigListComponent implements OnInit {
sf!: SFComponent;
spuStatus = '1';
data=[{name1:1111}]
data = [{ name1: 1111 }];
constructor(
public router: Router,
public ar: ActivatedRoute,
@ -45,16 +45,20 @@ export class ParterLevelConfigListComponent implements OnInit {
properties: {
gradeName: {
type: 'string',
title: '等级姓名',
title: '等级姓名'
},
stateLocked: {
type: 'string',
title: '状态',
enum:[{label:'启用',value:'1'},{label:'禁用',value:'0'}],
enum: [
{ label: '全部', value: '' },
{ label: '启用', value: '1' },
{ label: '禁用', value: '0' }
],
ui: {
widget:'select',
widget: 'select'
}
}
},
}
};
this.ui = {
@ -79,6 +83,10 @@ export class ParterLevelConfigListComponent implements OnInit {
title: '创建时间',
index: 'createTime'
},
{
title: '排序',
index: 'sortId'
},
{
title: '启用时间',
index: 'enableTime'
@ -87,7 +95,7 @@ export class ParterLevelConfigListComponent implements OnInit {
title: '状态',
index: 'stateLocked',
format: (item: any) => {
return item.stateLocked ? '禁用':'启用'
return item.stateLocked ? '启用' : '禁用';
}
},
{
@ -96,17 +104,17 @@ export class ParterLevelConfigListComponent implements OnInit {
buttons: [
{
text: '编辑',
click: (_record, _modal, _instance) => this.edit(_record),
click: (_record, _modal, _instance) => this.edit(_record)
},
{
text: '禁用',
click: (_record, _modal, _instance) => this.stop(_record),
iif:(item)=>!item.stateLocked
iif: item => !item.stateLocked
},
{
text: '启用',
click: (_record, _modal, _instance) => this.restart(_record),
iif:(item)=>item.stateLocked
iif: item => item.stateLocked
}
]
}
@ -185,6 +193,4 @@ export class ParterLevelConfigListComponent implements OnInit {
this.sf.reset();
this.st.load(1);
}
}

54
src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts
View File

@ -1,8 +1,8 @@
import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { SFComponent, SFRadioWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
import { SFComponent, SFDateWidgetSchema, SFRadioWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
import { _HttpClient } from '@delon/theme';
import { EAEnvironmentService } from '@shared';
import { EAEnvironmentService, ShipperBaseService } from '@shared';
import differenceInCalendarDays from 'date-fns/differenceInCalendarDays';
import format from 'date-fns/format';
import { NzMessageService } from 'ng-zorro-antd/message';
@ -19,8 +19,9 @@ import { NzModalRef } from 'ng-zorro-antd/modal';
})
export class EditPartnerComponentsAddComponent implements OnInit {
@ViewChild('sf', { static: false }) sf!: SFComponent;
record: any = {};
i: any;
sts: any;
rows: any;
schema: SFSchema = {};
detailData: any = {}
ui: SFUISchema = {};
@ -33,14 +34,18 @@ export class EditPartnerComponentsAddComponent implements OnInit {
public service: UsermanageService,
private envSrv: EAEnvironmentService,
private modal: NzModalRef,
public shipperservice: ShipperBaseService
) { }
ngOnInit(): void {
if(this.sts == '2') {
this.initDetailData()
}
this.initSF();
}
initDetailData() {
const params = {
id: this.i.id
}
@ -55,18 +60,40 @@ export class EditPartnerComponentsAddComponent implements OnInit {
initSF() {
this.schema = {
properties: {
channelId: {
// channelId: {
// type: 'string',
// title: '合伙人修改为',
// ui: {
// widget: 'radio',
// showRequired: true,
// } as SFRadioWidgetSchema,
// enum: [
// { label: '全部可见', value: 1 },
// { label: '合伙人可见', value: 2 },
// { label: '销售渠道可见', value: 3 },
// ],
// },
enterpriceIds: {
type: 'string',
title: '合伙人修改为',
ui: {
widget: 'radio',
showRequired: true,
} as SFRadioWidgetSchema,
enum: [
{ label: '全部可见', value: 1 },
{ label: '合伙人可见', value: 2 },
{ label: '销售渠道可见', value: 3 },
],
widget: 'select',
placeholder: '请选择',
allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
},
asyncData: () => this.shipperservice.getNetworkenterpriceIds()
}
},
settStartTime: {
title: '结算起算日期',
type: 'string',
ui: {
widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd', visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFDateWidgetSchema,
},
remark: {
type: 'string',
@ -87,7 +114,8 @@ export class EditPartnerComponentsAddComponent implements OnInit {
} as SFRadioWidgetSchema,
enum: [
{ label: '修改成功后立即生效', value: 1 },
{ label: 'CRM流程审核通过后生效', value: 2 }
{ label: 'CRM流程审核后生效', value: 2 },
{ label: 'CRM流程审核通过后生效', value: 3 }
],
},
},

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-02-11 15:08:47
* @LastEditTime : 2022-04-24 17:13:51
* @FilePath : \\tms-obc-web\\src\\app\\routes\\usercenter\\components\\freight\\list\\list.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -33,7 +33,7 @@
</div>
</div>
</nz-card>
<nz-card>
<nz-card [nzExtra]="extraTemplate" >
<!-- 数据列表 -->
<!-- [data]="service.$api_get_supplier_page" -->
@ -73,3 +73,9 @@
</div>
</div>
</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>
</div>
</ng-template>

25
src/app/routes/usercenter/components/freight/list/list.component.ts
View File

@ -125,13 +125,30 @@ export class FreightComponentsListComponent implements OnInit {
}
});
}
editPartner(record: any) {
get selectedRows() {
return this.st?.list.filter(item => item.checked) || [];
}
editPartner(record?: any) {
let status = 1
if(record) {
status = 2
}
if (this.selectedRows.length <= 0 && !record) {
this.service.msgSrv.error('请选择订单！');
return;
}
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);
});
const modalRef = this.modal.create({
nzTitle: '修改合伙人',
nzContent: EditPartnerComponentsAddComponent,
nzWidth: 800,
nzComponentParams: {
i: record
i: record,
sts: status,
rows: params
},
nzFooter: null
});
@ -141,7 +158,7 @@ export class FreightComponentsListComponent implements OnInit {
}
});
}
editSale(record: any) {
editSale(record?: any) {
const modalRef = this.modal.create({
nzTitle: '修改渠道销售',
nzContent: EditSaleComponentsAddComponent,
@ -380,7 +397,7 @@ export class FreightComponentsListComponent implements OnInit {
initST() {
this.columns = [
// { title: '', type: 'checkbox', className: 'text-center' },
{ title: '', type: 'checkbox', className: 'text-center' },
{ title: '企业名称', render: 'enterpriseName', width: 350 },
{ title: '统一社会信用代码', className: 'text-center', render: 'unifiedSocialCreditCode', width: 200 },
{

14
src/app/routes/usercenter/services/usercenter.service.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-11-29 15:22:34
* @LastEditTime : 2022-04-09 14:54:17
* @LastEditTime : 2022-04-24 16:49:05
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\usercenter\\services\\usercenter.service.ts
@ -151,17 +151,17 @@ export class UsermanageService extends ShipperBaseService {
$api_configPage = '/api/mdc/cuc/driver/list/configPage';
// 批量修改企业渠道
$api_batchUpdateEnterpriceChannel = '/api/mdc/enterpriceRelLog/batchUpdateEnterpriceChannel';
$api_batchUpdateEnterpriceChannel = '/api/mdc/enterpriseRelLog/batchUpdateEnterpriceChannel';
// 批量修改企业合伙人
$api_batchUpdateEnterpricePartner = '/api/mdc/enterpriceRelLog/batchUpdateEnterpricePartner';
$api_batchUpdateEnterpricePartner = '/api/mdc/enterpriseRelLog/batchUpdateEnterpricePartner';
// 渠道销售修改详情
$api_partnerChannelUpdateDetaiList = '/api/mdc/enterpriceRelLog/partnerChannelUpdateDetaiList';
$api_partnerChannelUpdateDetaiList = '/api/mdc/partnerChannelRelLog/partnerChannelUpdateDetaiList';
// 查询企业修改合伙人记录
$api_findEnterpricePartnerRelLog = '/api/mdc/enterpriceRelLog/findEnterpricePartnerRelLog';
$api_findEnterpricePartnerRelLog = '/api/mdc/enterpriseRelLog/findEnterpricePartnerRelLog';
// 查询企业修改渠道记录
$api_findEnterpriceChannelRelLog = '/api/mdc/enterpriceRelLog/findEnterpriceChannelRelLog';
$api_findEnterpriceChannelRelLog = '/api/mdc/enterpriseRelLog/findEnterpriceChannelRelLog';
// 查询企业合伙人渠道关系信息
$api_getEnterpriceRel = '/api/mdc/enterpriceRelLog/getEnterpriceRel';
$api_getEnterpriceRel = '/api/mdc/enterpriseRelLog/getEnterpriceRel';
// 员工列表
$api_getStaffList = '/api/mdc/cuc/userApp/getStaffList';
// 分配客服人员

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

@ -169,6 +169,30 @@ export class ShipperBaseService extends BaseService {
})
);
}
/**
* 获取网络货运人
* @returns
*/
getNetworkenterpriceIds(params = {}, containerAll = false) {
return this.request(this.$api_get_network_freight_forwarder_list, params).pipe(
map((res: any) => {
if (!res) {
return [];
}
const list = res.map((item: any) => {
return {
label: item.enterpriseName,
value: item.enterpriseName
};
});
const obj = [];
if (containerAll) {
obj.push({ label: '全部', value: '' });
}
return [...obj, ...list];
})
);
}
/**
* 获取CRM客户