This commit is contained in:
Taric Xin
2022-04-01 10:13:50 +08:00
parent 0b7de5d43e
commit 5e92efc70f
3 changed files with 39 additions and 24 deletions

View File

@ -176,21 +176,23 @@ export class ShipperBaseService extends BaseService {
getEnterpriceList(params = { enterpriseName: '' }, containerAll = false) {
let str = params.enterpriseName.replace(/^\s+|\s+$/g, '');
if (str) {
return this.request(this.$api_enterpriceList, params).pipe(
map((res: any) => {
if (!res) {
return [];
}
const list = res.map((item: any) => {
return { label: item.enterpriseName, value: item.id };
});
const obj = [];
if (containerAll) {
obj.push({ label: '全部', value: '' });
}
return [...obj, ...list];
})
).toPromise();;
return this.request(this.$api_enterpriceList, params)
.pipe(
map((res: any) => {
if (!res) {
return [];
}
const list = res.map((item: any) => {
return { label: item.enterpriseName, value: item.id };
});
const obj = [];
if (containerAll) {
obj.push({ label: '全部', value: '' });
}
return [...obj, ...list];
})
)
.toPromise();
} else {
return of([]);
}
@ -291,14 +293,15 @@ export class ShipperBaseService extends BaseService {
* 获取渠道销售管理集合
* @returns
*/
getChannel() {
const params = {};
getChannel(params = {}, containerAll = false) {
return this.request(this.$api_get_channel, params, 'POST').pipe(
map(res => {
if (res) {
return res.map((m: any) => {
return { label: `${m.employeeVO?.empName}/${m.employeeVO?.mobile}`, value: m.id };
});
const obj = [];
if (containerAll) {
obj.push({ label: '全部', value: '' });
}
return [...obj, ...res.map((m: any) => ({ label: `${m.employeeVO?.empName}/${m.employeeVO?.mobile}`, value: m.id }))];
} else {
return [];
}