From bfca7a84bec815da594f1d12558535ed06d2490b Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 13 九月 2022 09:57:32 +0800
Subject: [PATCH] 本地提交备份

---
 force-app/main/default/pages/RepairAgainAnPDF.page |  336 +++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 227 insertions(+), 109 deletions(-)

diff --git a/force-app/main/default/pages/RepairAgainAnPDF.page b/force-app/main/default/pages/RepairAgainAnPDF.page
index 1a83154..3db0ac0 100644
--- a/force-app/main/default/pages/RepairAgainAnPDF.page
+++ b/force-app/main/default/pages/RepairAgainAnPDF.page
@@ -1,28 +1,63 @@
-<apex:page controller="RepairAgainAnPDFController" showHeader="false" sidebar="false" renderAs="pdf" action="{!init}" applyHtmlTag="false">
+<apex:page controller="RepairAgainAnPDFController" showHeader="false" sidebar="false" renderAs="PDF" action="{!init}" applyHtmlTag="false">
 <html>
     <head>
+
         <style>
             @page {
                 size: A4 portrait;
                 margin: 5mm 12mm 5mm 12mm;
+                /*@top-center {
+                    content: element(header);
+                }*/
             }
+
+            /*div.header {
+                margin-top:10px;
+                width: 10%;
+                margin-right: 10px;
+                position: running(header);
+            }*/
             
             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.label {padding-left: 10px; height: 23px; font-weight: bold;}    
+            td.label {padding-left: 10px; height: 23px; font-weight: bold;}   
+
         </style>
+
+        <script type="text/javascript">
+        window.onload=function(){
+
+            function my$(id){
+                return document.getElementById(id);
+            }
+
+            function showAndHide(){
+              var status=!status;
+              alert("褰撳墠椤甸潰鐘舵�佷负锛�"+status);
+            }
+            showAndHide();
+        }
+        </script>
+
     </head>
     <body style="font-family: Arial Unicode MS;">
+        <!-- <div class="header">
+            <apex:image id="logo" value="{!$Resource.RepairAgainAnPDF_Header}" />
+        </div> -->
         <table width="100%" border="0">
             <tr>
-                <td width="15%">
+                <td width="20%">
                     <table width="100%" border="1" cellspacing="0" style="border-color: red;">
-                        <tr><td colspan="2" style="font-size: 7px; font-weight: bold; color: red; text-align: center; padding: 0px 0px 0px 0px; border-color: red;">OLYMPUS</td></tr>
+                        <tr><td colspan="2" style="font-size: 6px; font-weight: bold; color: red; text-align: center; padding: 0px 0px 0px 0px;">OLYMPUS</td></tr>
                         <tr>
-                            <td style="font-size: 7px; color: red; text-align: center; padding: 0px 0px 0px 0px; border-color: red;" width="80%" >CONFIDENTIAL</td>
-                            <td style="font-size: 7px; color: red; text-align: center; padding: 0px 0px 0px 0px; border-color: red;">銑�</td>
+                            <td style="font-size: 7px; color: red; text-align: center; padding: 0px 0px 0px 0px; border-color: red;" width="80%" >INTERNAL USER ONLY</td>
+                            <td style="font-size: 7px; color: red; text-align: center; padding: 0px 0px 0px 0px; border-color: red;">绀惧绉�</td>
                         </tr>
+                    </table>
+                    <table width="100%" border="0" cellspacing="0" style="border-color: red;">
+                    <tr><td colspan="2" style="font-size: 6px; font-weight: bold; color: red; text-align: center; padding: 0px 0px 0px 0px;">
+                    绀惧唴瀵�:鍏徃鍐呴儴鍏紑</td></tr>
                     </table>
                     <table width="100%" cellspacing="0">
                         <tr>
@@ -109,7 +144,7 @@
                             <td width="10%" class="label" height="23px">鎶ュ憡鑰�</td>
                             <td width="15%" class="middle">{!ra.Reporter__r.Name}</td>
                             <td width="10%" class="label">纭鑰�</td>
-                            <td width="15%" class="middle">{!ra.FSE_Confirmer__r.Name}</td>
+                            <td width="15%" class="middle">{!ra.RC_Confirmer__r.Name}</td>
                             <td width="10%" class="label">鎶ュ憡鏃�</td>
                             <td width="15%" class="middle"><apex:outputField value="{!ra.Report_Date__c}"/></td>
                             <td width="10%" class="label">闄勫浘鐗�</td>
