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-25 11:32:19 +08:00
parent c3280283d6 b7bfa39012
commit 6ec8a831eb
7 changed files with 44 additions and 24 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-24 17:51:09
* @LastEditTime : 2022-04-25 10:32:29
* @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/order-management/components/complaint/complaint.component.ts
View File

@ -108,7 +108,7 @@ export class OrderManagementComplaintComponent extends BasicTableComponent imple
title: '运单号',
ui: {}
},
complaintCause: {
drvComplaintCause: {
title: '投诉原因',
type: 'string',
ui: {

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

@ -83,14 +83,15 @@ export class ParterLevelConfigListComponent implements OnInit {
title: '创建时间',
index: 'createTime'
},
{
title: '排序',
index: 'sortId'
},
{
title: '启用时间',
index: 'enableTime'
},
{
title: '排序',
index: 'sortId'
},
{
title: '状态',
index: 'stateLocked',

2
src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.ts
View File

@ -230,7 +230,7 @@ export class TaxManagementInvoiceReportingComponent implements OnInit {
{
title: '购买方企业名称', index: 'artoname', className: 'text-center', width: '200px', type: 'link',
click: item => {
window.open(`/#/usercenter/freight/list/detail/${item.ltdId}`, '_blank', 'noopener')
window.open(`/#/usercenter/freight/list/detail/${item.arto}`, '_blank', 'noopener')
}
},
{ title: '购买方统一社会信用代码', index: 'artotaxno', className: 'text-center', width: '200px' },

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

@ -72,8 +72,8 @@ export class EditPartnerComponentsAddComponent implements OnInit {
// { label: '合伙人可见', value: 2 },
// { label: '销售渠道可见', value: 3 },
// ],
// },
enterpriceIds: {
// },channelId
channelId: {
type: 'string',
title: '合伙人修改为',
ui: {
@ -86,14 +86,19 @@ export class EditPartnerComponentsAddComponent implements OnInit {
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,
// },
settStartTime: {
title: '结算起算日期',
type: 'string',
ui: {
widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd', visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFDateWidgetSchema,
format: 'date',
},
remark: {
type: 'string',
@ -136,9 +141,18 @@ export class EditPartnerComponentsAddComponent implements OnInit {
this.modal.close(true)
}
save() {
const params = {
...this.sf.value
console.log(this?.rows);
let enterId : any;
if(this.sts == '1') {
enterId = this.rows
} else {
enterId = [this.i.id]
}
const params = {
...this.sf.value,
enterpriceIds: enterId,
}
this.service.request(this.service.$api_batchUpdateEnterpricePartner, params).subscribe(res => {
if(res) {
this.service.msgSrv.success('修改成功')

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

@ -141,6 +141,8 @@ export class FreightComponentsListComponent implements OnInit {
this.selectedRows.forEach(item => {
params.push(item.id);
});
console.log(params);
const modalRef = this.modal.create({
nzTitle: '修改合伙人',
nzContent: EditPartnerComponentsAddComponent,

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

@ -26,6 +26,9 @@ export class ShipperBaseService extends BaseService {
// 获取货主企业列表
public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
// 合伙人下拉列表
public $api_partner_lists = '/api/mdc/partner/list';
// 批量获取项目信息
public $api_get_project_list = '/api/mdc/cuc/enterpriseProject/getProjectList';
constructor(public injector: Injector) {
@ -146,19 +149,19 @@ export class ShipperBaseService extends BaseService {
);
}
/**
* 获取网络货运人
* 合伙人下拉列表
* @returns
*/
getNetworkEnterpriseName(params = {}, containerAll = false) {
return this.request(this.$api_get_network_freight_forwarder_list, params).pipe(
return this.request(this.$api_partner_lists, params).pipe(
map((res: any) => {
if (!res) {
return [];
}
const list = res.map((item: any) => {
return {
label: item.enterpriseName,
value: item.enterpriseName
label: item.keyword,
value: item.id
};
});
const obj = [];
@ -174,15 +177,15 @@ export class ShipperBaseService extends BaseService {
* @returns
*/
getNetworkenterpriceIds(params = {}, containerAll = false) {
return this.request(this.$api_get_network_freight_forwarder_list, params).pipe(
return this.request(this.$api_partner_lists, params).pipe(
map((res: any) => {
if (!res) {
return [];
}
const list = res.map((item: any) => {
return {
label: item.enterpriseName,
value: item.enterpriseName
label: item.contactName + '/' + item.contactMobile,
value: item.id
};
});
const obj = [];