|
@@ -1127,6 +1127,7 @@ func GenerateWordV2(contractDetail *contract.ContractDetail, wordPath string) (e
|
|
|
cp.SetDescription("弘则弥道(上海)投资咨询有限公司 研究服务合同")
|
|
|
cp.SetLanguage("中文")
|
|
|
|
|
|
+ tableFontSize := 10.5
|
|
|
for _, data := range contractData {
|
|
|
fontSize := data.FontSize
|
|
|
if fontSize <= 0 {
|
|
@@ -1159,13 +1160,12 @@ func GenerateWordV2(contractDetail *contract.ContractDetail, wordPath string) (e
|
|
|
|
|
|
isBold := false
|
|
|
backgrandColor := ""
|
|
|
- fontSize := 10.0
|
|
|
+ fontSize := tableFontSize
|
|
|
|
|
|
|
|
|
if j == 0 {
|
|
|
isBold = true
|
|
|
backgrandColor = "gray_2"
|
|
|
- fontSize = 12.0
|
|
|
}
|
|
|
|
|
|
|
|
@@ -1347,13 +1347,12 @@ func GenerateWordV2(contractDetail *contract.ContractDetail, wordPath string) (e
|
|
|
|
|
|
isBold := false
|
|
|
backgrandColor := ""
|
|
|
- fontSize := 10.0
|
|
|
+ fontSize := tableFontSize
|
|
|
|
|
|
|
|
|
if j == 0 {
|
|
|
isBold = true
|
|
|
backgrandColor = "gray_2"
|
|
|
- fontSize = 12.0
|
|
|
}
|
|
|
|
|
|
|
|
@@ -1653,10 +1652,13 @@ func getPrintData(data WordElement, contractDetail *contract.ContractDetail) (is
|
|
|
func addTableV2(tableDataList TableData, doc *document.Document) (err error) {
|
|
|
|
|
|
|
|
|
- nowParagraph := doc.AddParagraph()
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
- table := doc.InsertTableAfter(nowParagraph)
|
|
|
+
|
|
|
+ doc.AddParagraph().Properties().AddSection(wml.ST_SectionMarkNextPage)
|
|
|
+ table := doc.AddTable()
|
|
|
|
|
|
tableWidth := 6.5
|
|
|
table.Properties().SetWidth(measurement.Distance(tableWidth * measurement.Inch))
|
|
@@ -1770,6 +1772,7 @@ func addTableV2(tableDataList TableData, doc *document.Document) (err error) {
|
|
|
|
|
|
}
|
|
|
}
|
|
|
+ doc.AddParagraph()
|
|
|
return
|
|
|
}
|
|
|
|