@@ -173,11 +208,114 @@
                     </table>
                 </td>
             </tr>
+        </table>
+
+         <!-- 鍦ㄥ厓绱犲悗鎻掑叆鍒嗛〉绗� -->
+
+        <apex:outputPanel layout="none" rendered="{!ra.Dectect_Picture1_URL__c != null || ra.Dectect_Picture2_URL__c != null}">
+        <div style="page-break-after: always;"></div>
+        <table width="100%" border="0">
+            <tr>
+                <td width="20%">
+                    <table width="100%" border="1" cellspacing="0" style="border-color: red;">
+                        <tr><td colspan="2" style="font-size: 6px; font-weight: bold; color: red; text-align: center; padding: 0px 0px 0px 0px;">OLYMPUS</td></tr>
+                        <tr>
+                            <td style="font-size: 7px; color: red; text-align: center; padding: 0px 0px 0px 0px; border-color: red;" width="80%" >INTERNAL USER ONLY</td>
+                            <td style="font-size: 7px; color: red; text-align: center; padding: 0px 0px 0px 0px; border-color: red;">绀惧绉�</td>
+                        </tr>
+                    </table>
+                    <table width="100%" border="0" cellspacing="0" style="border-color: red;">
+                    <tr><td colspan="2" style="font-size: 6px; font-weight: bold; color: red; text-align: center; padding: 0px 0px 0px 0px;">
+                    绀惧唴瀵�:鍏徃鍐呴儴鍏紑</td></tr>
+                    </table>
+                </td>
+                <td  style="text-align: center;"><span style="font-size: 14pt;">鍐嶄慨鐞嗚繑鍝佸垎鏋愭姤鍛�</span></td>
+                <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;"></td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
+
+        <div style="height:3px;"></div>
+        <table width="100%" border="1" cellspacing="0" style="font-size: 8pt;">
+            <tr>
+                <td width="10%" class="label" height="23px">鏈哄瀷</td>
+                <td width="15%" class="middle"><c:PDFWbr targetStr="{!ra.Asset_Model_No__c}"/></td>
+                <td width="10%" class="label">鏈鸿韩鍙�</td>
+                <td width="15%" class="middle">{!ra.SerialNumber__c}</td>
+                <td width="10%" class="label">鍙楃悊鏃�</td>
+                <td width="15%" class="middle"><apex:outputField value="{!ra.AcceptDate__c}"/></td>
+                <td width="10%" class="label">鎶ュ憡鏃�</td>
+                <td width="15%" class="middle"><apex:outputField value="{!ra.Report_Date__c}"/></td>
+            </tr> 
+            <tr>
+                <td colspan="8" style="border-top-color: white;">
+                     <table width="100%" border="1" cellspacing="0">
+                <tr><td class="title">鏈鎶ヤ环妫�娴嬪浘鐗�</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.Dectect_Picture1_URL__c}" height="90%" width="80%" rendered="{!NOT(ISBLANK(ra.Dectect_Picture1_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_Picture2_URL__c}" height="90%" width="80%" rendered="{!NOT(ISBLANK(ra.Dectect_Picture2_URL__c))}" /></td></tr>
+                            <tr><td style="height:40px;"></td></tr>
+                      </table>
+                    </td>
+                </tr>
+        </table>
+        </apex:outputPanel>
+
+
+        <!-- 鍦ㄥ厓绱犲悗鎻掑叆鍒嗛〉绗� -->
+        
+        <apex:outputPanel layout="none" rendered="{!status>=2}">
+        <div style="page-break-after: always;"></div>
+        <table width="100%" border="0" display = "none">
+            <tr>
+                <td width="20%">
+                    <table width="100%" border="1" cellspacing="0" style="border-color: red;">
+                        <tr><td colspan="2" style="font-size: 6px; font-weight: bold; color: red; text-align: center; padding: 0px 0px 0px 0px;">OLYMPUS</td></tr>
+                        <tr>
+                            <td style="font-size: 7px; color: red; text-align: center; padding: 0px 0px 0px 0px; border-color: red;" width="80%" >INTERNAL USER ONLY</td>
+                            <td style="font-size: 7px; color: red; text-align: center; padding: 0px 0px 0px 0px; border-color: red;">绀惧绉�</td>
+                        </tr>
+                    </table>
+                    <table width="100%" border="0" cellspacing="0" style="border-color: red;">
+                    <tr><td colspan="2" style="font-size: 6px; font-weight: bold; color: red; text-align: center; padding: 0px 0px 0px 0px;">
+                    绀惧唴瀵�:鍏徃鍐呴儴鍏紑</td></tr>
+                    </table>
+                </td>
+                <td  style="text-align: center;"><span style="font-size: 14pt;">鍐嶄慨鐞嗚繑鍝佸垎鏋愭姤鍛�</span></td>
+                <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;"></td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
+        <div style="height:3px;"></div>
+        <table width="100%" border="1" cellspacing="2" style="font-size: 8pt;">
             <tr>
                 <td style="border-top-color: white;">
+                    <apex:outputPanel layout="none" rendered="{!status>=2}">
                     <table width="100%" border="1" cellspacing="0">
                         <tr>
-                            <td colspan="8" class="title">鎶�鏈娴嬪垎鏋愶紙OSH鍖荤枟鍝佽川淇濋殰閮ㄥ~鍐欙級</td>
+                            <td colspan="8" class="title">妫�娴嬪垎鏋愶紙OSH鍝佽川閮ㄩ棬濉啓锛�</td>
                         </tr>
                         <tr>
                             <td colspan="8" style="height:18px; padding-top: 0px; padding-bottom: 0px; padding-left: 10px; font-weight: bold">鎶�鏈娴�/鍒嗘瀽璇﹁堪</td>
@@ -192,7 +330,10 @@
                             <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>
                         </tr>
                         <tr>
-                            <td class="label">缁撹</td>
+                            <td colspan="8" style="height:18px; padding-top: 0px; padding-bottom: 0px; padding-left: 10px;">瀵瑰簲鎺柦锛�</td>
+                        </tr>
+                        <tr>
+                            <td class="label">璐ㄩ噺鍒ゅ畾</td>
                             <td colspan="7" class="label">
                                 <apex:outputPanel layout="none" rendered="{!ra.JudgementOSH__c == '璐ㄩ噺鍘熷洜'}">&#10004;</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.JudgementOSH__c <> '璐ㄩ噺鍘熷洜'}">&#9633;</apex:outputPanel>璐ㄩ噺鍘熷洜
                                 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -229,57 +370,67 @@
                                 <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}">&#9633;</apex:outputPanel>鏃�
                             </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">
+                                       <tr><td class="title">OSH鍝佽川閮ㄩ棬妫�娴嬪浘鐗�</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_Picture1_URL__c}" height="90%" width="80%" rendered="{!NOT(ISBLANK(ra.OSH_Dectect_Picture1_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_Picture2_URL__c}" height="90%" width="80%" rendered="{!NOT(ISBLANK(ra.OSH_Dectect_Picture2_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_Picture3_URL__c}" height="90%" width="80%" rendered="{!NOT(ISBLANK(ra.OSH_Dectect_Picture3_URL__c))}" /></td></tr>
+                                  <tr><td style="height:40px;"></td></tr>
+                            </table>
+                        </td>
+                        <td colspan="4" style="border-left-color: white; 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_Picture4_URL__c}" height="90%" width="80%" rendered="{!NOT(ISBLANK(ra.OSH_Dectect_Picture4_URL__c))}" /></td></tr>
+                                  <tr><td style="height:40px;"></td></tr>
+                             </table>
+                         </td>
+                        </tr>
+                       </apex:outputPanel>
                     </table>
-                </td>
-            </tr>
-            <tr>
-                <td style="border-top-color: white;">
-                    <table width="100%" border="1" cellspacing="0">
-                        <tr>
-                            <td colspan="6" class="title">瀹㈡埛瀵瑰簲锛圤CM鏈嶅姟鏈儴濉啓锛�</td>
-                        </tr>
-                        <tr>
-                            <td colspan="6" class="middle" style="height:92px; border-top-color: white; font-size:120%; font-weight: bold; vertical-align: top;"><c:PDFWbr targetStr="{!ra.AnalysisOCM__c}" /></td>
-                        </tr>
-                        <tr>
-                            <td class="label">瀹㈡埛瀵瑰簲</td>
-                            <td colspan="5" class="label">
-                                <apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c == '鏃犲伩缁翠慨'}">&#10004;</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c <> '鏃犲伩缁翠慨'}">&#9633;</apex:outputPanel>鏃犲伩缁翠慨
-                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                <apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c == '鏈夊伩缁翠慨'}">&#10004;</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c <> '鏈夊伩缁翠慨'}">&#9633;</apex:outputPanel>鏈夊伩缁翠慨
-                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                <apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c == '閫佸洖'}">&#10004;</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c <> '閫佸洖'}">&#9633;</apex:outputPanel>閫佸洖
-                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                <apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c == '缁х画瑙傚療'}">&#10004;</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c <> '缁х画瑙傚療'}">&#9633;</apex:outputPanel>缁х画瑙傚療
-                                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                <apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c == '鐗瑰埆瀵瑰簲'}">&#10004;</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c <> '鐗瑰埆瀵瑰簲'}">&#9633;</apex:outputPanel>鐗瑰埆瀵瑰簲
-                            </td>
-                        </tr>
-                        <tr>
-                            <td width="10%" class="label" height="23px">鎶�鏈媴褰�</td>
-                            <td width="15%" class="middle">{!ra.Technical_Responsibility__r.Name}</td>
-                            <td width="10%" class="label">纭鑰�</td>
-                            <td width="15%" class="middle">{!ra.OCM_Confirmer__r.Name}</td>
-                            <td width="10%" class="label">纭鏃�</td>
-                            <td width="40%" class="middle"><apex:outputField value="{!ra.OCM_Confirmation_Date__c}"/></td> 
-                        </tr>
-                    </table>
+                    </apex:outputPanel>
                 </td>
             </tr>
         </table>
