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/MaintenanceCommissionPDF.page |   92 ++++++++++++++++++++++++++++++---------------
 1 files changed, 61 insertions(+), 31 deletions(-)

diff --git a/force-app/main/default/pages/MaintenanceCommissionPDF.page b/force-app/main/default/pages/MaintenanceCommissionPDF.page
index a7fec5d..94611bf 100644
--- a/force-app/main/default/pages/MaintenanceCommissionPDF.page
+++ b/force-app/main/default/pages/MaintenanceCommissionPDF.page
@@ -1,9 +1,10 @@
 <apex:page controller="MaintenanceCommissionPDFController" showHeader="false" sidebar="false" renderAs="pdf" action="{!init}" applyHtmlTag="false">
+
 <html>
     <head>
         <style>
             @page {
-                size: A4 landscape;
+                size: A4 portrait;
                 margin: 5mm 12mm 5mm 12mm;
                 /* 鏄剧ず椤电爜 */
                 /* @bottom-center {
@@ -61,8 +62,12 @@
                             <td width="20%" class="label">淇悊濮旀墭鑰�(FSE)</td>
                             <td width="30%" class="middle"><c:PDFWbr targetStr="{!rep.Incharge_Staff__r.Name}"/></td>
                         </tr> 
+                        <tr>
+                            <td width="20%" class="label">鍙嶉鏁呴殰鍐呭鎻忚堪锛�</td>
+                            <td width="30%" class="middle" colspan="3" ><c:PDFWbr targetStr="{!rep.Repair_Detail__c}"/></td>
+                        </tr> 
                     </table>
-                    <table width="100%" border="1" cellspacing="0">
+                    <!-- <table width="100%" border="1" cellspacing="0">
                         <tr>
                             <td colspan="5" class="title">鏀惰揣濉啓鍖哄煙</td>
                         </tr>
@@ -75,26 +80,24 @@
                             </td>
                             <td width="45%" style="font-size:120%">&nbsp;濡傛湁鐮存崯,澶囨敞鎻忚堪:</td>
                         </tr>
-                    </table>
-                    <table width="100%" border="1" cellspacing="0" style="border-top-color: white;">
                         <tr>
-                            <td width="20%" class="label">娓呮礂娑堟瘨鏃堕棿</td>
-                            <td width="30%" class="middle"></td>
-                            <td width="20%" class="label">娓呮礂娑堟瘨鑰�</td>
-                            <td width="30%" class="middle"></td>
+                            <td width="15%" class="label">娓呮礂娑堟瘨鏃堕棿</td>
+                            <td colspan="2" class="middle"></td>
+                            <td width="10%" class="label">娓呮礂娑堟瘨鑰�</td>
+                            <td class="middle"></td>
                         </tr>
-                    </table>
+                    </table> -->
                     <table width="100%" border="1" cellspacing="0">
                         <tr>
                             <td colspan="2" class="title">鎼哄甫闄勪欢</td>
                         </tr>
                         <tr>
-                            <td width="60%" height="80px" style="font-size:120%" >
+                            <td width="60%" height="75px" style="font-size:120%" >
                                 &nbsp;&nbsp;01鎵嬫彁绠�(绾哥銆佸鏂�)&emsp;&emsp;04闃叉按甯�&emsp;&emsp;07娲绘甯�&emsp;&emsp;10鐢电紗绾�&emsp;&emsp;13淇濇姢闉�&emsp;&emsp;16姘寸摱<br/>
                                 &nbsp;&nbsp;02娑堟瘨鐩�(濉戞枡銆侀噾灞�)&emsp;&emsp;05姘�/姘旈挳&emsp;&ensp;&nbsp;08ET甯�&emsp;&emsp;&ensp;&nbsp;11閿洏&emsp;&emsp;&ensp;&nbsp;14閾濈&emsp;&emsp;&ensp;&nbsp;&nbsp;17鍏朵粬<br/>
                                 &nbsp;&nbsp;03鍐呴暅閾墝&emsp;&emsp;&emsp;&emsp;&emsp;&ensp;&nbsp;&nbsp;&nbsp;&nbsp;06鍚稿紩閽�&emsp;&emsp;09閫傞厤鍣�&emsp;&emsp;12鑴氳笍鏉�&emsp;&emsp;15鐏场
                             </td>
-                            <td width="40%" valign="top" height="80px" style="font-size:120%; padding-left: 10px" >闄勪欢澶囨敞:</td>
+                            <td width="40%" valign="top" height="75px" style="font-size:120%; padding-left: 10px" >闄勪欢澶囨敞:</td>
                         </tr>
                     </table>
                     <table width="100%" border="1" cellspacing="0">
@@ -102,33 +105,60 @@
                             <td colspan="4" class="title">宸ヤ綔娴佺▼鏃ユ湡璁板綍鍙婄绔�</td>
                         </tr>
                         <tr>
-                            <td width="20%" class="label">RC鍙楃悊鏃ユ湡</td>
-                            <td width="30%" class="middle"></td>
-                            <td width="20%" class="label">娲惧伐妫�鏌ュ伐绋嬪笀</td>
-                            <td width="30%" class="middle"></td>
+                            <td width="20%" class="label" height="70px">RC鍙楃悊鏃ユ湡</td>
+                            <td width="30%" class="middle" height="70px"></td>
+                            <td width="25%" class="label" height="70px">鍙楃悊鑰呯绔狅細</td>
+                            <td width="25%" class="middle" height="70px"></td>
+                        </tr>
+                          <tr>
+                            <td width="20%" class="label" height="70px">棣栨鎶ヤ环鏃ユ湡</td>
+                            <td width="30%" class="middle" height="70px"></td>
+                            <td width="20%" class="label" height="70px">鎶ヤ环鑰呯绔狅細</td>
+                            <td width="30%" class="middle" height="70px"></td>
                         </tr>
                         <tr>
-                            <td width="20%" class="label">棣栨鎶ヤ环鏃ユ湡</td>
-                            <td width="30%" class="middle"></td>
-                            <td width="20%" class="label">娲惧伐淇悊宸ョ▼甯�</td>
-                            <td width="30%" class="middle"></td>
+                            <td width="20%" class="label" height="70px">娲惧伐妫�鏌ュ伐绋嬪笀绛剧珷锛�</td>
+                            <td width="30%" class="middle" height="70px"></td>
+                            <td width="20%" class="label" height="70px">娲惧伐妫�鏌ュ伐绋嬪笀绛剧珷锛�</td>
+                            <td width="30%" class="middle" height="70px"></td>
+                        </tr>
+                      
+                        <tr>
+                            <td width="20%" class="label" height="70px">鐢ㄦ埛鏃ユ湡</td>
+                            <td width="30%" class="middle" height="70px"></td>
+                            <td width="20%" class="label" height="70px">纭鑰呯绔狅細</td>
+                            <td width="30%" class="middle" height="70px"></td>     
+                        </tr>
+                         <tr>
+                            <td width="20%" class="label" height="70px">闆朵欢璁㈣喘(鏃ユ湡鎴栬�匰TO鍙�):</td>
+                            <td width="30%" class="middle" height="70px"></td>
+                            <td width="20%" class="label" height="70px">璁㈣喘鑰呯绔狅細</td>
+                            <td width="30%" class="middle" height="70px"></td>     
                         </tr>
                         <tr>
-                            <td width="20%" class="label">鐢ㄦ埛鏃ユ湡</td>
-                            <td width="30%" class="middle"></td>
-                            <td width="20%" class="label">淇悊鏂瑰紡</td>
-                            <td width="30%" style="font-size:120%;padding-left: 10px">RC淇悊&nbsp;&#9633;&emsp;&emsp;
+                            <td width="20%" class="label" height="70px">寮�濮嬮鎻愭棩鏈�:</td>
+                            <td width="30%" class="middle" height="70px"></td>
+                            <td width="20%" class="label" height="70px">棰勬彁鑰呯绔狅細</td>
+                            <td width="30%" class="middle" height="70px"></td>     
+                        </tr>
+                       <!--  <tr>
+                            <td width="20%" class="label">娲惧伐妫�鏌ュ伐绋嬪笀绛剧珷锛�</td>
+                            <td width="80%" class="middle"></td>
+                        </tr> -->
+                        <tr>
+                            <td width="20%" class="label" height="70px">杩斿搧鏃ユ湡</td>
+                            <td width="30%" class="middle" height="70px"></td>
+                            <td width="20%" class="label" height="70px">杩斿洖鑰呯绔狅細</td>
+                            <td width="30%" class="middle" height="70px"></td>
+                        </tr>
+                        <tr>
+                            <td width="20%" class="label" >淇悊鏂瑰紡</td>
+                            <td width="80%" colspan="3" style="font-size:120%;padding-left: 10px">RC淇悊&nbsp;&#9633;&emsp;&emsp;
                                 SORC淇悊&nbsp;&#9633;&emsp;&emsp;OGZ淇悊&nbsp;&#9633;
                             </td>
                         </tr>
                         <tr>
-                            <td width="20%" class="label">杩斿搧鏃ユ湡</td>
-                            <td width="30%" class="middle"></td>
-                            <td width="20%" class="label">闆朵欢璁㈣喘(鏃ユ湡鎴栬�匰TO鍙�)</td>
-                            <td width="30%" class="middle"></td>
-                        </tr>
-                        <tr>
-                            <td width="20%" class="label">杩斿搧绫诲瀷</td>
+                            <td width="20%" class="label" >杩斿搧绫诲瀷</td>
                             <td width="30%" colspan="3" style="font-size:120%;padding-left: 10px" >淇悊瀹屾垚杩斿搧&nbsp;&#9633;&emsp;&emsp;&emsp;
                                 鏈慨鐞嗚繑鍝�&nbsp;&#9633;
                             </td>
@@ -136,7 +166,7 @@
                     </table>
                     <table width="100%" border="1" cellspacing="0">
                         <tr>
-                            <td colspan="3" class="title">璐圭敤銆佺瓑绾�</td>
+                            <td colspan="3" class="title">缁翠慨璐圭敤鍙婄瓑绾�</td>
                         </tr>
                         <tr>
                             <td width="20%" class="label">鎶ヤ环绫诲瀷</td>

--
Gitblit v1.9.1