diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl index 6fe94418ab..7bb1788c2d 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/carContract.ftl @@ -796,7 +796,7 @@ - ${createOrgName1!} + ${createOrgName1!} @@ -906,7 +906,7 @@ - ${createDate!} + ${createDate!} @@ -1533,18 +1533,18 @@ - - + + - - + + - 年 月 日 年 月 日 + 年 月 日 年 月 日 <#-- diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl index da3e1751fc..6f84cd53f0 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl @@ -1409,7 +1409,7 @@ - 甲方: 乙方: + 甲方: 乙方: @@ -1539,7 +1539,7 @@ - 地址: + 地址: diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl index 97ccfc4e98..ede19817cf 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl @@ -1411,7 +1411,7 @@ - 甲方: 乙方: + 甲方: 乙方: @@ -1541,7 +1541,7 @@ - 地址: + 地址: diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl index 839cdf6814..4387f9a405 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl @@ -668,6 +668,350 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 车架号 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 开票类型 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 开票金额 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 开票名称 + + + + + <#list invoicList as invoic> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${invoic_index+1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${invoic.vinNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${invoic.type!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${invoic.invoicMoney!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${invoic.invoicName!} + + + + + + + <#-- @@ -833,6 +1177,200 @@ <#list invoicList as invoic> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${invoic_index+1} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${invoic.vinNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${invoic.type!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${invoic.invoicMoney!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${invoic.invoicName!} + + + + + + + + + <#–<#list invoicList as invoic> @@ -992,8 +1530,8 @@ - - + –> + --> diff --git a/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl b/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl index 6b0874e367..23d818c3ea 100644 --- a/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl +++ b/anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl @@ -1157,7 +1157,7 @@ - ${vinNo!} + ${vinNo!} @@ -1171,6 +1171,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +