From 928399eceec50e3d37ea08669a12789a9410a9d2 Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 22 十一月 2022 16:51:16 +0800
Subject: [PATCH] 111
---
force-app/main/default/pages/RepairAgainAnPDF.page | 154 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 132 insertions(+), 22 deletions(-)
diff --git a/force-app/main/default/pages/RepairAgainAnPDF.page b/force-app/main/default/pages/RepairAgainAnPDF.page
index 3db0ac0..e2635e1 100644
--- a/force-app/main/default/pages/RepairAgainAnPDF.page
+++ b/force-app/main/default/pages/RepairAgainAnPDF.page
@@ -5,7 +5,7 @@
<style>
@page {
size: A4 portrait;
- margin: 5mm 12mm 5mm 12mm;
+ margin: 5mm 10mm 5mm 10mm;
/*@top-center {
content: element(header);
}*/
@@ -20,7 +20,7 @@
table {border-collapse: collapse;}
td.title {text-align: center; font-weight: bold; background-color: #BDBDBD; height: 23px;}
- td.middle {text-align: center; font-size:120%;}
+ td.middle {text-align: center; font-size:100%;}
td.label {padding-left: 10px; height: 23px; font-weight: bold;}
</style>
@@ -61,7 +61,7 @@
</table>
<table width="100%" cellspacing="0">
<tr>
- <td style="font-size: 10pt; text-align: left; padding: 0px 0px 0px 0px;">绠＄悊鍙�:</td>
+ <td style="font-size: 10pt; text-align: left; padding: 0px 0px 0px 0px;">绠＄悊鍙�:{!ra.Repair__r.Name}</td>
<td style="font-size: 10pt; text-align: left; padding: 0px 0px 0px 0px;"></td>
</tr>
</table>
@@ -111,13 +111,15 @@
<td class="label">鍖婚櫌</td>
<td colspan="3" class="middle">{!ra.Hospital__c}</td>
<td rowspan="7" class="label">鎶ヤ环妫�娴嬬‘璁�</td>
- <td rowspan="7" colspan="3" class="middle" style="height:161px; font-size:120%; font-weight: bold;">
+ <td rowspan="7" colspan="3" class="middle" style="height:161px; font-size:100%; font-weight: bold;">
+ <div style="text-align: left;text-indent:2em" id="Society_div">
<c:PDFWbr targetStr="{!ra.InspectionComment__c}" />
+ </div>
</td>
</tr>
<tr>
<td rowspan="1" class="label">鏁呴殰鐜拌薄</td>
- <td rowspan="1" colspan="3" class="middle" style="height:46px; font-size:120%; font-weight: bold;">
+ <td rowspan="1" colspan="3" class="middle" style="height:46px; font-size:100%; font-weight: bold;">
<c:PDFWbr targetStr="{!ra.PhenomenonName__c}" />
</td>
</tr>
@@ -201,7 +203,7 @@
</tr>
<tr>
<td width="10%" class="label">涓婃鏁呴殰缁翠慨淇℃伅</td>
- <td colspan="5" class="middle" style="height:69px; font-size:120%; font-weight: bold;">
+ <td colspan="5" class="middle" style="height:69px; font-size:100%; font-weight: bold;">
<c:PDFWbr targetStr="{!ra.InspectionFailureCause_Last__c}" />
</td>
</tr>
@@ -233,7 +235,7 @@
<td width="12%" style="text-align: right; vertical-align: bottom; font-size: 10pt;">
<table width="100%" cellspacing="0">
<tr>
- <td style="font-size: 10px; text-align: left; padding: 0px 0px 0px 0px;">绠＄悊鍙�:</td>
+ <td style="font-size: 10px; text-align: left; padding: 0px 0px 0px 0px;">绠＄悊鍙�:{!ra.Repair__r.Name}</td>
<td style="font-size: 10px; text-align: left; padding: 0px 0px 0px 0px;"></td>
</tr>
</table>
@@ -274,6 +276,20 @@
</table>
</td>
</tr>
+ <tr>
+ <td colspan="4" style="border-top-color: white;">
+ <table width="100%" border="1" cellspacing="0">
+ <tr><td style="height:250px; text-align: center;"><apex:image value="{!ra.Dectect_Picture3_URL__c}" height="90%" width="80%" rendered="{!NOT(ISBLANK(ra.Dectect_Picture3_URL__c))}" /></td></tr>
+ <tr><td style="height:40px;"></td></tr>
+ </table>
+ </td>
+ <td colspan="4" style="border-top-color: white;">
+ <table width="100%" border="1" cellspacing="0">
+ <tr><td style="height:250px; text-align: center;"><apex:image value="{!ra.Dectect_Picture4_URL__c}" height="90%" width="80%" rendered="{!NOT(ISBLANK(ra.Dectect_Picture4_URL__c))}" /></td></tr>
+ <tr><td style="height:40px;"></td></tr>
+ </table>
+ </td>
+ </tr>
</table>
</apex:outputPanel>
@@ -301,7 +317,7 @@
<td width="12%" style="text-align: right; vertical-align: bottom; font-size: 10pt;">
<table width="100%" cellspacing="0">
<tr>
- <td style="font-size: 10px; text-align: left; padding: 0px 0px 0px 0px;">绠＄悊鍙�:</td>
+ <td style="font-size: 10px; text-align: left; padding: 0px 0px 0px 0px;">绠＄悊鍙�:{!ra.Repair__r.Name}</td>
<td style="font-size: 10px; text-align: left; padding: 0px 0px 0px 0px;"></td>
</tr>
</table>
@@ -321,56 +337,116 @@
<td colspan="8" style="height:18px; padding-top: 0px; padding-bottom: 0px; padding-left: 10px; font-weight: bold">鎶�鏈娴�/鍒嗘瀽璇﹁堪</td>
</tr>
<tr>
- <td colspan="8" class="middle" style="height:138px; border-top-color: white; font-size:120%; font-weight: bold; vertical-align: top;"><c:PDFWbr targetStr="{!ra.AnalysisOSH__c}" /></td>
+ <td colspan="8" class="left" style="height:20px; border-top-color: white; font-weight: bold; vertical-align: top; padding-left: 10px;">[瀹㈣瘔鏁呴殰鐜拌薄鐨勭‘璁ょ粨鏋淽锛�
+ <apex:outputPanel rendered="{!isFirst}">
+ <apex:outputPanel layout="none" rendered="{!ra.Complaint_confirm__c == '鏈啀鐜�'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.Complaint_confirm__c <> '鏈啀鐜�'}">□</apex:outputPanel>鏈啀鐜�
+
+ <apex:outputPanel layout="none" rendered="{!ra.Complaint_confirm__c == '鍐嶇幇'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.Complaint_confirm__c <> '鍐嶇幇'}">□</apex:outputPanel>鍐嶇幇
+ </apex:outputPanel>
+ <apex:outputPanel rendered="{!!isFirst}">
+ <apex:outputPanel layout="none" rendered="{!ra.Complaint_confirm2__c == '鏈啀鐜�'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.Complaint_confirm2__c <> '鏈啀鐜�'}">□</apex:outputPanel>鏈啀鐜�
+
+ <apex:outputPanel layout="none" rendered="{!ra.Complaint_confirm2__c == '鍐嶇幇'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.Complaint_confirm2__c <> '鍐嶇幇'}">□</apex:outputPanel>鍐嶇幇
+ </apex:outputPanel>
+ </td>
</tr>
+
+ <tr>
+ <td colspan="8" class="left" style="height:20px; border-top-color: white; font-weight: bold; vertical-align: top; padding-left: 10px;">[瀹㈣瘔鏁呴殰鐜拌薄浠ュ鐨勫叾浠栨晠闅滃唴瀹筣锛�<apex:outputPanel rendered="{!isFirst}">{!ra.Complaint_otherFault__c}</apex:outputPanel>{!ra.Complaint_otherFault2__c}
+ </td>
+ </tr>
+ <!-- <tr>
+ <td colspan="8" class="middle" style="height:50px; border-top-color: white; font-size:100%; font-weight: bold; vertical-align: top;"><c:PDFWbr rendered="{!isFirst}" targetStr="{!ra.AnalysisOSH__c}" /> <c:PDFWbr rendered="{!!isFirst}" targetStr="{!ra.AnalysisOSH2__c}" /></td>
+ </tr> -->
+ <tr>
+ <td colspan="8" style="height:50px;border-top-color: white; font-size:100%; font-weight: bold; vertical-align: top;">
+ <apex:outputField value="{!ra.AnalysisOSH__c}"/>
+ </td>
+ </tr>
+
<tr>
<td colspan="8" style="height:18px; padding-top: 0px; padding-bottom: 0px; padding-left: 10px;">鍘熷洜</td>
</tr>
<tr>
- <td colspan="8" class="middle" style="height:69px; border-top-color: white; font-size:120%; font-weight: bold; vertical-align: top;"><c:PDFWbr targetStr="{!ra.AnalysisReasonOSH__c}" /></td>
+ <td colspan="8" class="middle" style="height:50px; border-top-color: white; font-size:100%; font-weight: bold; vertical-align: top;"><c:PDFWbr rendered="{!isFirst}" targetStr="{!ra.AnalysisReasonOSH__c}" /><c:PDFWbr rendered="{!!isFirst}" targetStr="{!ra.AnalysisReasonOSH2__c}" /></td>
+ </tr>
+
+ <tr>
+ <td colspan="8" class="left" style="height:20px; border-top-color: white; font-weight: bold; vertical-align: top; padding-left: 10px;"> 瀵瑰簲鎺柦锛�</td>
</tr>
<tr>
- <td colspan="8" style="height:18px; padding-top: 0px; padding-bottom: 0px; padding-left: 10px;">瀵瑰簲鎺柦锛�</td>
+ <td colspan="8" class="middle" style="height:50px; border-top-color: white; font-size:100%; font-weight: bold; vertical-align: top;"><c:PDFWbr rendered="{!isFirst}" targetStr="{!ra.Countermeasures__c}" /> <c:PDFWbr rendered="{!!isFirst}" targetStr="{!ra.Countermeasures2__c}" /></td>
</tr>
+
<tr>
<td class="label">璐ㄩ噺鍒ゅ畾</td>
<td colspan="7" class="label">
- <apex:outputPanel layout="none" rendered="{!ra.JudgementOSH__c == '璐ㄩ噺鍘熷洜'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.JudgementOSH__c <> '璐ㄩ噺鍘熷洜'}">□</apex:outputPanel>璐ㄩ噺鍘熷洜
+ <apex:outputPanel rendered="{!isFirst}">
+ <apex:outputPanel layout="none" rendered="{!ra.JudgementOSH__c == '璐ㄩ噺鍘熷洜'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.JudgementOSH__c <> '璐ㄩ噺鍘熷洜'}">□</apex:outputPanel>璐ㄩ噺鍘熷洜
<apex:outputPanel layout="none" rendered="{!ra.JudgementOSH__c == '闈炶川閲忓師鍥�'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.JudgementOSH__c <> '闈炶川閲忓師鍥�'}">□</apex:outputPanel>闈炶川閲忓師鍥�
<apex:outputPanel layout="none" rendered="{!ra.JudgementOSH__c == '鏁呴殰鏈啀鐜�'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.JudgementOSH__c <> '鏁呴殰鏈啀鐜�'}">□</apex:outputPanel>鏁呴殰鏈啀鐜�
+ </apex:outputPanel>
+ <apex:outputPanel rendered="{! !isFirst}">
+ <apex:outputPanel layout="none" rendered="{!ra.JudgementOSH2__c == '璐ㄩ噺鍘熷洜'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.JudgementOSH2__c <> '璐ㄩ噺鍘熷洜'}">□</apex:outputPanel>璐ㄩ噺鍘熷洜
+
+ <apex:outputPanel layout="none" rendered="{!ra.JudgementOSH2__c == '闈炶川閲忓師鍥�'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.JudgementOSH2__c <> '闈炶川閲忓師鍥�'}">□</apex:outputPanel>闈炶川閲忓師鍥�
+
+ <apex:outputPanel layout="none" rendered="{!ra.JudgementOSH2__c == '鏁呴殰鏈啀鐜�'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.JudgementOSH2__c <> '鏁呴殰鏈啀鐜�'}">□</apex:outputPanel>鏁呴殰鏈啀鐜�
+ </apex:outputPanel>
</td>
</tr>
<tr>
<td class="label">鎶�鏈搴�</td>
<td colspan="7" class="label">
+ <apex:outputPanel rendered="{!isFirst}">
<apex:outputPanel layout="none" rendered="{!ra.ActionOSH__c == '鏃犲伩缁翠慨'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOSH__c <> '鏃犲伩缁翠慨'}">□</apex:outputPanel>鏃犲伩缁翠慨
<apex:outputPanel layout="none" rendered="{!ra.ActionOSH__c == '鏈夊伩缁翠慨'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOSH__c <> '鏈夊伩缁翠慨'}">□</apex:outputPanel>鏈夊伩缁翠慨
+ <apex:outputPanel layout="none" rendered="{!ra.ActionOSH__c == '鏃犲伩+鏈夊伩'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOSH__c <> '鏃犲伩+鏈夊伩'}">□</apex:outputPanel>鏃犲伩+鏈夊伩
+
<apex:outputPanel layout="none" rendered="{!ra.ActionOSH__c == '閫佸洖'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOSH__c <> '閫佸洖'}">□</apex:outputPanel>閫佸洖
<apex:outputPanel layout="none" rendered="{!ra.ActionOSH__c == '缁х画瑙傚療'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOSH__c <> '缁х画瑙傚療'}">□</apex:outputPanel>缁х画瑙傚療
+ </apex:outputPanel>
+ <apex:outputPanel rendered="{! !isFirst}">
+ <apex:outputPanel layout="none" rendered="{!ra.ActionOSH2__c == '鏃犲伩缁翠慨'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOSH2__c <> '鏃犲伩缁翠慨'}">□</apex:outputPanel>鏃犲伩缁翠慨
+
+ <apex:outputPanel layout="none" rendered="{!ra.ActionOSH2__c == '鏈夊伩缁翠慨'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOSH2__c <> '鏈夊伩缁翠慨'}">□</apex:outputPanel>鏈夊伩缁翠慨
+
+ <apex:outputPanel layout="none" rendered="{!ra.ActionOSH2__c == '鏃犲伩+鏈夊伩'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOSH2__c <> '鏃犲伩+鏈夊伩'}">□</apex:outputPanel>鏃犲伩+鏈夊伩
+
+ <apex:outputPanel layout="none" rendered="{!ra.ActionOSH2__c == '閫佸洖'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOSH2__c <> '閫佸洖'}">□</apex:outputPanel>閫佸洖
+
+ <apex:outputPanel layout="none" rendered="{!ra.ActionOSH2__c == '缁х画瑙傚療'}">✔</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOSH2__c <> '缁х画瑙傚療'}">□</apex:outputPanel>缁х画瑙傚療
+ </apex:outputPanel>
</td>
</tr>
<tr>
<td width="10%" class="label">妫�娴嬭��</td>
- <td width="15%" class="middle">{!ra.OSH_Detector__r.Name}</td>
+ <td width="15%" class="middle"><apex:outputPanel rendered="{!isFirst}">{!ra.OSH_Detector__r.Name}</apex:outputPanel>{!ra.OSH_Detector2__r.Name}</td>
<td width="10%" class="label">纭鑰�</td>
- <td width="15%" class="middle">{!ra.OSH_Confirmer__r.Name}</td>
+ <td width="15%" class="middle"><apex:outputPanel rendered="{!isFirst}">{!ra.OSH_Confirmer__r.Name}</apex:outputPanel>{!ra.OSH_Confirmer2__r.Name}</td>
<td width="10%" class="label">纭鏃�</td>
- <td width="15%" class="middle"><apex:outputField value="{!ra.OSH_Confirmation_Date__c}"/></td>
+ <td width="15%" class="middle"><apex:outputField rendered="{!isFirst}" value="{!ra.OSH_Confirmation_Date__c}"/><apex:outputField rendered="{!!isFirst}" value="{!ra.OSH_Confirmation_Date2__c}"/></td>
<td width="10%" class="label">闄勫浘鐗�</td>
<td width="15%" class="label">
- <apex:outputPanel layout="none" rendered="{!ra.OSH_Dectect_Picture1_URL__c != null || ra.OSH_Dectect_Picture2_URL__c != null || ra.OSH_Dectect_Picture3_URL__c != null || ra.OSH_Dectect_Picture4_URL__c != null}">✔</apex:outputPanel>
- <apex:outputPanel layout="none" rendered="{!ra.OSH_Dectect_Picture1_URL__c == null && ra.OSH_Dectect_Picture2_URL__c == null && ra.OSH_Dectect_Picture3_URL__c == null && ra.OSH_Dectect_Picture4_URL__c == null}">□</apex:outputPanel>鏈�
+ <apex:outputPanel layout="none" rendered="{!ra.OSH_Dectect_Picture1_URL__c != null || ra.OSH_Dectect_Picture2_URL__c != null || ra.OSH_Dectect_Picture3_URL__c != null || ra.OSH_Dectect_Picture4_URL__c != null || ra.OSH_Dectect_Picture5_URL__c != null || ra.OSH_Dectect_Picture6_URL__c != null || ra.OSH_Dectect_Picture7_URL__c != null || ra.OSH_Dectect_Picture8_URL__c != null}">✔</apex:outputPanel>
+ <apex:outputPanel layout="none" rendered="{!ra.OSH_Dectect_Picture1_URL__c == null && ra.OSH_Dectect_Picture2_URL__c == null && ra.OSH_Dectect_Picture3_URL__c == null && ra.OSH_Dectect_Picture4_URL__c == null || ra.OSH_Dectect_Picture5_URL__c == null || ra.OSH_Dectect_Picture6_URL__c == null || ra.OSH_Dectect_Picture7_URL__c == null || ra.OSH_Dectect_Picture8_URL__c == null}">□</apex:outputPanel>鏈�
- <apex:outputPanel layout="none" rendered="{!ra.OSH_Dectect_Picture1_URL__c == null && ra.OSH_Dectect_Picture2_URL__c == null && ra.OSH_Dectect_Picture3_URL__c == null && ra.OSH_Dectect_Picture4_URL__c == null}">✔</apex:outputPanel>
- <apex:outputPanel layout="none" rendered="{!ra.OSH_Dectect_Picture1_URL__c != null || ra.OSH_Dectect_Picture2_URL__c != null || ra.OSH_Dectect_Picture3_URL__c != null || ra.OSH_Dectect_Picture4_URL__c != null}">□</apex:outputPanel>鏃�
+ <apex:outputPanel layout="none" rendered="{!ra.OSH_Dectect_Picture1_URL__c == null && ra.OSH_Dectect_Picture2_URL__c == null && ra.OSH_Dectect_Picture3_URL__c == null && ra.OSH_Dectect_Picture4_URL__c == null || ra.OSH_Dectect_Picture5_URL__c == null || ra.OSH_Dectect_Picture6_URL__c == null || ra.OSH_Dectect_Picture7_URL__c == null || ra.OSH_Dectect_Picture8_URL__c == null}">✔</apex:outputPanel>
+ <apex:outputPanel layout="none" rendered="{!ra.OSH_Dectect_Picture1_URL__c != null || ra.OSH_Dectect_Picture2_URL__c != null || ra.OSH_Dectect_Picture3_URL__c != null || ra.OSH_Dectect_Picture4_URL__c != null || ra.OSH_Dectect_Picture5_URL__c != null || ra.OSH_Dectect_Picture6_URL__c != null || ra.OSH_Dectect_Picture7_URL__c != null || ra.OSH_Dectect_Picture8_URL__c != null}">□</apex:outputPanel>鏃�
</td>
</tr>
- <apex:outputPanel layout="none" rendered="{!status>=2}">
+ <tr>
+ <td colspan="2" class="label">瀹℃牳鑰�</td>
+ <td colspan="2" class="middle"> <apex:outputPanel rendered="{!isFirst}">{!ra.OSH_Auditor__r.Name}</apex:outputPanel>{!ra.OSH_Auditor2__r.Name}</td>
+ <td colspan="2" class="label">瀹℃牳纭鏃�</td>
+ <td colspan="2" class="middle"> <apex:outputField rendered="{!isFirst}" value="{!ra.RepairAgainAn_Approve_Confirm__c}"/> <apex:outputField rendered="{!!isFirst}" value="{!ra.RepairAgainAn_Approve_Confirm2__c}"/></td>
+ </tr>
+ <apex:outputPanel layout="none" rendered="{!status>=2}">
<tr>
<td colspan="8" style="border-top-color: white;">
<table width="100%" border="1" cellspacing="0">
@@ -414,6 +490,40 @@
</table>
</apex:outputPanel>
+ <apex:outputPanel layout="none" rendered="{!status>=2 && (ra.OSH_Dectect_Picture5_URL__c != null || ra.OSH_Dectect_Picture6_URL__c != null || ra.OSH_Dectect_Picture7_URL__c != null || ra.OSH_Dectect_Picture8_URL__c != null)}">
+ <div style="page-break-after: always;"></div>
+ <table width="100%" border="1" cellspacing="0">
+ <tr>
+ <td colspan="4" style="border-top-color: white;">
+ <table width="100%" border="1" cellspacing="0">
+ <tr><td style="height:250px; text-align: center;"><apex:image value="{!ra.OSH_Dectect_Picture5_URL__c}" height="90%" width="80%" rendered="{!NOT(ISBLANK(ra.OSH_Dectect_Picture5_URL__c))}" /></td></tr>
+ <tr><td style="height:40px;"></td></tr>
+ </table>
+ </td>
+ <td colspan="4" style="border-left-color: white;">
+ <table width="100%" border="1" cellspacing="0">
+ <tr><td style="height:250px; text-align: center;"><apex:image value="{!ra.OSH_Dectect_Picture6_URL__c}" height="90%" width="80%" rendered="{!NOT(ISBLANK(ra.OSH_Dectect_Picture6_URL__c))}" /></td></tr>
+ <tr><td style="height:40px;"></td></tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="4" style="border-top-color: white;">
+ <table width="100%" border="1" cellspacing="0">
+ <tr><td style="height:250px; text-align: center;"><apex:image value="{!ra.OSH_Dectect_Picture7_URL__c}" height="90%" width="80%" rendered="{!NOT(ISBLANK(ra.OSH_Dectect_Picture7_URL__c))}" /></td></tr>
+ <tr><td style="height:40px;"></td></tr>
+ </table>
+ </td>
+ <td colspan="4" style="border-left-color: white;">
+ <table width="100%" border="1" cellspacing="0">
+ <tr><td style="height:250px; text-align: center;"><apex:image value="{!ra.OSH_Dectect_Picture8_URL__c}" height="90%" width="80%" rendered="{!NOT(ISBLANK(ra.OSH_Dectect_Picture8_URL__c))}" /></td></tr>
+ <tr><td style="height:40px;"></td></tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </apex:outputPanel>
+
<!-- 鍦ㄥ厓绱犲悗鎻掑叆鍒嗛〉绗� -->
<apex:outputPanel layout="none" rendered="{!status>=3}">
<div style="page-break-after: always;"></div>
@@ -436,7 +546,7 @@
<td width="12%" style="text-align: right; vertical-align: bottom; font-size: 10pt;">
<table width="100%" cellspacing="0">
<tr>
- <td style="font-size: 10px; text-align: left; padding: 0px 0px 0px 0px;">绠＄悊鍙�:</td>
+ <td style="font-size: 10px; text-align: left; padding: 0px 0px 0px 0px;">绠＄悊鍙�:{!ra.Repair__r.Name}</td>
<td style="font-size: 10px; text-align: left; padding: 0px 0px 0px 0px;"></td>
</tr>
</table>
@@ -452,7 +562,7 @@
<td colspan="6" class="title">瀹㈡埛瀵瑰簲锛圤CSM鏈嶅姟鏈儴濉啓锛�</td>
</tr>
<tr>
- <td colspan="6" class="middle" style="height:92px; border-top-color: white; font-size:120%; font-weight: bold; verical-align: top;"><c:PDFWbr targetStr="{!ra.AnalysisOCM__c}" /></td>
+ <td colspan="6" class="middle" style="height:92px; border-top-color: white; font-size:100%; font-weight: bold; verical-align: top;"><c:PDFWbr targetStr="{!ra.AnalysisOCM__c}" /></td>
</tr>
<tr>
<td class="label">瀹㈡埛瀵瑰簲</td>
--
Gitblit v1.9.1