From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/MaintenanceCommissionPDF.page | 191 +++++++++++++++++++++++++++++++----------------
1 files changed, 125 insertions(+), 66 deletions(-)
diff --git a/force-app/main/default/pages/MaintenanceCommissionPDF.page b/force-app/main/default/pages/MaintenanceCommissionPDF.page
index 73136a0..5675ae8 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">
+<apex:page controller="MaintenanceCommissionPDFController" showHeader="false" sidebar="false" renderAs="pdf" action="{!init}" applyHtmlTag="false" lightningStylesheets="true" >
+
<html>
<head>
<style>
@page {
- size: A4 landscape;
+ size: A4 portrait;
margin: 5mm 12mm 5mm 12mm;
/* 鏄剧ず椤电爜 */
/* @bottom-center {
@@ -32,37 +33,41 @@
<td colspan="4" class="title">鍩烘湰淇℃伅</td>
</tr>
<tr>
- <td width="20%" class="label">SFDC-NO</td>
- <td width="30%" class="middle"><c:PDFWbr targetStr="{!rep.Name}"/></td>
- <td width="20%" class="label">鍖婚櫌鍚嶇О</td>
- <td width="30%" class="middle"><c:PDFWbr targetStr="{!rep.HP_Name__c}"/></td>
+ <td width="20%" class="label" height="40px">SFDC-NO</td>
+ <td width="30%" class="middle" height="40px"><c:PDFWbr targetStr="{!rep.Name}"/></td>
+ <td width="20%" class="label" height="40px">鍖婚櫌鍚嶇О</td>
+ <td width="30%" class="middle" height="40px"><c:PDFWbr targetStr="{!rep.HP_Name__c}"/></td>
</tr>
<tr>
- <td width="20%" class="label">SAP-NO</td>
- <td width="30%" class="middle"><c:PDFWbr targetStr="{!rep.SAP_Service_Repair_No__c}"/></td>
- <td width="20%" class="label">缁忛攢鍟嗗悕绉�</td>
- <td width="30%" class="middle"><c:PDFWbr targetStr="{!rep.Dealer__r.Name}"/></td>
+ <td width="20%" class="label" height="40px">SAP-NO</td>
+ <td width="30%" class="middle" height="40px"><c:PDFWbr targetStr="{!rep.SAP_Service_Repair_No__c}"/></td>
+ <td width="20%" class="label" height="40px">缁忛攢鍟嗗悕绉�</td>
+ <td width="30%" class="middle" height="40px"><c:PDFWbr targetStr="{!rep.Dealer__r.Name}"/></td>
</tr>
<tr>
- <td width="20%" class="label">鏁呴殰鍙戠敓鏃�</td>
- <td width="30%" class="middle"><apex:outputField value="{!rep.Failure_Occurrence_Date__c}"/></td>
- <td width="20%" class="label">璁惧鍨嬪彿</td>
- <td width="30%" class="middle"><c:PDFWbr targetStr="{!rep.Delivered_Product__r.Name}"/></td>
+ <td width="20%" class="label" height="40px">鏁呴殰鍙戠敓鏃�</td>
+ <td width="30%" class="middle" height="40px"><apex:outputField value="{!rep.Failure_Occurrence_Date__c}"/></td>
+ <td width="20%" class="label" height="40px">璁惧鍨嬪彿</td>
+ <td width="30%" class="middle" height="40px"><c:PDFWbr targetStr="{!rep.Delivered_Product__r.Name}"/></td>
</tr>
<tr>
- <td width="20%" class="label">FSE淇悊鐢宠鏃�</td>
- <td width="30%" class="middle"><apex:outputField value="{!rep.FSE_ApplyForRepair_Day__c}"/></td>
- <td width="20%" class="label">鏈鸿韩鍙风爜</td>
- <td width="30%" class="middle"><c:PDFWbr targetStr="{!rep.SerialNumber__c}"/></td>
+ <td width="20%" class="label" height="40px">FSE淇悊鐢宠鏃�</td>
+ <td width="30%" class="middle" height="40px"><apex:outputField value="{!rep.FSE_ApplyForRepair_Day__c}"/></td>
+ <td width="20%" class="label" height="40px">鏈鸿韩鍙风爜</td>
+ <td width="30%" class="middle" height="40px"><c:PDFWbr targetStr="{!rep.SerialNumber__c}"/></td>
</tr>
<tr>
- <td width="20%" class="label">SAP淇悊鐢宠鏃�</td>
- <td width="30%" class="middle"><apex:outputField value="{!rep.SAP_Transfer_day__c}"/></td>
- <td width="20%" class="label">淇悊濮旀墭鑰�(FSE)</td>
- <td width="30%" class="middle"><c:PDFWbr targetStr="{!rep.Incharge_Staff__r.Name}"/></td>
+ <td width="20%" class="label" height="40px">SAP淇悊鐢宠鏃�</td>
+ <td width="30%" class="middle" height="40px"><apex:outputField value="{!rep.SAP_Transfer_day__c}"/></td>
+ <td width="20%" class="label" height="40px">淇悊濮旀墭鑰�(FSE)</td>
+ <td width="30%" class="middle" height="40px"><c:PDFWbr targetStr="{!rep.Incharge_Staff__r.Name}"/></td>
+ </tr>
+ <tr>
+ <td width="20%" class="label" height="70px">鍙嶉鏁呴殰鍐呭鎻忚堪锛�</td>
+ <td width="30%" class="middle" colspan="3" height="70px"><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>
@@ -81,75 +86,129 @@
<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>
+ <td colspan="1" class="title">鎼哄甫闄勪欢</td>
</tr>
<tr>
- <td width="60%" height="80px" style="font-size:120%" >
- 01鎵嬫彁绠�(绾哥銆佸鏂�)  04闃叉按甯�  07娲绘甯�  10鐢电紗绾�  13淇濇姢闉�  16姘寸摱<br/>
- 02娑堟瘨鐩�(濉戞枡銆侀噾灞�)  05姘�/姘旈挳   08ET甯�    11閿洏    14閾濈    17鍏朵粬<br/>
- 03鍐呴暅閾墝       06鍚稿紩閽�  09閫傞厤鍣�  12鑴氳笍鏉�  15鐏场
+ <td width="60%" height="320px" style="font-size:120%" >
+ 01 鎵嬫彁绠�(绾哥銆佸鏂�)               08 ET甯�               15 淇濇姢闉�  <br/> <br/>
+
+ 02 娑堟瘨鐩�(濉戞枡銆侀噾灞�)               09 閫傞厤鍣�              16 閾濈  <br/> <br/>
+
+ 03 鍐呴暅閾墝               10 鐢电紗绾�               17 MAJ-215  <br/> <br/>
+
+ 04 闃叉按甯�                11 閿洏               18 閽ュ寵  <br/> <br/>
+
+ 05 姘�/姘旈挳                12 鑴氳笍鏉�               19 鍏朵粬  <br/> <br/>
+
+ 06 鍚稿紩閽�                13 鐏场 <br/> <br/>
+
+ 07 娲绘甯�                  14 姘寸摱
+<!--
+
+ 07娲绘甯�  10鐢电紗绾�  13淇濇姢闉�  16姘寸摱<br/>
+ 02娑堟瘨鐩�(濉戞枡銆侀噾灞�)  04闃叉按甯�     11閿洏    14閾濈    17鍏朵粬<br/>
+ 03鍐呴暅閾墝       06鍚稿紩閽�  09閫傞厤鍣�  12鑴氳笍鏉�  15鐏场 -->
</td>
- <td width="40%" valign="top" height="80px" style="font-size:120%; padding-left: 10px" >闄勪欢澶囨敞:</td>
+ </tr>
+ <tr>
+ <td width="40%" valign="top" height="120px" style="font-size:120%; padding-left: 10px" >闄勪欢澶囨敞:</td>
</tr>
</table>
<table width="100%" border="1" cellspacing="0">
<tr>
- <td colspan="4" class="title">宸ヤ綔娴佺▼鏃ユ湡璁板綍鍙婄绔�</td>
+ <td colspan="2" class="title">宸ヤ綔娴佺▼璁板綍</td>
+ <td colspan="2" 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 colspan="2" height="40px" width="50%" class="label">RC鍙楃悊鏃ユ湡:</td>
+ <td colspan="2" height="40px" width="50%" style="font-size:120%;padding-left: 10px;">鎶ヤ环閲戦:</td>
+ </tr>
+ <tr>
+ <td colspan="2" height="40px" width="50%" class="label">RC鎶ヤ环鏃ユ湡锛�</td>
+ <td colspan="2" height="40px" width="50%" style="border-top-color: white;border-bottom-color: white;"></td>
+ </tr>
+ <!-- <tr>
+ <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淇悊 □  
+ <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淇悊 □  
SORC淇悊 □  OGZ淇悊 □
</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>
+ </tr> -->
+ <!-- <tr>
+ <td width="20%" class="label" >杩斿搧绫诲瀷</td>
<td width="30%" colspan="3" style="font-size:120%;padding-left: 10px" >淇悊瀹屾垚杩斿搧 □   
鏈慨鐞嗚繑鍝� □
</td>
- </tr>
- </table>
+ </tr> -->
+ <!-- </table>
<table width="100%" border="1" cellspacing="0">
<tr>
- <td colspan="3" class="title">璐圭敤銆佺瓑绾�</td>
+ <td colspan="4" class="title">缁翠慨璐圭敤鍙婄瓑绾�</td>
+ </tr> -->
+ <tr>
+ <td colspan="2" height="40px" width="50%" class="label">鐢ㄦ埛纭鏃ユ湡:</td>
+ <!-- <td width="30%" class="middle"></td> -->
+ <td colspan="2" height="40px" width="50%" style="font-size:120%;padding-left: 10px;">澶囨敞:</td>
+
</tr>
<tr>
- <td width="20%" class="label">鎶ヤ环绫诲瀷</td>
- <td width="30%" class="middle"></td>
- <td width="50%" style="font-size:120%;padding-left: 10px;">澶囨敞:</td>
+ <td colspan="2" height="40px" width="50%" class="label">闆朵欢璁㈠崟鍙�:</td>
+ <!-- <td class="middle"></td> -->
+ <td colspan="2" height="40px" width="50%" style="border-top-color: white;border-bottom-color: white;"></td>
</tr>
<tr>
- <td class="label">鎶ヤ环绛夌骇</td>
- <td class="middle"></td>
- <td style="border-top-color: white;border-bottom-color: white;"></td>
- </tr>
- <tr>
- <td class="label">鎶ヤ环閲戦</td>
- <td class="middle"></td>
- <td style="border-top-color: white;border-bottom-color: white;"></td>
+ <td colspan="2" height="40px" width="50%" class="label">杩斿搧鏃ユ湡:</td>
+ <!-- <td class="middle"></td> -->
+ <td colspan="2" height="40px" width="50%" style="border-top-color: white;border-bottom-color: white;"></td>
</tr>
</table>
</td>
--
Gitblit v1.9.1