-        <!-- 鍦ㄥ厓绱犲悗鎻掑叆鍒嗛〉绗� -->
+        </apex:outputPanel>
+
+         <!-- 鍦ㄥ厓绱犲悗鎻掑叆鍒嗛〉绗� -->
+        <apex:outputPanel layout="none" rendered="{!status>=3}">
         <div style="page-break-after: always;"></div>
         <table width="100%" border="0">
             <tr>
-                <td width="15%">
+                <td width="20%">
                     <table width="100%" border="1" cellspacing="0" style="border-color: red;">
                         <tr><td colspan="2" style="font-size: 6px; font-weight: bold; color: red; text-align: center; padding: 0px 0px 0px 0px;">OLYMPUS</td></tr>
                         <tr>
-                            <td style="font-size: 7px; color: red; text-align: center; padding: 0px 0px 0px 0px; border-color: red;" width="80%" >CONFIDENTIAL</td>
-                            <td style="font-size: 7px; color: red; text-align: center; padding: 0px 0px 0px 0px; border-color: red;">銑�</td>
+                            <td style="font-size: 7px; color: red; text-align: center; padding: 0px 0px 0px 0px; border-color: red;" width="80%" >INTERNAL USER ONLY</td>
+                            <td style="font-size: 7px; color: red; text-align: center; padding: 0px 0px 0px 0px; border-color: red;">绀惧绉�</td>
                         </tr>
                     </table>
