diff --git a/proxy.conf.js b/proxy.conf.js
index 8fd91df6..688f3a27 100644
--- a/proxy.conf.js
+++ b/proxy.conf.js
@@ -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
},
diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
index b35e8a87..bbcb46cf 100644
--- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
+++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts
@@ -210,7 +210,7 @@ export class WithdrawalsDetailComponent implements OnInit {
enum: [
{label: '全部', value: ''},
{label: '是', value: '1'},
- {label: '否', value: '2'}
+ {label: '否', value: '0'}
],
ui: {
widget: 'select',
diff --git a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
index 6b143413..bd01de45 100644
--- a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
+++ b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts
@@ -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 {
-
- this.service.request(this.service.$api_getChannelSalesInfo, {id:this.i?.id}).subscribe(res => {
- if(res){
- this.record = res;
- }
- this.initSF();
- });
+ 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() {
diff --git a/src/app/routes/partner/channel-sales/components/list/list.component.ts b/src/app/routes/partner/channel-sales/components/list/list.component.ts
index ba7097ec..9c150c22 100644
--- a/src/app/routes/partner/channel-sales/components/list/list.component.ts
+++ b/src/app/routes/partner/channel-sales/components/list/list.component.ts
@@ -112,6 +112,7 @@ export class ParterChannelSalesListComponent implements OnInit {
nzWidth:600,
nzTitle: '新增',
nzContent: ParterChannelSalesEditComponent,
+ nzComponentParams: {sts: 'add'}
});
modalRef.afterClose.subscribe(res => {
if (res) {
diff --git a/src/app/routes/partner/level-config/components/list/list.component.ts b/src/app/routes/partner/level-config/components/list/list.component.ts
index e079f0e7..3d4501b2 100644
--- a/src/app/routes/partner/level-config/components/list/list.component.ts
+++ b/src/app/routes/partner/level-config/components/list/list.component.ts
@@ -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,21 +45,25 @@ export class ParterLevelConfigListComponent implements OnInit {
properties: {
gradeName: {
type: 'string',
- title: '等级姓名',
+ title: '等级姓名'
},
stateLocked: {
type: 'string',
title: '状态',
- enum:[{label:'启用',value:'1'},{label:'禁用',value:'0'}],
- ui:{
- widget:'select',
+ enum: [
+ { label: '全部', value: '' },
+ { label: '启用', value: '1' },
+ { label: '禁用', value: '0' }
+ ],
+ ui: {
+ widget: 'select'
}
- },
+ }
}
};
this.ui = {
'*': {
- width:300,
+ width: 300,
grid: { span: 12, gutter: 4 }
}
};
@@ -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
}
]
}
@@ -115,7 +123,7 @@ export class ParterLevelConfigListComponent implements OnInit {
add() {
const modalRef = this.modalService.create({
- nzWidth:500,
+ nzWidth: 500,
nzTitle: '新增',
nzContent: ParterLevelConfigEditComponent,
nzComponentParams: { type: this.spuStatus }
@@ -130,7 +138,7 @@ export class ParterLevelConfigListComponent implements OnInit {
// 编辑
edit(record: STData) {
const modalRef = this.modalService.create({
- nzWidth:500,
+ nzWidth: 500,
nzTitle: '编辑',
nzContent: ParterLevelConfigEditComponent,
nzComponentParams: { i: record, type: this.spuStatus }
@@ -142,8 +150,8 @@ export class ParterLevelConfigListComponent implements OnInit {
});
}
- // 编辑
- view(record: STData) {
+ // 编辑
+ view(record: STData) {
const modalRef = this.modalService.create({
nzTitle: '查看',
nzContent: ParterLevelConfigEditComponent,
@@ -156,7 +164,7 @@ export class ParterLevelConfigListComponent implements OnInit {
nzTitle: '启用确认',
nzContent: `确定启用该账号吗？`,
nzOnOk: () =>
- this.service.request(this.service.$api_updatePartnerGradeConfig, {id:item.id}).subscribe(res => {
+ this.service.request(this.service.$api_updatePartnerGradeConfig, { id: item.id }).subscribe(res => {
if (res) {
this.service.msgSrv.success('启用成功！');
this.st.reload();
@@ -169,7 +177,7 @@ export class ParterLevelConfigListComponent implements OnInit {
nzTitle: '禁用确认',
nzContent: `确定禁用该账号吗？`,
nzOnOk: () =>
- this.service.request(this.service.$api_updatePartnerGradeConfig, {id:item.id}).subscribe(res => {
+ this.service.request(this.service.$api_updatePartnerGradeConfig, { id: item.id }).subscribe(res => {
if (res) {
this.service.msgSrv.success('禁用成功！');
this.st.reload();
@@ -185,6 +193,4 @@ export class ParterLevelConfigListComponent implements OnInit {
this.sf.reset();
this.st.load(1);
}
-
-
}
diff --git a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts
index a55f960b..1f55f50c 100644
--- a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts
@@ -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 {
- this.initDetailData()
+ 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 }
],
},
},
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html
index a6d0ea7c..f30b7df8 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.html
+++ b/src/app/routes/usercenter/components/freight/list/list.component.html
@@ -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 @@
-
+
@@ -72,4 +72,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts
index 4653512b..f85f9951 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/list.component.ts
@@ -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 },
{
diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts
index 9b9c5d9f..b1890e82 100644
--- a/src/app/routes/usercenter/services/usercenter.service.ts
+++ b/src/app/routes/usercenter/services/usercenter.service.ts
@@ -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';
// 分配客服人员
diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts
index bf46b2dd..56d9efaa 100644
--- a/src/app/shared/services/business/shipper-base.service.ts
+++ b/src/app/shared/services/business/shipper-base.service.ts
@@ -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客户