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-04 16:48:04 +08:00
parent 855615d1ff
commit ac5bb6ab7e
6 changed files with 101 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-02-24 20:19:51
* @LastEditors : Shiming
* @LastEditTime : 2022-03-03 14:24:51
* @LastEditTime : 2022-03-04 16:46:31
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -28,6 +28,8 @@ import { SupplyManagementService } from '../../services/supply-management.servic
styleUrls: ['./tran-agreement.component.less']
})
export class TranAgreementComponent {
enterpriseInfo:any; // 网络货运人
type:any;
object: any;
agreement:any;
envCache:any;
@ -38,13 +40,30 @@ export class TranAgreementComponent {
ngOnInit() {
console.log(this.object)
const params = {
// 获取托运人承运人信息
this.service.request(this.service.$api_getContractAtr,{id:this.object?.shipperAppUserId}).subscribe(res => {
if (res) {
this.enterpriseInfo = res
this.getContent();
}
});
}
getContent() {
let params:any;
if(this.type ==='onecar'){
params = {
contractType:'1',
resourceType: '1',
signingObject: '1',
templateType: 'MX',
parametersDTO: {
contractCode:'',
shipperLegalPersonName:this.enterpriseInfo.legalPersonName, //托运法定代表人
carrierLegalPersonName:this.enterpriseInfo.netLegalPersonName, //承运法定代表人
shipperName:this?.shipperName, //托运人
carrierName:this.object?.enterpriseInfoName, //承运人
consignorInfo: `${this.object?.unLoadingPlaceDTOList[0].appUserName} ${this.object?.unLoadingPlaceDTOList[0].contractTelephone}`, // 发货信息
@ -69,15 +88,48 @@ export class TranAgreementComponent {
day:new Date().getDate(), // 签约日期
}
}
} else if(this.type ==='bulk'){
params = {
contractType:'1',
resourceType: '2',
signingObject: '1',
templateType: 'MX',
parametersDTO: {
contractCode:'',
shipperName:this?.shipperName, //托运人
carrierName:this.object?.enterpriseInfoName, //承运人
shipperLegalPersonName:this.enterpriseInfo.legalPersonName, //托运法定代表人
carrierLegalPersonName:this.enterpriseInfo.netLegalPersonName, //承运法定代表人
consignorInfo: `${this.object.unLoadingPlaceDTOList[0].appUserName} ${this.object.unLoadingPlaceDTOList[0].contractTelephone}`, // 发货信息
consignorAddress: this.object.unLoadingPlaceDTOList[0].detailedAddress, // 发货地址
consignorDate: '', // 发货时间
consigneeInfo: `${this.object.unLoadingPlaceDTOList[this.object.unLoadingPlaceDTOList.length-1].appUserName} ${this.object.unLoadingPlaceDTOList[this.object.unLoadingPlaceDTOList.length-1].contractTelephone}`, // 收货信息
consigneeDate: '', // 收货时间
consigneeAddress: this.object.unLoadingPlaceDTOList[this.object.unLoadingPlaceDTOList.length-1].detailedAddress, // 收货地址
goodsName:this.object.goodsInfoDTOList[0].goodsName, // 货物名称
shippingType:'大宗运输',
consignmentVolume:`${this.object.goodsInfoDTOList[0].weight}吨/${this.object.goodsInfoDTOList[0].volume}方/${this.object.goodsInfoDTOList[0].number}车`, //托运量
transporterInfo:'', //运输方信息
freightAmount:'', // 订单运费金额（元)
pre:'', //预付
rece:'',// 到付
back:'',// 回单付
lunarKnot:'',
total:'', // 合计（元)
paymentTime:`到货后${this.object.paymentDays}天`, // 承诺支付运费时间
year:new Date().getFullYear(), // 签约年份
month:new Date().getMonth()+1, // 签约月份
day:new Date().getDate(), // 签约日期
},
}
}
console.log(params)
this.service.request(this.service.$api_getContractContent,params).subscribe((res) => {
if (res) {
this.agreement = res.contractContent;
}
});
}
handleOk(){
this.modal.close(true);
}