diff --git a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts index 843f11d8..407b3261 100644 --- a/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts +++ b/src/app/routes/supply-management/components/tran-agreement/tran-agreement.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:19:51 * @LastEditors : Shiming - * @LastEditTime : 2022-03-04 16:46:31 + * @LastEditTime : 2022-03-08 14:05:09 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\tran-agreement\\tran-agreement.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -62,30 +62,30 @@ export class TranAgreementComponent { templateType: 'MX', parametersDTO: { contractCode:'', - shipperLegalPersonName:this.enterpriseInfo.legalPersonName, //托运法定代表人 - carrierLegalPersonName:this.enterpriseInfo.netLegalPersonName, //承运法定代表人 - shipperName:this?.shipperName, //托运人 - carrierName:this.object?.enterpriseInfoName, //承运人 + 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}`, // 发货信息 consignorAddress: this.object?.unLoadingPlaceDTOList[0].detailedAddress, // 发货地址 - consignorDate: this.object?.loadingTime, // 发货时间 + consignorDate: this.object?.loadingTime || '', // 发货时间 consigneeInfo: `${this.object?.unLoadingPlaceDTOList[this.object?.unLoadingPlaceDTOList.length-1].appUserName} ${this.object?.unLoadingPlaceDTOList[this.object?.unLoadingPlaceDTOList.length-1].contractTelephone}`, // 收货信息 - consigneeDate: this.object?.unloadingTime, // 收货时间 - consigneeAddress: this.object?.unLoadingPlaceDTOList[this.object?.unLoadingPlaceDTOList.length-1].detailedAddress, // 收货地址 - goodsName:this.object?.goodsInfoDTOList[0].goodsName, // 货物名称 + consigneeDate: this.object?.unloadingTime || '', // 收货时间 + 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:this.object?.total, // 订单运费金额(元) + freightAmount:this.object?.total || '', // 订单运费金额(元) pre:this.object?.expenseDTOList?.filter((item:any) => item.expenseCode === 'PRE')[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,// 回单付 lunarKnot:0, - total:this.object?.subtotal, // 合计(元) + total:this.object?.subtotal || '', // 合计(元) paymentTime:`到货后${this.object?.paymentDays}天`, // 承诺支付运费时间 - year:new Date().getFullYear(), // 签约年份 - month:new Date().getMonth()+1, // 签约月份 - day:new Date().getDate(), // 签约日期 + year:new Date().getFullYear() || '', // 签约年份 + month:new Date().getMonth()+1 || '', // 签约月份 + day:new Date().getDate() || '', // 签约日期 } } } else if(this.type ==='bulk'){ @@ -96,17 +96,17 @@ export class TranAgreementComponent { templateType: 'MX', parametersDTO: { contractCode:'', - shipperName:this?.shipperName, //托运人 - carrierName:this.object?.enterpriseInfoName, //承运人 - shipperLegalPersonName:this.enterpriseInfo.legalPersonName, //托运法定代表人 - carrierLegalPersonName:this.enterpriseInfo.netLegalPersonName, //承运法定代表人 + 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, // 货物名称 + goodsName:this.object.goodsInfoDTOList[0]?.goodsName || '', // 货物名称 shippingType:'大宗运输', consignmentVolume:`${this.object.goodsInfoDTOList[0].weight}吨/${this.object.goodsInfoDTOList[0].volume}方/${this.object.goodsInfoDTOList[0].number}车`, //托运量 transporterInfo:'', //运输方信息 @@ -117,9 +117,9 @@ export class TranAgreementComponent { lunarKnot:'', total:'', // 合计(元) paymentTime:`到货后${this.object.paymentDays}天`, // 承诺支付运费时间 - year:new Date().getFullYear(), // 签约年份 - month:new Date().getMonth()+1, // 签约月份 - day:new Date().getDate(), // 签约日期 + year:new Date().getFullYear() || '', // 签约年份 + month:new Date().getMonth()+1 || '', // 签约月份 + day:new Date().getDate() || '', // 签约日期 }, } }