Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-03-03 14:27:42 +08:00
parent 9afb89b82b
commit 23b0512e9c
3 changed files with 123 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
View File

@ -46,13 +46,14 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
startInfo: any = []; startInfo: any = [];
endInfo: any = []; endInfo: any = [];
PageStatus = ''; PageStatus = '';
shipperName = '';
limitValues = { limitValues = {
maxMonth: 99, maxMonth: 99,
maxWeight: 99999, maxWeight: 99999,
maxVolume: 99999, maxVolume: 99999,
maxTrainNumber: 99999, maxTrainNumber: 99999,
maxFreight: 9999999 maxFreight: 9999999
} };
constructor( constructor(
private http: _HttpClient, private http: _HttpClient,
fb: FormBuilder, fb: FormBuilder,
@ -118,7 +119,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
searchDebounceTime: 300, searchDebounceTime: 300,
searchLoadingText: '搜索中...', searchLoadingText: '搜索中...',
onSearch: (q: any) => { onSearch: (q: any) => {
let str =q.replace(/^\s+|\s+$/g,""); let str = q.replace(/^\s+|\s+$/g, '');
if (str) { if (str) {
return this.service return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: str }) .request(this.service.$api_enterpriceList, { enterpriseName: str })
@ -128,12 +129,13 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
return of([]); return of([]);
} }
}, },
change: (q: any) => { change: (q: any, qs: any) => {
let str =q.replace(/^\s+|\s+$/g,""); let str = q.replace(/^\s+|\s+$/g, '');
if (str) { if (str) {
this.getRegionCode(str); this.getRegionCode(str);
this.shipperName = qs?.label;
}
} }
},
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
enterpriseProjectId: { enterpriseProjectId: {
@ -158,7 +160,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
ui: { ui: {
placeholder: '请输入', placeholder: '请输入',
format: 'yyyy-MM-dd HH:mm:ss', format: 'yyyy-MM-dd HH:mm:ss',
validator: (val) => { validator: val => {
let d = new Date(); let d = new Date();
let year = d.getFullYear(); let year = d.getFullYear();
let month = d.getMonth(); let month = d.getMonth();
@ -171,7 +173,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
return [{ keyword: 'validTime2', message: `有效期最长为${this.limitValues.maxMonth}个月` }]; return [{ keyword: 'validTime2', message: `有效期最长为${this.limitValues.maxMonth}个月` }];
} }
return []; return [];
}, }
} }
}, },
dispatchPhone: { dispatchPhone: {
@ -374,8 +376,8 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
errors: { required: '请选择车型' }, errors: { required: '请选择车型' },
asyncData: () => this.service.getDictOptions({ dictKey: 'car:model' }), asyncData: () => this.service.getDictOptions({ dictKey: 'car:model' }),
change: (tag: any, org: any) => { change: (tag: any, org: any) => {
if(tag.includes("999")){ if (tag.includes('999')) {
this.sf4.setValue('/carModel',["999"]); this.sf4.setValue('/carModel', ['999']);
} }
} }
} }
@ -391,12 +393,12 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
errors: { required: '请选择车长' }, errors: { required: '请选择车长' },
asyncData: () => this.service.getDictOptions({ dictKey: 'car:length' }), asyncData: () => this.service.getDictOptions({ dictKey: 'car:length' }),
change: (tag: any, org: any) => { change: (tag: any, org: any) => {
if(tag.includes("999")){ if (tag.includes('999')) {
this.sf4.setValue('/carModel',["999"]); this.sf4.setValue('/carModel', ['999']);
}
} }
} }
} }
},
}, },
required: ['weight', 'carModel', 'carLength', 'freightPrice', 'rule', 'settlementBasis'] required: ['weight', 'carModel', 'carLength', 'freightPrice', 'rule', 'settlementBasis']
}; };
@ -483,7 +485,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
visibleIf: { visibleIf: {
receiptType: value => value === '2' receiptType: value => value === '2'
} }
}, }
}, },
receiptUserPhone: { receiptUserPhone: {
type: 'string', type: 'string',
@ -493,7 +495,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
visibleIf: { visibleIf: {
receiptType: value => value === '2' receiptType: value => value === '2'
} }
}, }
}, },
receiptAddressArea: { receiptAddressArea: {
type: 'string', type: 'string',
@ -503,7 +505,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
visibleIf: { visibleIf: {
receiptType: value => value === '2' receiptType: value => value === '2'
} }
}, }
}, },
receiptAddress: { receiptAddress: {
type: 'string', type: 'string',
@ -513,7 +515,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
visibleIf: { visibleIf: {
receiptType: value => value === '2' receiptType: value => value === '2'
} }
}, }
}, },
paymentDays: { paymentDays: {
type: 'string', type: 'string',
@ -535,7 +537,15 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
} as SFTextareaWidgetSchema } as SFTextareaWidgetSchema
} }
}, },
required: ['stateReceipt', 'receiptType', 'receiptUserName','receiptUserPhone','receiptAddressArea','receiptAddress','paymentDays'] required: [
'stateReceipt',
'receiptType',
'receiptUserName',
'receiptUserPhone',
'receiptAddressArea',
'receiptAddress',
'paymentDays'
]
}; };
this.ui7 = { this.ui7 = {
'*': { '*': {
@ -669,8 +679,14 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
return; return;
} }
// 校验各个输入限定值 // 校验各个输入限定值
if (this.sf4.value.weight > this.limitValues.maxWeight || this.sf4.value.volume > this.limitValues.maxVolume || this.sf4.value.number > this.limitValues.maxTrainNumber) { if (
this.service.msgSrv.error(`当前货物核载信息已超出限定值【${this.limitValues.maxWeight}吨、${this.limitValues.maxVolume}方、${this.limitValues.maxTrainNumber}车】`); this.sf4.value.weight > this.limitValues.maxWeight ||
this.sf4.value.volume > this.limitValues.maxVolume ||
this.sf4.value.number > this.limitValues.maxTrainNumber
) {
this.service.msgSrv.error(
`当前货物核载信息已超出限定值【${this.limitValues.maxWeight}吨、${this.limitValues.maxVolume}方、${this.limitValues.maxTrainNumber}车】`
);
return; return;
} }
@ -679,23 +695,8 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
return; return;
} }
const modalRef = this.modalService.create({
nzTitle: '运输协议',
nzContent: TranAgreementComponent,
nzWidth: 900,
nzFooter: null
});
modalRef.afterClose.subscribe(result => {
if (result) {
this.submit(submitType);
}
});
}
// 确认提交
submit(submitType?: string): void {
// //装卸货信息 // //装卸货信息
const LoadingList = this.startInfo.concat(this.endInfo); const LoadingList = this.startInfo.concat(this.endInfo);
// 货物信息 // 货物信息
const sf3Values = { ...this.sf3.value }; const sf3Values = { ...this.sf3.value };
if (sf3Values.goodsTypeName === '其它') { if (sf3Values.goodsTypeName === '其它') {
@ -703,26 +704,50 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
delete sf3Values.goodsName1; delete sf3Values.goodsName1;
} }
if (this.sf4.value.carModel.includes('999')) { if (this.sf4.value.carModel.includes('999')) {
this.sf4.value.carModel = ['999'] this.sf4.value.carModel = ['999'];
} }
if (this.sf4.value.carLength.includes('999')) { if (this.sf4.value.carLength.includes('999')) {
this.sf4.value.carLength = ['999'] this.sf4.value.carLength = ['999'];
} }
const goodsInfoDTOList = [
const params: any = {
...this.sf1.value,
...this.sf7.value,
unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo],
goodsInfoDTOList: [
{ {
...this.sf4.value, ...this.sf4.value,
...this.sf3.value, ...this.sf3.value,
carModel: this.sf4.value.carModel.join(','), carModel: this.sf4.value.carModel.join(','),
carLength: this.sf4.value.carLength.join(',') carLength: this.sf4.value.carLength.join(',')
} }
] ];
// 从“再下一单”过来，将所有的子参数内的id都删除
if ((this.PageStatus = '大宗下一单')) {
LoadingList.forEach((ele: any) => {
delete ele.id;
});
goodsInfoDTOList.forEach((ele: any) => {
delete ele.id;
});
}
const params: any = {
...this.sf1.value,
...this.sf7.value,
unLoadingPlaceDTOList: LoadingList,
goodsInfoDTOList: goodsInfoDTOList
}; };
params.freightPrice = this.totalFees; params.freightPrice = this.totalFees;
const modalRef = this.modalService.create({
nzTitle: '运输协议',
nzContent: TranAgreementComponent,
nzWidth: 900,
nzFooter: null,
nzComponentParams: { object: params, shipperName: this.shipperName }
});
modalRef.afterClose.subscribe(result => {
if (result) {
this.submit(submitType, params);
}
});
}
// 确认提交
submit(submitType?: string, params?: any): void {
if (submitType) { if (submitType) {
if (submitType == 'assign') { if (submitType == 'assign') {
this.chooseFamifiar(params); this.chooseFamifiar(params);
@ -730,7 +755,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
} else if (submitType === 'qrcode') { } else if (submitType === 'qrcode') {
this.service.request(this.service.$api_saveAnotherBulkOrderQRCode, params).subscribe(res => { this.service.request(this.service.$api_saveAnotherBulkOrderQRCode, params).subscribe(res => {
if (res) { if (res) {
this.assignedQrcode( res, params ) this.assignedQrcode(res, params);
} }
}); });
return; return;
@ -749,16 +774,16 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
enterpriseInfoName: parms.enterpriseInfoName, enterpriseInfoName: parms.enterpriseInfoName,
loadingAddressArr: this.startInfo.map((ele: any) => ele.detailedAddress), loadingAddressArr: this.startInfo.map((ele: any) => ele.detailedAddress),
unloadingAddressArr: this.endInfo.map((ele: any) => ele.detailedAddress), unloadingAddressArr: this.endInfo.map((ele: any) => ele.detailedAddress),
deadlineTime: parms.deadlineTime, deadlineTime: parms.deadlineTime
} };
const modalRef = this.modalService.create({ const modalRef = this.modalService.create({
nzTitle: '二维码', nzTitle: '二维码',
nzWidth: '468px', nzWidth: '468px',
nzContent: SupplyManagementQrcodePageComponent, nzContent: SupplyManagementQrcodePageComponent,
nzComponentParams: { nzComponentParams: {
i: item, i: item
}, },
nzFooter: null, nzFooter: null
}); });
modalRef.afterClose.subscribe(() => { modalRef.afterClose.subscribe(() => {
this.router.navigate(['/supply-management/index'], { queryParams: { type: 'bulk' } }); this.router.navigate(['/supply-management/index'], { queryParams: { type: 'bulk' } });
@ -875,6 +900,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
dataR(res: any) { dataR(res: any) {
// 注：区分编辑和下一单 区别是初始化的时候加不加ID // 注：区分编辑和下一单 区别是初始化的时候加不加ID
if (res?.shipperAppUserName) { if (res?.shipperAppUserName) {
this.shipperName = res?.shipperAppUserName;
const List: any = []; const List: any = [];
this.service.request(this.service.$api_enterpriceList, { enterpriseName: res?.shipperAppUserName }).subscribe(rs => { this.service.request(this.service.$api_enterpriceList, { enterpriseName: res?.shipperAppUserName }).subscribe(rs => {
rs?.forEach((element: any) => { rs?.forEach((element: any) => {
@ -1084,9 +1110,9 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
this.service.limitKeys2.weight, this.service.limitKeys2.weight,
this.service.limitKeys2.volume, this.service.limitKeys2.volume,
this.service.limitKeys2.trainNumber, this.service.limitKeys2.trainNumber,
this.service.limitKeys2.freight, this.service.limitKeys2.freight
]; ];
this.service.request(this.service.$api_findItemValueByItemKeys, getlimitvaluesParms).subscribe((res) => { this.service.request(this.service.$api_findItemValueByItemKeys, getlimitvaluesParms).subscribe(res => {
const maxMonth = res.filter((item: any) => item.itemKey === this.service.limitKeys2.month)[0].itemValue; const maxMonth = res.filter((item: any) => item.itemKey === this.service.limitKeys2.month)[0].itemValue;
const maxWeight = res.filter((item: any) => item.itemKey === this.service.limitKeys2.weight)[0].itemValue; const maxWeight = res.filter((item: any) => item.itemKey === this.service.limitKeys2.weight)[0].itemValue;
const maxVolume = res.filter((item: any) => item.itemKey === this.service.limitKeys2.volume)[0].itemValue; const maxVolume = res.filter((item: any) => item.itemKey === this.service.limitKeys2.volume)[0].itemValue;
@ -1098,7 +1124,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
maxVolume: Number(maxVolume), maxVolume: Number(maxVolume),
maxTrainNumber: Number(maxTrainNumber), maxTrainNumber: Number(maxTrainNumber),
maxFreight: Number(maxFreight) maxFreight: Number(maxFreight)
} };
}) });
} }
} }

11
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
View File

@ -51,7 +51,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
totalDistance = 0.0; //总里程 totalDistance = 0.0; //总里程
totalTime = 0.0; //路程总时间 totalTime = 0.0; //路程总时间
currentRate = 0; //实时计算的费率 currentRate = 0; //实时计算的费率
shipperAppName = ''; shipperName = '';
constructor( constructor(
private http: _HttpClient, private http: _HttpClient,
fb: FormBuilder, fb: FormBuilder,
@ -157,12 +157,11 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
return of([]); return of([]);
} }
}, },
change: (q: any, qq: any) => { change: (q: any, qs: any) => {
let str = q.replace(/^\s+|\s+$/g, ''); let str = q.replace(/^\s+|\s+$/g, '');
if (str) { if (str) {
console.log(qq)
this.getRegionCode(str); this.getRegionCode(str);
this.shipperAppName = qq; this.shipperName = qs?.label;
this.payChange(); this.payChange();
} }
} }
@ -980,11 +979,11 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
nzContent: TranAgreementComponent, nzContent: TranAgreementComponent,
nzWidth: 900, nzWidth: 900,
nzFooter: null, nzFooter: null,
nzComponentParams: { object: params } nzComponentParams: { object: params ,shipperName: this.shipperName}
}); });
modalRef.afterClose.subscribe(result => { modalRef.afterClose.subscribe(result => {
if (result) { if (result) {
this.submit(submitType, params); this.submit(submitType, params, );
} }
}); });
} }

8
src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-02-24 20:19:51 * @Date : 2022-02-24 20:19:51
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-03-03 14:08:28 * @LastEditTime : 2022-03-03 14:24:51
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -58,9 +58,9 @@ export class TranAgreementComponent {
consignmentVolume:`${this.object?.goodsInfoDTOList[0].weight}吨/${this.object?.goodsInfoDTOList[0].volume}方/${this.object?.goodsInfoDTOList[0].number}件`, //托运量 consignmentVolume:`${this.object?.goodsInfoDTOList[0].weight}吨/${this.object?.goodsInfoDTOList[0].volume}方/${this.object?.goodsInfoDTOList[0].number}件`, //托运量
transporterInfo:'', //运输方信息 transporterInfo:'', //运输方信息
freightAmount:this.object?.total, // 订单运费金额（元) freightAmount:this.object?.total, // 订单运费金额（元)
pre:this.object?.expenseDTOList.filter((item:any) => item.expenseCode === 'PRE')[0].price, //预付 pre:this.object?.expenseDTOList?.filter((item:any) => item.expenseCode === 'PRE')[0].price, //预付
rece:this.object?.expenseDTOList.filter((item:any) => item.expenseCode === 'RECE')[0].price,// 到付 rece:this.object?.expenseDTOList?.filter((item:any) => item.expenseCode === 'RECE')[0].price,// 到付
back:this.object?.expenseDTOList.filter((item:any) => item.expenseCode === 'BACK')[0].price,// 回单付 back:this.object?.expenseDTOList?.filter((item:any) => item.expenseCode === 'BACK')[0].price,// 回单付
lunarKnot:0, lunarKnot:0,
total:this.object?.subtotal, // 合计（元) total:this.object?.subtotal, // 合计（元)
paymentTime:`到货后${this.object?.paymentDays}天`, // 承诺支付运费时间 paymentTime:`到货后${this.object?.paymentDays}天`, // 承诺支付运费时间