From a82f0830a132be063a63dcd7dd2ccca2179d5738 Mon Sep 17 00:00:00 2001
From: zhangzhengmei <zhangzhengmei@prec-tech.com>
Date: 星期日, 06 八月 2023 10:46:38 +0800
Subject: [PATCH] QISPDF课题修改同步
---
force-app/main/default/pages/QISPDF.page | 46 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/force-app/main/default/pages/QISPDF.page b/force-app/main/default/pages/QISPDF.page
index f0465a6..09f7e6b 100644
--- a/force-app/main/default/pages/QISPDF.page
+++ b/force-app/main/default/pages/QISPDF.page
@@ -400,9 +400,9 @@
</table>
- </div>
- <div style="page-break-after: always;"></div>
- <div class="pdf-page">
+ <!-- </div> -->
+ <div style="page-break-after: always;height: 20px;"></div>
+ <!-- <div class="pdf-page"> -->
<table width="100%" border="0">
<tr>
@@ -455,34 +455,62 @@
</table>
<br/>
<table width="100%" border="1" cellspacing="2" style="font-size: 8pt;">
- <tr>
- <td style="width:50%">
+ <tr style="display:{!IF(ISBLANK(qr.Photo_1_Text__c),'none','')};">
+ <td style="width:50%" rendered="{!NOT(ISBLANK(qr.Photo_1_Text__c))}">
<table width="100%" border="0" cellspacing="0">
<tr><td style="height:300px; text-align: center;"><apex:image id="Photo_1_Text" value="{!Photo_1_Text}" width="80%" rendered="{!NOT(ISBLANK(qr.Photo_1_Text__c))}" /></td></tr>
<tr><td style="height:40px;"></td></tr>
</table>
</td>
- <td style="border-left-color: white;">
+ <td style="border-left-color: white;" rendered="{!NOT(ISBLANK(qr.Photo_2_Text__c))}">
<table width="100%" border="0" cellspacing="0">
<tr><td style="height:300px; text-align: center;"><apex:image value="{!Photo_2_Text}" width="80%" rendered="{!NOT(ISBLANK(qr.Photo_2_Text__c))}" /></td></tr>
<tr><td style="height:40px;"></td></tr>
</table>
</td>
</tr>
- <tr>
- <td style="border-top-color: white;">
+ <tr style="display:{!IF(ISBLANK(qr.Photo_3_Text__c),'none','')};">
+ <td style="border-top-color: white;" rendered="{!NOT(ISBLANK(qr.Photo_3_Text__c))}">
<table width="100%" border="0" cellspacing="0">
<tr><td style="height:300px; text-align: center;"><apex:image value="{!Photo_3_Text}" width="80%" rendered="{!NOT(ISBLANK(qr.Photo_3_Text__c))}" /></td></tr>
<tr><td style="height:40px;"></td></tr>
</table>
</td>
- <td style="border-left-color: white; border-top-color: white;">
+ <td style="border-left-color: white; border-top-color: white;" rendered="{!NOT(ISBLANK(qr.Photo_4_Text__c))}">
<table width="100%" border="0" cellspacing="0">
<tr><td style="height:300px; text-align: center;"><apex:image value="{!Photo_4_Text}" width="80%" rendered="{!NOT(ISBLANK(qr.Photo_4_Text__c))}" /></td></tr>
<tr><td style="height:40px;"></td></tr>
</table>
</td>
</tr>
+ <tr style="display:{!IF(ISBLANK(qr.Photo_5_Text__c),'none','')};">
+ <td style="width:50%;" rendered="{!NOT(ISBLANK(qr.Photo_5_Text__c))}">
+ <table width="100%" border="0" cellspacing="0">
+ <tr><td style="height:300px; text-align: center;"><apex:image id="Photo_5_Text" value="{!Photo_5_Text}" width="80%" rendered="{!NOT(ISBLANK(qr.Photo_5_Text__c))}" /></td></tr>
+ <tr><td style="height:40px;"></td></tr>
+ </table>
+ </td>
+ <td style="border-left-color: white;" rendered="{!NOT(ISBLANK(qr.Photo_6_Text__c))}">
+ <table width="100%" border="0" cellspacing="0">
+ <tr><td style="height:300px; text-align: center;"><apex:image value="{!Photo_6_Text}" width="80%" rendered="{!NOT(ISBLANK(qr.Photo_6_Text__c))}" /></td></tr>
+ <tr><td style="height:40px;"></td></tr>
+ </table>
+ </td>
+ </tr>
+ <tr style="display:{!IF(ISBLANK(qr.Photo_7_Text__c),'none','')};">
+ <td style="border-top-color: white;" rendered="{!NOT(ISBLANK(qr.Photo_7_Text__c))}">
+ <table width="100%" border="0" cellspacing="0">
+ <tr><td style="height:300px; text-align: center;"><apex:image value="{!Photo_7_Text}" width="80%" rendered="{!NOT(ISBLANK(qr.Photo_7_Text__c))}" /></td></tr>
+ <tr><td style="height:40px;"></td></tr>
+ </table>
+ </td>
+ <td style="border-left-color: white; border-top-color: white;" rendered="{!NOT(ISBLANK(qr.Photo_8_Text__c))}">
+ <table width="100%" border="0" cellspacing="0">
+ <tr><td style="height:300px; text-align: center;"><apex:image value="{!Photo_8_Text}" width="80%" rendered="{!NOT(ISBLANK(qr.Photo_8_Text__c))}" /></td></tr>
+ <tr><td style="height:40px;"></td></tr>
+ </table>
+ </td>
+ </tr>
</table>
</div>
--
Gitblit v1.9.1