-                    
+                    <table width="100%" border="0" cellspacing="0" style="border-color: red;">
+                    <tr><td colspan="2" style="font-size: 6px; font-weight: bold; color: red; text-align: center; padding: 0px 0px 0px 0px;">
+                    绀惧唴瀵�:鍏徃鍐呴儴鍏紑</td></tr>
+                    </table>
                 </td>
                 <td  style="text-align: center;"><span style="font-size: 14pt;">鍐嶄慨鐞嗚繑鍝佸垎鏋愭姤鍛�</span></td>
                 <td width="12%" style="text-align: right; vertical-align: bottom; font-size: 10pt;">
@@ -292,76 +443,43 @@
                 </td>
             </tr>
         </table>
+
         <div style="height:3px;"></div>
-        <table width="100%" border="1" cellspacing="2" style="font-size: 8pt;">
+
+        <apex:outputPanel layout="none" rendered="{!status>=3}">
+        <table width="100%" border="1" cellspacing="0" style="font-size: 8pt;">
             <tr>
-                <td width="10%" class="label" height="23px">鏈哄瀷</td>
-                <td width="15%" class="middle"><c:PDFWbr targetStr="{!ra.Asset_Model_No__c}"/></td>
-                <td width="10%" class="label">鏈鸿韩鍙�</td>
-                <td width="15%" class="middle">{!ra.SerialNumber__c}</td>
-                <td width="10%" class="label">鍙楃悊鏃�</td>
-                <td width="15%" class="middle"><apex:outputField value="{!ra.AcceptDate__c}"/></td>
-                <td width="10%" class="label">鎶ュ憡鏃�</td>
-                <td width="15%" class="middle"><apex:outputField value="{!ra.Report_Date__c}"/></td>
+                <td colspan="6" class="title">瀹㈡埛瀵瑰簲锛圤CSM鏈嶅姟鏈儴濉啓锛�</td>
             </tr>
             <tr>
-                <td colspan="8" style="border-top-color: white;">
-                    <table width="100%" border="1" cellspacing="0">
-                        <tr><td class="title">鏈鎶ヤ环妫�娴嬪浘鐗�</td></tr>
-                    </table>
+                <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>
+            </tr>
+            <tr>
+                <td class="label">瀹㈡埛瀵瑰簲</td>
+                <td colspan="5" class="label">
+                    <apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c == '鏃犲伩缁翠慨'}">&#10004;</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c <> '鏃犲伩缁翠慨'}">&#9633;</apex:outputPanel>鏃犲伩缁翠慨
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    <apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c == '鏈夊伩缁翠慨'}">&#10004;</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c <> '鏈夊伩缁翠慨'}">&#9633;</apex:outputPanel>鏈夊伩缁翠慨
+                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                     <apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c == '閫佸洖'}">&#10004;</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c <> '閫佸洖'}">&#9633;</apex:outputPanel>閫佸洖
+                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    <apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c == '缁х画瑙傚療'}">&#10004;</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c <> '缁х画瑙傚療'}">&#9633;</apex:outputPanel>缁х画瑙傚療
+                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                    <apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c == '鐗瑰埆瀵瑰簲'}">&#10004;</apex:outputPanel><apex:outputPanel layout="none" rendered="{!ra.ActionOCM__c <> '鐗瑰埆瀵瑰簲'}">&#9633;</apex:outputPanel>鐗瑰埆瀵瑰簲
                 </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_Picture1_URL__c}" height="90%" width="80%" rendered="{!NOT(ISBLANK(ra.Dectect_Picture1_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_Picture2_URL__c}" height="90%" width="80%" rendered="{!NOT(ISBLANK(ra.Dectect_Picture2_URL__c))}" /></td></tr>
-                        <tr><td style="height:40px;"></td></tr>
-                    </table>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="8" style="border-top-color: white;">
-                    <table width="100%" border="1" cellspacing="0">
-                        <tr><td class="title">OSH鍖荤枟鍝佽川淇濋殰閮ㄦ妧鏈娴嬪浘鐗�</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_Picture1_URL__c}" height="90%" width="80%" rendered="{!NOT(ISBLANK(ra.OSH_Dectect_Picture1_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_Picture2_URL__c}" height="90%" width="80%" rendered="{!NOT(ISBLANK(ra.OSH_Dectect_Picture2_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_Picture3_URL__c}" height="90%" width="80%" rendered="{!NOT(ISBLANK(ra.OSH_Dectect_Picture3_URL__c))}" /></td></tr>
-                        <tr><td style="height:40px;"></td></tr>
-                    </table>
-                </td>
-                <td colspan="4" style="border-left-color: white; 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_Picture4_URL__c}" height="90%" width="80%" rendered="{!NOT(ISBLANK(ra.OSH_Dectect_Picture4_URL__c))}" /></td></tr>
-                        <tr><td style="height:40px;"></td></tr>
-                    </table>
-                </td>
+                <td width="10%" class="label" height="23px">鎶�鏈媴褰�</td>
+                <td width="15%" class="middle">{!ra.Technical_Responsibility__r.Name}</td>
+                <td width="10%" class="label">纭鑰�</td>
+                <td width="15%" class="middle">{!ra.OCM_Confirmer__r.Name}</td>
+                <td width="10%" class="label">纭鏃�</td>
+                <td width="40%" class="middle"><apex:outputField value="{!ra.OCM_Confirmation_Date__c}"/></td> 
             </tr>
         </table>
-    </body>
+        </apex:outputPanel>
 
+    </apex:outputPanel>
+    </body>
 </html>
 </apex:page>
\ No newline at end of file

--
Gitblit v1.9.1