|
@@ -1079,7 +1079,7 @@ type WordElement struct {
|
|
|
}
|
|
|
|
|
|
// GenerateWordV2 生成word
|
|
|
-func GenerateWordV2(contractDetail *contract.ContractDetail, wordPath string) (err error) {
|
|
|
+func GenerateWordV2(contractDetail *contract.ContractDetail, wordPath string, isWordToPdf bool) (err error) {
|
|
|
contractTemplate, err := contract_template.GetContractTemplateByTemplateId(contractDetail.TemplateId)
|
|
|
if err != nil {
|
|
|
return
|
|
@@ -1446,7 +1446,11 @@ func GenerateWordV2(contractDetail *contract.ContractDetail, wordPath string) (e
|
|
|
if data.ElementType == "column" {
|
|
|
for j := 0; j < addTabNum; j++ {
|
|
|
//headerRun.AddTab()
|
|
|
- printContent = " " + printContent
|
|
|
+ tabStr := " "
|
|
|
+ if isWordToPdf && utils.RunMode == "release" {
|
|
|
+ tabStr = " "
|
|
|
+ }
|
|
|
+ printContent = tabStr + printContent
|
|
|
}
|
|
|
}
|
|
|
fontSize := text.FontSize
|