From 3ba0123db48f8bab81ddf0913e1b95280ef545e8 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期四, 31 三月 2022 17:56:53 +0800
Subject: [PATCH] Deploy0331
---
force-app/main/default/pages/FixtureRentalPDF.page | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/force-app/main/default/pages/FixtureRentalPDF.page b/force-app/main/default/pages/FixtureRentalPDF.page
index 778049b..dd9a9df 100644
--- a/force-app/main/default/pages/FixtureRentalPDF.page
+++ b/force-app/main/default/pages/FixtureRentalPDF.page
@@ -267,7 +267,7 @@
</td>
<td style="box-sizing: border-box;text-align:center;font-size:13px;border-left: solid 1px;" rowspan="2">鍖荤枟鏈烘瀯</td>
<!-- 20220124 ljh SFDC-C4U3PH update colspan="4" -->
- <td style="box-sizing: border-box;text-align:left;font-size: 13px;" colspan="4" rowspan="2">
+ <td style="box-sizing: border-box;text-align:left;font-size: 13px;" colspan="5" rowspan="2">
<apex:outputText value="{!HospitalName}" />
</td>
</tr>
@@ -284,7 +284,7 @@
</td>
<td style="box-sizing: border-box;text-align:center;font-size:13px;border-left: solid 1px;" rowspan="2">鍙戣揣鍦板潃</td>
<!-- 20220124 ljh SFDC-C4U3PH update colspan="4" -->
- <td style="box-sizing: border-box;text-align:left;font-size: 13px;" colspan="4" rowspan="2">
+ <td style="box-sizing: border-box;text-align:left;font-size: 13px;" colspan="5" rowspan="2">
<apex:outputText value="{!if(isblank(ApplyHeadShow.Shippment_adress_detail__c), ApplyHeadShow.direct_shippment_address__c, ApplyHeadShow.Shippment_adress_detail__c)}" />
</td>
</tr>
@@ -296,13 +296,13 @@
</tr>
<tr>
<!-- 20220124 ljh SFDC-C4U3PH update colspan="8" -->
- <th style="text-align:center;font-size:13px;height: 7pt;" colspan="8" >鍊熺敤澶囧搧鍙戣揣娓呭崟</th>
+ <th style="text-align:center;font-size:13px;height: 7pt;" colspan="9" >鍊熺敤澶囧搧鍙戣揣娓呭崟</th>
</tr>
<tr>
<td rowspan="2" style="box-sizing: border-box;text-align:center;font-size: 11px;">搴忓彿</td>
<td rowspan="2" style="box-sizing: border-box;text-align:center;font-size: 11px;">绠＄悊缂栧彿</td>
<!-- 20220124 ljh SFDC-C4U3PH update colspan="6" -->
- <td colspan="6" style="box-sizing: border-box;text-align:center;font-size: 11px;">鏄庣粏</td>
+ <td colspan="7" style="box-sizing: border-box;text-align:center;font-size: 11px;">鏄庣粏</td>
</tr>
<tr>
<!-- <td style="text-align:center;">搴忓彿</td>
@@ -317,7 +317,7 @@
<td style="text-align:center;font-size: 11px;">鍥哄畾璧勪骇鍙�</td>
<td style="box-sizing: border-box;text-align:center;font-size: 11px;">璐т綅鍙�</td>
<!-- 20220124 ljh SFDC-C4U3PH add start -->
- <td style="box-sizing: border-box;text-align:center;font-size: 11px;"> 澶囨敞 </td>
+ <td style="box-sizing: border-box;text-align:center;font-size: 11px;">澶囨敞</td>
<!-- 20220124 ljh SFDC-C4U3PH add end -->
<!-- <td style="text-align:center;">浜岀淮鐮�</td> -->
</tr>
@@ -348,7 +348,8 @@
</apex:repeat>
</table>
<!-- 20211209 ljh SFDC-C923SR 鏉″舰鐮� -->
- <img style="float:left;position:absolute;z-index: 99;" src="{!'/servlet/servlet.FileDownload?file=' + ApplyHeadShow.BRId__c}" />
+ <img style="float:left;position:absolute;z-index: 99;" src="{!barcode}" />
+ <div style="height:30px"></div>
<!-- 20211209 ljh SFDC-C923SR 鏉″舰鐮� -->
<div style="{position:absolute;width:100%;height:20px"> </div>
<apex:outputPanel rendered="{!pNcnt < pageCnt}" layout="none">
@@ -368,19 +369,17 @@
AWSService.sfSessionId = '{!GETSESSIONID()}';
//sforce.connection.sessionId = '{!GETSESSIONID()}';
var staticResources = JSON.parse('{!staticResource}');
- blockme();
+ //blockme();
document.body.onload = function(){
console.log('document.body.onload')
AWSService.query(staticResources.queryUrl, '{!ApplyHeadShow.AWS_Data_Id__c}', function(data){
console.log('data----------')
console.log(data);
- unblockUI();
+ //unblockUI();
document.getElementById("allPage:Shippmentadress").innerHTML = data.object.directShippmentAddress;
//document.getElementById("Caller_phone__c").innerHTML = data.object.callerPhone;
- setTimeout(function() {
- jsPdfDownload();
- }, 1500);
+ jsPdfDownload();
}, staticResources.token);
}
@@ -430,16 +429,17 @@
}
})
}
+ var staticResourceFile = JSON.parse('{!staticResourceFile}');
function Fun(pdf){
- var iframe = document.createElement('iframe');
- iframe.setAttribute('style', 'position:absolute;right:0; top:0; bottom:0; height:100%; width:100%');
- document.body.appendChild(iframe);
- iframe.src = pdf.output('datauristring');
- for(let e of document.body.childNodes){
- if( e != iframe && e.style){
- e.style.display = 'none';
- }
- }
+ var form = jQuery("<form method='post'></form>");
+ jQuery(document.body).append(form);
+ form.attr({"action":staticResourceFile.viewUnifiedContactUrl+"?from="+encodeURIComponent(window.location.href)});
+ // form.attr({"action":"http://127.0.0.1:8080/a/d?from="+encodeURIComponent(window.location.href)});
+ let input = jQuery("<input type='hidden'/>");
+ input.attr({"name":"base64Str"});
+ input.val(pdf.output('datauristring').substr(28));
+ form.append(input);
+ form.submit();
}
</script>
</html>
--
Gitblit v1.9.1