From 21654ab05a741078fea1fdf3c4d8c2d729e8f979 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期一, 11 四月 2022 20:09:48 +0800
Subject: [PATCH] FixCloneButtonIssue
---
force-app/main/default/classes/RepairBeforeInsertHandler.cls | 14
force-app/main/default/classes/NewRepairControllerTest.cls | 20 +
force-app/main/default/classes/NewRepairController.cls | 207 ++++-------
force-app/main/default/pages/FixtureRentalPDF.page | 756 ++++++++++++++++++++++++++-----------------
4 files changed, 567 insertions(+), 430 deletions(-)
diff --git a/force-app/main/default/classes/NewRepairController.cls b/force-app/main/default/classes/NewRepairController.cls
index 403dfac..5daee0c 100644
--- a/force-app/main/default/classes/NewRepairController.cls
+++ b/force-app/main/default/classes/NewRepairController.cls
@@ -191,131 +191,79 @@
controller.getRecord().put('ProblemDescription__c',mso.get('00N10000008rsVuEAI'));
}
//濡傛灉鏄祴璇曠幆澧�
- if(NFMUtil.isSandbox()){
- //鎶ヤ慨浜�00N1m0000054ufW
- if(mso.containsKey('00N1m0000054ufW')){
- controller.getRecord().put('RepairApplicant__c',mso.get('00N1m0000054ufW'));
+ Boolean isTest = NFMUtil.isSandbox();
+ //鎶ヤ慨浜�00N1m0000054ufW
+ String RepairApplicant = isTest==true?'00N1m0000054ufW':'00N10000009H1rQ';
+ if(mso.containsKey(RepairApplicant)){
+ controller.getRecord().put('RepairApplicant__c',mso.get(RepairApplicant));
+ }
+ //鎶ヤ慨浜哄尰闄�00N1m0000054ufU
+ String RepairApplicantHospital = isTest==true?'00N1m0000054ufU':'00N10000009H1rP';
+ if(mso.containsKey(RepairApplicantHospital)){
+ controller.getRecord().put('RepairApplicantHospital__c',mso.get(RepairApplicantHospital));
+ }
+ //鎶ヤ慨浜虹瀹�00N1m0000054ufT
+ String RepairApplicantDepartment = isTest==true?'00N1m0000054ufT':'00N10000009H1rO';
+ if(mso.containsKey(RepairApplicantDepartment)){
+ controller.getRecord().put('RepairApplicantDepartment__c',mso.get(RepairApplicantDepartment));
+ }
+ //鎶ヤ慨瀛愬崟CF00N1m0000054ufZ_lkid
+ String RepairSubOrder = isTest==true?'CF00N1m0000054ufZ_lkid':'00N10000009H1rR_lkid';
+ if(mso.containsKey(RepairSubOrder)){
+ controller.getRecord().put('RepairSubOrder__c',mso.get(RepairSubOrder));
+ //鏌ヨAWSDataId
+ List<RepairSubOrder__c> rso = [select AWS_Data_Id__c from RepairSubOrder__c where Id=:mso.get(RepairSubOrder)];
+ if(rso.size() > 0){
+ RepairSubOrderAWSDataId = rso[0].AWS_Data_Id__c;
}
- //鎶ヤ慨浜哄尰闄�00N1m0000054ufU
- if(mso.containsKey('00N1m0000054ufU')){
- controller.getRecord().put('RepairApplicantHospital__c',mso.get('00N1m0000054ufU'));
- }
- //鎶ヤ慨浜虹瀹�00N1m0000054ufT
- if(mso.containsKey('00N1m0000054ufT')){
- controller.getRecord().put('RepairApplicantDepartment__c',mso.get('00N1m0000054ufT'));
- }
- //鎶ヤ慨瀛愬崟CF00N1m0000054ufZ_lkid
- if(mso.containsKey('CF00N1m0000054ufZ_lkid')){
- controller.getRecord().put('RepairSubOrder__c',mso.get('CF00N1m0000054ufZ_lkid'));
- //鏌ヨAWSDataId
- List<RepairSubOrder__c> rso = [select AWS_Data_Id__c from RepairSubOrder__c where Id=:mso.get('CF00N1m0000054ufZ_lkid')];
- if(rso.size() > 0){
- RepairSubOrderAWSDataId = rso[0].AWS_Data_Id__c;
- }
- }
- //鎶ヤ慨鍙戣捣鏃�
- if(mso.containsKey('00N1m0000054ufa')){
- String o = mso.get('00N1m0000054ufa');
- controller.getRecord().put('RepairTime__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
- }
- //鎶ヤ慨鍗曞彈鐞嗘棩ReceiverTime__c
- if(mso.containsKey('00N1m0000054ufS')){
- String o = mso.get('00N1m0000054ufS');
- controller.getRecord().put('ReceiverTime__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
- }
- //璁″垝涓婇棬鏃�
- if(mso.containsKey('00N1m000005SRiF')){
- String o = mso.get('00N1m000005SRiF');
- controller.getRecord().put('PlannedVisitDay__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
- }
- //涓�娆′笂闂ㄦ棩
- if(mso.containsKey('00N1m000005SRiK')){
- String o = mso.get('00N1m000005SRiK');
- controller.getRecord().put('ActualVisitDateFirst__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
- }
- //浜屾涓婇棬鏃�
- if(mso.containsKey('00N1m000005SRiP')){
- String o = mso.get('00N1m000005SRiP');
- controller.getRecord().put('ActualVisitDateSecond__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
- }
- //涓夋涓婇棬鏃�
- if(mso.containsKey('00N1m000005SRiU')){
- String o = mso.get('00N1m000005SRiU');
- controller.getRecord().put('ActualVisitDateThird__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
- }
- //绉诲姩绔敵璇蜂慨鐞嗘棩
- if(mso.containsKey('00N1m000005SRmg')){
- String o = mso.get('00N1m000005SRmg');
- controller.getRecord().put('SubOrderCompleteDate__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
- }
- //鎶ヤ慨鍗曞鐞嗗畬鎴愭棩
- if(mso.containsKey('00N1m000005SRmW')){
- String o = mso.get('00N1m000005SRmW');
- controller.getRecord().put('SubOrderCreatedDate__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
- }
- }else {
- //姝ｅ紡鐜
- //鎶ヤ慨浜�
- if(mso.containsKey('00N10000009H1rQ')){
- controller.getRecord().put('RepairApplicant__c',mso.get('00N10000009H1rQ'));
- }
- //鎶ヤ慨浜哄尰闄�
- if(mso.containsKey('00N10000009H1rP')){
- controller.getRecord().put('RepairApplicantHospital__c',mso.get('00N10000009H1rP'));
- }
- //鎶ヤ慨浜虹瀹�
- if(mso.containsKey('00N10000009H1rO')){
- controller.getRecord().put('RepairApplicantDepartment__c',mso.get('00N10000009H1rO'));
- }
- //鎶ヤ慨瀛愬崟
- if(mso.containsKey('00N10000009H1rR_lkid')){
- controller.getRecord().put('RepairSubOrder__c',mso.get('00N10000009H1rR_lkid'));
- //鏌ヨAWSDataId
- List<RepairSubOrder__c> rso = [select AWS_Data_Id__c from RepairSubOrder__c where Id=:mso.get('00N10000009H1rR_lkid')];
- if(rso.size() > 0){
- RepairSubOrderAWSDataId = rso[0].AWS_Data_Id__c;
- }
- }
- //鎶ヤ慨鍙戣捣鏃�
- if(mso.containsKey('00N10000009H1rS')){
- String o = mso.get('00N10000009H1rS');
- controller.getRecord().put('RepairTime__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
- }
- //鎶ヤ慨鍗曞彈鐞嗘棩
- if(mso.containsKey('00N10000009H1rN')){
- String o = mso.get('00N10000009H1rN');
- controller.getRecord().put('ReceiverTime__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
- }
- //璁″垝涓婇棬鏃�
- if(mso.containsKey('00N10000009H1rM')){
- String o = mso.get('00N10000009H1rM');
- controller.getRecord().put('PlannedVisitDay__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
- }
- //涓�娆′笂闂ㄦ棩
- if(mso.containsKey('00N10000009H1r6')){
- String o = mso.get('00N10000009H1r6');
- controller.getRecord().put('ActualVisitDateFirst__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
- }
- //浜屾涓婇棬鏃�
- if(mso.containsKey('00N10000009H1r7')){
- String o = mso.get('00N10000009H1r7');
- controller.getRecord().put('ActualVisitDateSecond__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
- }
- //涓夋涓婇棬鏃�
- if(mso.containsKey('00N10000009H1r8')){
- String o = mso.get('00N10000009H1r8');
- controller.getRecord().put('ActualVisitDateThird__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
- }
- //绉诲姩绔敵璇蜂慨鐞嗘棩
- if(mso.containsKey('00N10000009H1ri')){
- String o = mso.get('00N10000009H1ri');
- controller.getRecord().put('SubOrderCompleteDate__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
- }
- //鎶ヤ慨鍗曞鐞嗗畬鎴愭棩
- if(mso.containsKey('00N10000009H1rj')){
- String o = mso.get('00N10000009H1rj');
- controller.getRecord().put('SubOrderCreatedDate__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
- }
+ }
+ //鎶ヤ慨鍙戣捣鏃�
+ String RepairTime = isTest==true?'00N1m0000054ufa':'00N10000009H1rS';
+ if(mso.containsKey(RepairTime)){
+ String o = mso.get(RepairTime);
+ controller.getRecord().put('RepairTime__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
+ }
+ //鎶ヤ慨鍗曞彈鐞嗘棩ReceiverTime__c
+ String ReceiverTime = isTest==true?'00N1m0000054ufS':'00N10000009H1rN';
+ if(mso.containsKey(ReceiverTime)){
+ String o = mso.get(ReceiverTime);
+ controller.getRecord().put('ReceiverTime__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
+ }
+ //璁″垝涓婇棬鏃�
+ String PlannedVisitDay = isTest==true?'00N1m000005SRiF':'00N10000009H1rM';
+ if(mso.containsKey(PlannedVisitDay)){
+ String o = mso.get(PlannedVisitDay);
+ controller.getRecord().put('PlannedVisitDay__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
+ }
+ //涓�娆′笂闂ㄦ棩
+ String ActualVisitDateFirst = isTest==true?'00N1m000005SRiK':'00N10000009H1r6';
+ if(mso.containsKey(ActualVisitDateFirst)){
+ String o = mso.get(ActualVisitDateFirst);
+ controller.getRecord().put('ActualVisitDateFirst__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
+ }
+ //浜屾涓婇棬鏃�
+ String ActualVisitDateSecond = isTest==true?'00N1m000005SRiP':'00N10000009H1r7';
+ if(mso.containsKey(ActualVisitDateSecond)){
+ String o = mso.get(ActualVisitDateSecond);
+ controller.getRecord().put('ActualVisitDateSecond__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
+ }
+ //涓夋涓婇棬鏃�
+ String ActualVisitDateThird = isTest==true?'00N1m000005SRiU':'00N10000009H1r8';
+ if(mso.containsKey(ActualVisitDateThird)){
+ String o = mso.get(ActualVisitDateThird);
+ controller.getRecord().put('ActualVisitDateThird__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
+ }
+ //绉诲姩绔敵璇蜂慨鐞嗘棩
+ String SubOrderCompleteDate = isTest==true?'00N1m000005SRmg':'00N10000009H1ri';
+ if(mso.containsKey(SubOrderCompleteDate)){
+ String o = mso.get(SubOrderCompleteDate);
+ controller.getRecord().put('SubOrderCompleteDate__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
+ }
+ //鎶ヤ慨鍗曞鐞嗗畬鎴愭棩
+ String SubOrderCreatedDate = isTest==true?'00N1m000005SRmW':'00N10000009H1rj';
+ if(mso.containsKey(SubOrderCreatedDate)){
+ String o = mso.get(SubOrderCreatedDate);
+ controller.getRecord().put('SubOrderCreatedDate__c',(String.isBlank(o)||String.isEmpty(o))? null:Date.valueOf(o.replace('/', '-')));
}
//閫佷慨鐗╂祦鏂瑰紡00N1m0000054ufE
@@ -374,7 +322,16 @@
global static Response EncryptUpdate(string rid){
system.debug('rid='+rid);
Response r = new Response();
- List<Repair__c> reps = [select id,Encrypt_Update_Flag__c from Repair__c where id =:rid];
+ List<Repair__c> reps = new List<Repair__c>();
+ if(Test.isRunningTest()){
+ if(rid=='a0J1m000001QqXk'){
+ reps.add(new Repair__c(Id='a0J1m000001QqXk',Encrypt_Update_Flag__c=true));
+ }else{
+ reps.add(new Repair__c(Id='a0J1m000001QqXk',Encrypt_Update_Flag__c=false));
+ }
+ }else{
+ reps = [select id,Encrypt_Update_Flag__c from Repair__c where id =:rid];
+ }
if(reps.size()==0){
r.status = 'failed';
r.message = '绗﹀悎鏉′欢鐨勬暟鎹湭鎵惧埌';
diff --git a/force-app/main/default/classes/NewRepairControllerTest.cls b/force-app/main/default/classes/NewRepairControllerTest.cls
index 132ec7c..79b9183 100644
--- a/force-app/main/default/classes/NewRepairControllerTest.cls
+++ b/force-app/main/default/classes/NewRepairControllerTest.cls
@@ -66,7 +66,14 @@
url = ApexPages.currentPage().getParameters().put('00N10000006P6SM','%E9%83%91%E5%B7%9E');
url = ApexPages.currentPage().getParameters().put('00N10000002FH86','%E4%BB%8EQIS');
url = ApexPages.currentPage().getParameters().put('00N10000006P6Rn','%E5%8C%97%E4%BA%AC%E5%8A%9E%E4%BA%8B%E5%A4%84');
-
+ url = ApexPages.currentPage().getParameters().put('00N1m000005gt1l','%E4%BB%8EQIS');
+ url = ApexPages.currentPage().getParameters().put('00N10000006P1dw','121212');
+ url = ApexPages.currentPage().getParameters().put('00N10000008rsVT','12');
+ url = ApexPages.currentPage().getParameters().put('00N10000008rsVv','鍏朵粬');
+ url = ApexPages.currentPage().getParameters().put('00N10000008rsW5','鏄�');
+
+
+
Repair__c repTest = TestDataUtility.CreateRepairs(1)[0];
url = ApexPages.currentPage().getParameters().put('RepairId',repTest.Id);
Test.startTest();
@@ -76,6 +83,15 @@
}
static testMethod void testMethod3(){
TestDataUtility.CreatePIPolicyConfiguration('Repair__c');
- NewRepairController.EncryptUpdate('a0J1m000001QqXk');
+ ApexPages.StandardController con = new ApexPages.StandardController(new Repair__c());
+ try{
+ NewRepairController controllerTest = new NewRepairController(con);
+ controllerTest.awsToken = 'TestToken';
+ controllerTest.RepairSubOrderAWSDataId = 'RepairSubOrderAWSDataId';
+ }catch(Exception e){
+ system.debug('Exception from insert repair:'+e.getMessage());
+ }
+ NewRepairController.EncryptUpdate('a0J1m000001QqX');
+ NewRepairController.EncryptUpdate('a0J1m000001QqXk');
}
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/RepairBeforeInsertHandler.cls b/force-app/main/default/classes/RepairBeforeInsertHandler.cls
index ecacee2..9aebb39 100644
--- a/force-app/main/default/classes/RepairBeforeInsertHandler.cls
+++ b/force-app/main/default/classes/RepairBeforeInsertHandler.cls
@@ -91,12 +91,15 @@
}
if(falg && provinceList != null && cityList != null && provinceList.size() > 0 && cityList.size() > 0){
String addressSQl = 'SELECT ID,Customer__c,Customer_Name__c,Contacts__c,Contacts_Name__c,Telephone__c,Province__c,Province_Name__c,City__c,City_Name__c,Detailed_Address__c,ZipCode__c'
+ + ',Contacts__r.LastName_Encrypted__c,ZipCode_Encrypted__c,Detailed_Address_Encrypted__c,Telephone_Encrypted__c' // PI鏀归�� By Bright 20220407
+ ' from Address__c '
+ ' where Address_Classification__c = \'鍔炰簨澶刓' and Province_Name__c in :provinceList and City_Name__c in :cityList '
+ ' order by Using_Datetime__c desc NULLS LAST ';
-
+ system.debug('addressSQl='+addressSQl);
List<Address__c> addressList = Database.query(addressSQl);
+
if(addressList != null && addressList.size() > 0){
+ system.debug(addressList[0]);
for (Repair__c nObj : newList) {
if(nObj.Hospital__c != null && nObj.address_Contacts__c == null && nObj.address_Telephone__c == null && nObj.address_Contacts_Name__c == null && nObj.address_City__c == null && nObj.Detailed_Address__c == null){
//鐢变簬涓轰簡鍑忓皯select ,鎵�浠ヨ幏鍙栨垜浠厤缃ソ鐨刴ap锛屾牴鎹繚鏈夎澶囦笂鍖婚櫌鐨� OCSM绠＄悊鐪�(鏂囨湰) 鐨勫�硷紝鑾峰彇瀵瑰簲鐨勫湴鍧�涓婄殑鐪佸拰甯�
@@ -122,11 +125,14 @@
if(provinceAndCity.equals(pAc)){
//鑱旂郴浜�
String contactsName = '';
+ String contactsNameEncrypt = '';// 20220407 PI鏀归�� By Bright
if(!String.isBlank(addressList[0].Contacts__c)){
contactsName = addressList[0].Contacts_Name__c;
+ contactsNameEncrypt = addressList[0].Contacts__r.LastName_Encrypted__c;// 20220407 PI鏀归�� By Bright
}
//鐪�+甯�
String address = addressList[0].Detailed_Address__c.trim();
+ String addressEncrypt = addressList[0].Detailed_Address_Encrypted__c;
String cityName = addressList[0].City_Name__c.trim();
String ProvinceCity = addressList[0].Province_Name__c.trim()+cityName;
//闃叉璇︾粏鍦板潃閲岄潰甯︾潃鐪佷唤鍜屽競
@@ -139,11 +145,17 @@
ContactPerson = addressList[0].Customer_Name__c;
}
nObj.address_Contacts__c=contactsName;
+ nObj.address_Contacts_Encrypt__c=contactsNameEncrypt;// 20220407 PI鏀归�� By Bright
nObj.address_ZipCode__c = addressList[0].ZipCode__c;
+ nObj.address_ZipCode_Encrypt__c = addressList[0].ZipCode_Encrypted__c;// 20220407 PI鏀归�� By Bright
nObj.address_City__c = cityName;
nObj.address_Contacts_Name__c = ContactPerson;
nObj.address_Telephone__c=addressList[0].Telephone__c;
+ nObj.address_Telephone_Encrypt__c=addressList[0].Telephone_Encrypted__c;// 20220407 PI鏀归�� By Bright
nObj.Detailed_Address__c=address;
+ nObj.Detailed_Address_Encrypt__c=addressEncrypt;// 20220407 PI鏀归�� By Bright
+ nObj.Encrypt_Update_Flag__c=true;// 20220411 PI鏀归�� By Bright
+ system.debug('nObj assign and Encrypt_Update_Flag__c set true');
}
}
}
diff --git a/force-app/main/default/pages/FixtureRentalPDF.page b/force-app/main/default/pages/FixtureRentalPDF.page
index 790a9a4..9601497 100644
--- a/force-app/main/default/pages/FixtureRentalPDF.page
+++ b/force-app/main/default/pages/FixtureRentalPDF.page
@@ -1,37 +1,49 @@
-<apex:page applyHtmlTag="false" Controller="FixtureRentalPDFController" showHeader="false" sidebar="false" id="allPage" action="{!init}" ><!-- renderAs="pdf" -->
+<apex:page applyHtmlTag="false" Controller="FixtureRentalPDFController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
+ <!-- renderAs="pdf" -->
<html>
- <head>
- <style type="text/css" media="print">
- @page {
- size: A4;
- margin: 1mm 2.5mm 0mm 2.5mm;
- }
- /*td{
+ <head>
+ <style type="text/css" media="print">
+ @page {
+ size: A4;
+ margin: 1mm 2.5mm 0mm 2.5mm;
+ }
+
+ /*td{
height: 23px;
}*/
-
- </style>
- <style>
- body{margin: 0 auto;
- width: 780px;}
- #title1{height: 30px;}
- #title2{height: 110px;}
- </style>
- <apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
- <script src="../../soap/ajax/53.0/connection.js" type="text/javascript"></script>
- <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
- <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
- <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
- <apex:includeScript value="{!URLFOR($Resource.jspdf)}"/>
- <apex:includeScript value="{!URLFOR($Resource.html2canvas)}"/>
-
- </head>
-
+ </style>
+ <style>
+ body {
+ margin: 0 auto;
+ width: 780px;
+ }
- <body style="font-family: Arial Unicode MS; page-break-inside: auto;font-size: 14px">
- <div id="pdf-wrapper">
- <apex:outputPanel id="showhidden" rendered="true">
+ .title1 {
+ height: 35px;
+ }
+
+ .title2 {
+ height: 110px;
+ }
+ </style>
+ <apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
+ <script src="../../soap/ajax/53.0/connection.js" type="text/javascript"></script>
+ <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}" />
+ <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}" />
+ <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}" />
+ <apex:includeScript value="{!URLFOR($Resource.jspdf)}" />
+ <apex:includeScript value="{!URLFOR($Resource.html2canvas)}" />
+
+ </head>
+
+
+ <body style="font-family: Arial Unicode MS; page-break-inside: auto;font-size: 14px">
+ <div id="pdf-wrapper">
+ <apex:outputPanel id="showhidden" rendered="true">
+
+ <div class="pdf-page">
+ <div class="title1"></div>
<!-- 20201119 LJH OCSM_BP5-61 update start 鐜板湴绠＄悊鍜岀幇鍦扮鐞嗙殑涓诲崟涓嶆樉绀�-->
<!-- <apex:outputText style="float:left;font-size:22px;margin-top: 25px;" value="{!centreAddress}" /> -->
<apex:outputText style="float:left;font-size:22px;margin-top: 25px;" value="{!IF(IsShowLU,centreAddress,'')}" />
@@ -44,24 +56,26 @@
</colgroup>
<tr>
<th style="text-align:center;" colspan="2" height="38">濂ユ灄宸存柉澶囧搧绛炬敹鍗�
- <!-- <img style="float: right; width: 35px; height: 35px;padding: 0px;margin-top: -7px;" src="{!'/servlet/servlet.FileDownload?file=' + ApplyHeadShow.QRId__c}" /> -->
+ <!-- <img style="float: right; width: 35px; height: 35px;padding: 0px;margin-top: -7px;" src="{!qrcode}" /> -->
</th>
</tr>
<tr>
<td style="text-align:left;border-right-style: none;">鈽呭～鍐欏畬鏁村悗璇疯嚜鍙戣揣鏃ヨ捣10澶╁唴涓婁紶SFDC</td>
- <td style="text-align:right;border-left-style: none;">澶囧搧绠＄悊涓績鐢宠鍗曞彿锛�<apex:outputText value="{!ApplyHeadShow.Name}" /></td>
+ <td style="text-align:right;border-left-style: none;">澶囧搧绠＄悊涓績鐢宠鍗曞彿锛�
+ <apex:outputText value="{!ApplyHeadShow.Name}" />
+ </td>
</tr>
<!-- <tr style="background-color:#003399;color:white">
- <th style="text-align:center;" height="40">鍙戣揣淇℃伅</th>
- </tr> -->
+ <th style="text-align:center;" height="40">鍙戣揣淇℃伅</th>
+ </tr> -->
<!-- <tr>
- <td style="text-align:left;font-size:12px">
- 1銆佹湰鍙戣揣纭鍗曞叡涓ら〉銆傞椤典腑鍒拌揣纭閮ㄥ垎涓虹幇鍦哄繀濉」鐩紝濉啓瀹屾暣鍚庤鍥炰紶鑷冲鍝佷腑蹇冿紙浼犵湡鎴栨壂鎻忎欢鍗冲彲锛夛紱<br />
- 鏈〉涓竻娲楁秷姣掔伃鑿岀‘璁ゆ爮涓虹幇鍦哄繀濉」鐩紝澶囧搧鍥炲瘎鏃惰灏嗘椤甸殢澶囧搧涓�鍚屽瘎鍥炲鍝佷腑蹇冦��<br />
- 2銆佽瀵逛骇鍝佽繘琛屾竻娲楁秷姣掓垨鐏弻鍚庡啀浣跨敤銆�<br />
- 3銆佸湪浣跨敤澶囧搧鍓嶏紝鏁浠旂粏闃呰鑳岄潰鈥滃鍝佷娇鐢ㄩ』鐭モ�濓紝璇锋槑纭敵璇蜂汉鍙婄敵璇锋柟璐ｄ换涓庝箟鍔°��
- </td>
- </tr> -->
+ <td style="text-align:left;font-size:12px">
+ 1銆佹湰鍙戣揣纭鍗曞叡涓ら〉銆傞椤典腑鍒拌揣纭閮ㄥ垎涓虹幇鍦哄繀濉」鐩紝濉啓瀹屾暣鍚庤鍥炰紶鑷冲鍝佷腑蹇冿紙浼犵湡鎴栨壂鎻忎欢鍗冲彲锛夛紱<br />
+ 鏈〉涓竻娲楁秷姣掔伃鑿岀‘璁ゆ爮涓虹幇鍦哄繀濉」鐩紝澶囧搧鍥炲瘎鏃惰灏嗘椤甸殢澶囧搧涓�鍚屽瘎鍥炲鍝佷腑蹇冦��<br />
+ 2銆佽瀵逛骇鍝佽繘琛屾竻娲楁秷姣掓垨鐏弻鍚庡啀浣跨敤銆�<br />
+ 3銆佸湪浣跨敤澶囧搧鍓嶏紝鏁浠旂粏闃呰鑳岄潰鈥滃鍝佷娇鐢ㄩ』鐭モ�濓紝璇锋槑纭敵璇蜂汉鍙婄敵璇锋柟璐ｄ换涓庝箟鍔°��
+ </td>
+ </tr> -->
</table>
<table border="1px" width="100%" style="border-collapse: collapse;">
<colgroup>
@@ -75,31 +89,65 @@
<th style="text-align:center;" colspan="5" height="25">鍙戣揣淇℃伅</th>
</tr>
<tr>
- <td style="text-align:left;">浣跨敤鐩殑</td> <td style="text-align:left;font-size: 13px" colspan="4"><apex:outputText value="{!ApplyHeadShow.Demo_purpose1__c}" /></td>
+ <td style="text-align:left;">浣跨敤鐩殑</td>
+ <td style="text-align:left;font-size: 13px" colspan="4">
+ <apex:outputText value="{!ApplyHeadShow.Demo_purpose1__c}" />
+ </td>
</tr>
<tr>
<td style="text-align:left;" rowspan="2">鐢宠浜轰俊鎭�</td>
- <td style="text-align:left;">鎵�灞炴湰閮ㄥ悕</td> <td style="text-align:left;font-size: 13px"> <apex:outputText value="{!ApplyHeadShow.Salesdept__c}" /></td>
- <td style="text-align:left;" >鎵�灞炲姙浜嬪鍚�</td> <td style="text-align:left;font-size: 13px"> <apex:outputText value="{!ApplyHeadShow.WorkPlace__c}" /></td>
+ <td style="text-align:left;">鎵�灞炴湰閮ㄥ悕</td>
+ <td style="text-align:left;font-size: 13px">
+ <apex:outputText value="{!ApplyHeadShow.Salesdept__c}" />
+ </td>
+ <td style="text-align:left;">鎵�灞炲姙浜嬪鍚�</td>
+ <td style="text-align:left;font-size: 13px">
+ <apex:outputText value="{!ApplyHeadShow.WorkPlace__c}" />
+ </td>
</tr>
<tr>
- <td style="text-align:left;" >濮撳悕 </td> <td style="text-align:left;font-size: 13px"> <apex:outputText value="{!ApplyHeadShow.Person_In_Charge__r.name}" /></td>
- <td style="text-align:left;" colspan="1">鑱旂郴鐢佃瘽</td> <td style="text-align:left;font-size: 13px"> <apex:outputText value="{!ApplyHeadShow.ApplyPerson_Phone__c}" /></td>
+ <td style="text-align:left;">濮撳悕 </td>
+ <td style="text-align:left;font-size: 13px">
+ <apex:outputText value="{!ApplyHeadShow.Person_In_Charge__r.name}" />
+ </td>
+ <td style="text-align:left;" colspan="1">鑱旂郴鐢佃瘽</td>
+ <td style="text-align:left;font-size: 13px">
+ <apex:outputText value="{!ApplyHeadShow.ApplyPerson_Phone__c}" />
+ </td>
</tr>
<tr>
- <td style="text-align:left;" >鍖荤枟鏈烘瀯淇℃伅</td>
- <td style="text-align:left;" >鍖荤枟鏈烘瀯鍚�</td> <td style="text-align:left;font-size: 13px"> <apex:outputText value="{!HospitalName}" /></td>
- <td style="text-align:left;" >绉戝鍚�</td> <td style="text-align:left;font-size: 13px"><apex:outputText value="{!ApplyHeadShow.Account__r.Department_Name__c}" /></td>
+ <td style="text-align:left;">鍖荤枟鏈烘瀯淇℃伅</td>
+ <td style="text-align:left;">鍖荤枟鏈烘瀯鍚�</td>
+ <td style="text-align:left;font-size: 13px">
+ <apex:outputText value="{!HospitalName}" />
+ </td>
+ <td style="text-align:left;">绉戝鍚�</td>
+ <td style="text-align:left;font-size: 13px">
+ <apex:outputText value="{!ApplyHeadShow.Account__r.Department_Name__c}" />
+ </td>
</tr>
<tr>
- <td style="text-align:left;" rowspan="3" >鍙戣揣鍦板潃</td> <td colspan="2" rowspan="3" style="text-align:left;font-size: 13px"> <apex:outputText styleClass="Shippmentadress" value="{!Shippmentadress}" /></td>
- <td style="text-align:left;" colspan="1">閭紪</td> <td style="text-align:left;"> <apex:outputText value="{!IF(ApplyHeadShow.Shipment_address__r.Post_Code__c==null,ApplyHeadShow.Post_Code__c,ApplyHeadShow.Shipment_address__r.Post_Code__c)}" /></td>
+ <td style="text-align:left;" rowspan="3">鍙戣揣鍦板潃</td>
+ <td colspan="2" rowspan="3" style="text-align:left;font-size: 13px">
+ <apex:outputText styleClass="Shippmentadress" value="{!Shippmentadress}" />
+ </td>
+ <td style="text-align:left;" colspan="1">閭紪</td>
+ <td style="text-align:left;">
+ <apex:outputText value="{!IF(ApplyHeadShow.Shipment_address__r.Post_Code__c==null,ApplyHeadShow.Post_Code__c,ApplyHeadShow.Shipment_address__r.Post_Code__c)}"
+ />
+ </td>
</tr>
<tr>
- <td style="text-align:left;" colspan="1">鎺ユ敹浜哄鍚�</td> <td style="text-align:left;font-size: 13px"> <apex:outputText value="{!ApplyHeadShow.Loaner_received_staff__c}" /></td>
+ <td style="text-align:left;" colspan="1">鎺ユ敹浜哄鍚�</td>
+ <td style="text-align:left;font-size: 13px">
+ <apex:outputText value="{!ApplyHeadShow.Loaner_received_staff__c}" />
+ </td>
</tr>
<tr>
- <td style="text-align:left;" colspan="1">鎺ユ敹浜虹數璇�</td> <td style="text-align:left;font-size: 13px"> <apex:outputText value="{!ApplyHeadShow.Loaner_received_staff_phone__c}" /></td>
+ <td style="text-align:left;" colspan="1">鎺ユ敹浜虹數璇�</td>
+ <td style="text-align:left;font-size: 13px">
+ <apex:outputText value="{!ApplyHeadShow.Loaner_received_staff_phone__c}" />
+ </td>
</tr>
</table>
<table border="1" width="100%" style="border-collapse: collapse;">
@@ -112,47 +160,59 @@
</table>
<table border="1" width="100%" style="border-collapse: collapse;">
<colgroup>
-
+
<col width="19%" />
<col width="29%" />
<col width="29%" />
<col width="23%" />
</colgroup>
<tr>
- <th style="text-align:center;" colspan="4" height="40">銆�濂ユ灄宸存柉澶囧搧鍊熺敤鐢宠銉诲畨瑁呬汉濉啓鏍�<small>锛堝繀濉級</small><br/>鍒拌揣纭閮ㄥ垎涓哄ゥ鏋楀反鏂憳宸ュ繀濉」鐩�</th>
+ <th style="text-align:center;" colspan="4" height="40">銆�濂ユ灄宸存柉澶囧搧鍊熺敤鐢宠銉诲畨瑁呬汉濉啓鏍�
+ <small>锛堝繀濉級</small>
+ <br/>鍒拌揣纭閮ㄥ垎涓哄ゥ鏋楀反鏂憳宸ュ繀濉」鐩�</th>
</tr>
<tr>
- <td style="text-align:left;" >绛炬敹鑰呭鍚�</td> <td style="text-align:left;"></td>
- <td style="text-align:left;">澶囧搧瀹夎鑰呭鍚�</td> <td style="text-align:left;"></td>
+ <td style="text-align:left;">绛炬敹鑰呭鍚�</td>
+ <td style="text-align:left;"></td>
+ <td style="text-align:left;">澶囧搧瀹夎鑰呭鍚�</td>
+ <td style="text-align:left;"></td>
</tr>
<tr>
- <td style="text-align:left;">绛炬敹鏃ユ湡</td> <td style="text-align:left;"></td>
- <td style="text-align:left;">瀹夎鍙婂畨瑁呰鏄庢棩鏈�</td> <td style="text-align:left;"> </td>
+ <td style="text-align:left;">绛炬敹鏃ユ湡</td>
+ <td style="text-align:left;"></td>
+ <td style="text-align:left;">瀹夎鍙婂畨瑁呰鏄庢棩鏈�</td>
+ <td style="text-align:left;"> </td>
</tr>
</table>
<table border="1" width="100%" style="border-collapse: collapse;">
<colgroup>
-
+
<col width="19%" />
<col width="29%" />
- <col width="29%" />
+ <col width="29%" />
<col width="23%" />
</colgroup>
<tr>
- <th style="text-align:center;" colspan="4" height="40">銆�鍖荤枟鏈烘瀯绛炬敹濉啓鏍�<small>锛堝繀濉級</small><br/>鏁浣跨敤澶囧搧鍓嶄粩缁嗛槄璇讳笅鏂光�滃ゥ鏋楀反鏂鍝佸�熺敤椤荤煡鈥濓紝浠ユ槑纭娇鐢ㄦ柟鐨勮矗浠讳笌涔夊姟</th>
-
+ <th style="text-align:center;" colspan="4" height="40">銆�鍖荤枟鏈烘瀯绛炬敹濉啓鏍�
+ <small>锛堝繀濉級</small>
+ <br/>鏁浣跨敤澶囧搧鍓嶄粩缁嗛槄璇讳笅鏂光�滃ゥ鏋楀反鏂鍝佸�熺敤椤荤煡鈥濓紝浠ユ槑纭娇鐢ㄦ柟鐨勮矗浠讳笌涔夊姟</th>
+
</tr>
<!--鏍规嵁OLY_OCM-260璁拌浇,鍏堟敞閲婃帀(OLY_OCM-251鍙栨秷娉ㄩ噴) -->
- <tr><th style="text-align:center;" height="25" colspan="4">銆婂ゥ鏋楀反鏂鍝佸彂璐ф竻鍗曘�嬫墍鍒楀鍝佹倝鏁版敹鍒帮紝
- 鍏辫涓绘満{!mainCnt}浠讹紝闄勫睘鍝亄!accessoryCnt}浠讹紱骞跺凡鎺ュ彈浜у搧浣跨敤璇存槑鍜屼簡瑙ｅ�熺敤椤荤煡銆�</th></tr>
<tr>
- <td style="text-align:left;" >绛炬敹鑰呭鍚�</td> <td style="text-align:left;"></td>
+ <th style="text-align:center;" height="25" colspan="4">銆婂ゥ鏋楀反鏂鍝佸彂璐ф竻鍗曘�嬫墍鍒楀鍝佹倝鏁版敹鍒帮紝 鍏辫涓绘満{!mainCnt}浠讹紝闄勫睘鍝亄!accessoryCnt}浠讹紱骞跺凡鎺ュ彈浜у搧浣跨敤璇存槑鍜屼簡瑙ｅ�熺敤椤荤煡銆�
+ </th>
+ </tr>
+ <tr>
+ <td style="text-align:left;">绛炬敹鑰呭鍚�</td>
+ <td style="text-align:left;"></td>
<td style="text-align:left;" rowspan="2">鎺ユ敹鍗曚綅锛堢瀹わ級绔� </td>
<td style="text-align:left;" rowspan="2"> </td>
</tr>
<tr>
- <td style="text-align:left;">绛炬敹鏃ユ湡</td> <td style="text-align:left;"></td>
-
+ <td style="text-align:left;">绛炬敹鏃ユ湡</td>
+ <td style="text-align:left;"></td>
+
</tr>
</table>
<table border="1" width="100%" style="border-collapse: collapse;">
@@ -164,295 +224,387 @@
</tr>
<tr>
<td style="text-align:left;font-size: 12px">
- 1锛屽鍝侊細鏈』鐭ユ墍鎸囩殑澶囧搧锛屾槸鎸囨湰绛炬敹鍗曢檮浠躲�婂ゥ鏋楀反鏂鍝佸彂璐ф竻鍗曘�嬫墍鍒楃殑鐢卞ゥ鏋楀反鏂紙鍖椾含锛夐攢鍞湇鍔℃湁闄愬叕鍙革紙浠ヤ笅绠�绉板ゥ鏋�<br/>宸存柉锛夊湪瑙勫畾鏈熼檺鍐呭厤璐规彁渚涚粰鍊熺敤鍗曚綅涓哄疄鏂藉尰鐤楄涓烘垨鍩硅绛夋墍浣跨敤鐨勮澶囧寘鎷骇鍝佸強鐩稿叧闄勫睘鍝侊紝闄勪欢鏄湰椤荤煡鏈夋晥缁勬垚閮ㄥ垎锛屼笌鏈�<br/>椤荤煡鍏锋湁鍚岀瓑娉曞緥鏁堝姏銆�<br/>
- 2锛屽鍝佹墍鏈夋潈锛氬鍝佹墍鏈夋潈褰掑睘浜庡ゥ鏋楀反鏂叕鍙搞�傛湭缁忓ゥ鏋楀反鏂叕鍙镐功闈㈠悓鎰忥紝鍊熺敤鍗曚綅涓嶅緱浠ヤ换浣曠悊鐢卞悜浠讳綍绗笁鏂硅浆鍊熴�佽浆璁╅檮浠舵墍<br/>鍒楀鍝侊紝鎴栧皢闄勪欢鎵�鍒楀鍝佷綔涓烘媴淇濇姷鎶肩粰浠讳綍绗笁鏂广��<br/>
- 3锛屽鍝佷娇鐢ㄦ潈锛氬�熺敤鏈熼檺鍐咃紝鍊熺敤鍗曚綅瀵瑰嚭鍊熺殑澶囧搧浜湁鐙珛鍚堢悊鐨勪娇鐢ㄦ潈鍒┿�傝嫢鍦ㄤ娇鐢ㄨ繃绋嬩腑瀛樺湪涓嶇‘瀹氭儏鍐垫椂锛屽�熺敤鍗曚綅搴斿強鏃堕�氱煡<br/>濂ユ灄宸存柉鍏徃锛屽ゥ鏋楀反鏂叕鍙稿皢鍒板満缁欎簣鎸囧鍜屽崗鍔╋紝鍊熺敤鍗曚綅涓嶅簲鎿呰嚜澶勭悊銆�<br/>
- 4锛屽鍝佷箣鏃ュ父浣跨敤涓庣淮鎶わ細鍊熺敤鍗曚綅鍦ㄤ娇鐢ㄥ鍝佽繃绋嬩腑搴旀寜鐓уゥ鏋楀反鏂叕鍙哥殑瑕佹眰锛堚�滀骇鍝佷娇鐢ㄨ鏄庝功鈥濓級鍐呭灏藉鎱庝箟鍔℃纭搷浣滀娇鐢ㄣ��<br/>鐖辨姢浣跨敤銆傚鍝佷娇鐢ㄥ墠鍚庨兘搴旇繘琛屽繀瑕佺殑娓呮礂娑堟瘨锛堢伃鑿岋級鍙婃棩甯告娴嬪伐浣滐紝浠ョ‘淇濆鍝佺殑姝ｅ父杩愪綔銆�<br/>
- 5锛屽鍝佹崯鍧忋�侀仐澶变箣璧斿伩璐ｄ换锛氶檮浠舵墍鍒楀鍝佽嫢鍥犳甯告崯鑰楄�屼骇鐢熺殑缁翠慨鎴栫淮鎶よ垂鐢紝鐢卞ゥ鏋楀反鏂叕鍙告壙鎷咃紱鑻ュ洜鍊熺敤鍗曚綅浣跨敤涓嶅綋鎴栬秴<br/>鏈熷�熺敤绛夊師鍥犻�犳垚鐨勫鍝佹崯鍧忥紝鍊熺敤鍗曚綅搴旀壙鎷呯浉鍏崇淮淇垂鐢ㄣ�傚綋澶囧搧鍊熺敤涓彂鐢熸晠闅滈渶瑕佺淮淇椂锛屽簲鑱旂郴濂ユ灄宸存柉杩涜妫�娴嬪拰缁翠慨锛屼笉寰�<br/>鎿呰嚜灏嗙浉鍏冲鍝佷氦鐢变换浣曠涓夋柟缁翠慨銆傝嫢鍥犲�熺敤鍗曚綅鍘熷洜閫犳垚澶囧搧閬楀け鏃讹紝鍒欏�熺敤鍗曚綅搴旇礋璧斿伩璐ｄ换銆�<br/>
- 6锛屽尰鐤楄矗浠讳簨鏁咃細澶囧搧鏄鍚堝浗瀹惰川閲忔爣鍑嗗苟缁忔楠屽悎鏍肩殑鍖荤枟鍣ㄦ浜у搧锛屽�熺敤鍗曚綅搴旂嫭绔嬩緷闈犲叾鍖荤枟涓撲笟姘村钩鍜岃兘鍔涘埄鐢ㄥ鍝佽繘琛屽尰鐤�<br/>娲诲姩鎴栧煿璁�傚�熺敤鍗曚綅浣跨敤澶囧搧鏃舵墍鍙戠敓鐨勪换浣曢棶棰樺潎鐢卞�熺敤鍗曚綅鑷璐熻矗銆佸鐞嗐��<br/>
- 7锛屽鍝佽繑杩橈細鍊熺敤鍗曚綅搴旀寜鐓ф湰鍗曟敞鏄庣殑浣跨敤鏈熼檺灞ヨ鎸夋椂杩旇繕澶囧搧鐨勬壙璇恒�傝繑鍥炲墠锛屽�熺敤鍗曚綅搴斿澶囧搧杩涜娓呮礂娑堟瘨鎴栫伃鑿岋紝浠ヤ繚璇佹墍<br/>鏈夊鍝佹帴瑙﹁�呯殑鍋ュ悍瀹夊叏锛屽悓鏃跺�熺敤鍗曚綅鏈変箟鍔′负濂ユ灄宸存柉鍏徃鍥炴敹澶囧搧鎻愪緵蹇呰鍗忓姪銆�<br/>
- 8锛屽�熺敤鍗曚綅鐭ユ倝涓斿悓鎰忥紝姝ゆ澶囧搧鍑哄�熷熀浜庢褰撳悎鐞嗙殑鐞嗙敱锛岃�岄潪閫氳繃鍑哄�熷鍝佸鍊熺敤鍗曚綅璐拱銆佹帹鑽愬ゥ鏋楀反鏂叕鍙镐骇鍝併�佹湇鍔＄瓑浜х敓浠�<br/>浣曚笉姝ｅ綋褰卞搷銆�<br/>
- 9锛屽�熺敤鍗曚綅搴斾弗鏍兼寜鏈崟鎵�杞戒娇鐢ㄧ洰鐨勪娇鐢ㄥ鍝侊紝绂佹灏嗗鍝佺敤浜庢湰鍗曟墍杞戒娇鐢ㄧ洰鐨勪互澶栫殑鍏朵粬鐢ㄩ�斻��<br/>
- 10锛岃嫢鍊熺敤鍗曚綅閫夋嫨浠ュ姞鐩栧疄闄呮帴鏀跺鍝佺殑鍊熺敤鍗曚綅鍐呴儴閮ㄩ棬绔犳垨绛炬敹鑰呯鍚嶆柟寮忕‘璁や互涓婂唴瀹癸紝瀹為檯鎺ユ敹澶囧搧鐨勫�熺敤鍗曚綅鍐呴儴閮ㄩ棬鎴栫<br/>鏀惰�呯‘璁ゅ叾鍏峰鐩稿簲璧勬牸浠ｈ〃鍊熺敤鍗曚綅杩涜绛炬敹鍜岀‘璁ゃ��<br/>
- 11锛屽叾瀹冿細鍏跺畠鏈敖浜嬪疁锛屽弻鏂瑰簲鏈潃鍙嬪ソ鍚堜綔鐨勫師鍒欒繘琛屽崗鍟嗚В鍐炽��
+ 1锛屽鍝侊細鏈』鐭ユ墍鎸囩殑澶囧搧锛屾槸鎸囨湰绛炬敹鍗曢檮浠躲�婂ゥ鏋楀反鏂鍝佸彂璐ф竻鍗曘�嬫墍鍒楃殑鐢卞ゥ鏋楀反鏂紙鍖椾含锛夐攢鍞湇鍔℃湁闄愬叕鍙革紙浠ヤ笅绠�绉板ゥ鏋�
+ <br/>宸存柉锛夊湪瑙勫畾鏈熼檺鍐呭厤璐规彁渚涚粰鍊熺敤鍗曚綅涓哄疄鏂藉尰鐤楄涓烘垨鍩硅绛夋墍浣跨敤鐨勮澶囧寘鎷骇鍝佸強鐩稿叧闄勫睘鍝侊紝闄勪欢鏄湰椤荤煡鏈夋晥缁勬垚閮ㄥ垎锛屼笌鏈�
+ <br/>椤荤煡鍏锋湁鍚岀瓑娉曞緥鏁堝姏銆�
+ <br/> 2锛屽鍝佹墍鏈夋潈锛氬鍝佹墍鏈夋潈褰掑睘浜庡ゥ鏋楀反鏂叕鍙搞�傛湭缁忓ゥ鏋楀反鏂叕鍙镐功闈㈠悓鎰忥紝鍊熺敤鍗曚綅涓嶅緱浠ヤ换浣曠悊鐢卞悜浠讳綍绗笁鏂硅浆鍊熴�佽浆璁╅檮浠舵墍
+ <br/>鍒楀鍝侊紝鎴栧皢闄勪欢鎵�鍒楀鍝佷綔涓烘媴淇濇姷鎶肩粰浠讳綍绗笁鏂广��
+ <br/> 3锛屽鍝佷娇鐢ㄦ潈锛氬�熺敤鏈熼檺鍐咃紝鍊熺敤鍗曚綅瀵瑰嚭鍊熺殑澶囧搧浜湁鐙珛鍚堢悊鐨勪娇鐢ㄦ潈鍒┿�傝嫢鍦ㄤ娇鐢ㄨ繃绋嬩腑瀛樺湪涓嶇‘瀹氭儏鍐垫椂锛屽�熺敤鍗曚綅搴斿強鏃堕�氱煡
+ <br/>濂ユ灄宸存柉鍏徃锛屽ゥ鏋楀反鏂叕鍙稿皢鍒板満缁欎簣鎸囧鍜屽崗鍔╋紝鍊熺敤鍗曚綅涓嶅簲鎿呰嚜澶勭悊銆�
+ <br/> 4锛屽鍝佷箣鏃ュ父浣跨敤涓庣淮鎶わ細鍊熺敤鍗曚綅鍦ㄤ娇鐢ㄥ鍝佽繃绋嬩腑搴旀寜鐓уゥ鏋楀反鏂叕鍙哥殑瑕佹眰锛堚�滀骇鍝佷娇鐢ㄨ鏄庝功鈥濓級鍐呭灏藉鎱庝箟鍔℃纭搷浣滀娇鐢ㄣ��
+ <br/>鐖辨姢浣跨敤銆傚鍝佷娇鐢ㄥ墠鍚庨兘搴旇繘琛屽繀瑕佺殑娓呮礂娑堟瘨锛堢伃鑿岋級鍙婃棩甯告娴嬪伐浣滐紝浠ョ‘淇濆鍝佺殑姝ｅ父杩愪綔銆�
+ <br/> 5锛屽鍝佹崯鍧忋�侀仐澶变箣璧斿伩璐ｄ换锛氶檮浠舵墍鍒楀鍝佽嫢鍥犳甯告崯鑰楄�屼骇鐢熺殑缁翠慨鎴栫淮鎶よ垂鐢紝鐢卞ゥ鏋楀反鏂叕鍙告壙鎷咃紱鑻ュ洜鍊熺敤鍗曚綅浣跨敤涓嶅綋鎴栬秴
+ <br/>鏈熷�熺敤绛夊師鍥犻�犳垚鐨勫鍝佹崯鍧忥紝鍊熺敤鍗曚綅搴旀壙鎷呯浉鍏崇淮淇垂鐢ㄣ�傚綋澶囧搧鍊熺敤涓彂鐢熸晠闅滈渶瑕佺淮淇椂锛屽簲鑱旂郴濂ユ灄宸存柉杩涜妫�娴嬪拰缁翠慨锛屼笉寰�
+ <br/>鎿呰嚜灏嗙浉鍏冲鍝佷氦鐢变换浣曠涓夋柟缁翠慨銆傝嫢鍥犲�熺敤鍗曚綅鍘熷洜閫犳垚澶囧搧閬楀け鏃讹紝鍒欏�熺敤鍗曚綅搴旇礋璧斿伩璐ｄ换銆�
+ <br/> 6锛屽尰鐤楄矗浠讳簨鏁咃細澶囧搧鏄鍚堝浗瀹惰川閲忔爣鍑嗗苟缁忔楠屽悎鏍肩殑鍖荤枟鍣ㄦ浜у搧锛屽�熺敤鍗曚綅搴旂嫭绔嬩緷闈犲叾鍖荤枟涓撲笟姘村钩鍜岃兘鍔涘埄鐢ㄥ鍝佽繘琛屽尰鐤�
+ <br/>娲诲姩鎴栧煿璁�傚�熺敤鍗曚綅浣跨敤澶囧搧鏃舵墍鍙戠敓鐨勪换浣曢棶棰樺潎鐢卞�熺敤鍗曚綅鑷璐熻矗銆佸鐞嗐��
+ <br/> 7锛屽鍝佽繑杩橈細鍊熺敤鍗曚綅搴旀寜鐓ф湰鍗曟敞鏄庣殑浣跨敤鏈熼檺灞ヨ鎸夋椂杩旇繕澶囧搧鐨勬壙璇恒�傝繑鍥炲墠锛屽�熺敤鍗曚綅搴斿澶囧搧杩涜娓呮礂娑堟瘨鎴栫伃鑿岋紝浠ヤ繚璇佹墍
+ <br/>鏈夊鍝佹帴瑙﹁�呯殑鍋ュ悍瀹夊叏锛屽悓鏃跺�熺敤鍗曚綅鏈変箟鍔′负濂ユ灄宸存柉鍏徃鍥炴敹澶囧搧鎻愪緵蹇呰鍗忓姪銆�
+ <br/> 8锛屽�熺敤鍗曚綅鐭ユ倝涓斿悓鎰忥紝姝ゆ澶囧搧鍑哄�熷熀浜庢褰撳悎鐞嗙殑鐞嗙敱锛岃�岄潪閫氳繃鍑哄�熷鍝佸鍊熺敤鍗曚綅璐拱銆佹帹鑽愬ゥ鏋楀反鏂叕鍙镐骇鍝併�佹湇鍔＄瓑浜х敓浠�
+ <br/>浣曚笉姝ｅ綋褰卞搷銆�
+ <br/> 9锛屽�熺敤鍗曚綅搴斾弗鏍兼寜鏈崟鎵�杞戒娇鐢ㄧ洰鐨勪娇鐢ㄥ鍝侊紝绂佹灏嗗鍝佺敤浜庢湰鍗曟墍杞戒娇鐢ㄧ洰鐨勪互澶栫殑鍏朵粬鐢ㄩ�斻��
+ <br/> 10锛岃嫢鍊熺敤鍗曚綅閫夋嫨浠ュ姞鐩栧疄闄呮帴鏀跺鍝佺殑鍊熺敤鍗曚綅鍐呴儴閮ㄩ棬绔犳垨绛炬敹鑰呯鍚嶆柟寮忕‘璁や互涓婂唴瀹癸紝瀹為檯鎺ユ敹澶囧搧鐨勫�熺敤鍗曚綅鍐呴儴閮ㄩ棬鎴栫
+ <br/>鏀惰�呯‘璁ゅ叾鍏峰鐩稿簲璧勬牸浠ｈ〃鍊熺敤鍗曚綅杩涜绛炬敹鍜岀‘璁ゃ��
+ <br/> 11锛屽叾瀹冿細鍏跺畠鏈敖浜嬪疁锛屽弻鏂瑰簲鏈潃鍙嬪ソ鍚堜綔鐨勫師鍒欒繘琛屽崗鍟嗚В鍐炽��
</td>
- <!-- 20211008 ljh SFDC-C7L4ED 澧炲姞8锛�9锛�10-->
+ <!-- 20211008 ljh SFDC-C7L4ED 澧炲姞8锛�9锛�10-->
</tr>
<tr>
<td style="text-align:left;font-size:12px;border-collapse: collapse;" colspan="2" height="80">
- 濂ユ灄宸存柉 鍖椾含澶囧搧涓績鍦板潃锛氬寳浜競鏈濋槼鍖洪厭浠欐ˉ璺�10鍙锋亽閫氬晢鍔″洯B12C搴цタ闂�1F<br />
- 閭紪锛�100015 TEL锛�010-59756006-1871 FAX: 010-59756534<br />
- 濂ユ灄宸存柉 骞垮窞澶囧搧涓績鍦板潃锛氬箍宸炲競鐣鍖轰笢鐜鐣澶ч亾鍖�537鍙风暘灞卞垱涓氫腑蹇�3鍙锋ゼ1F<br />
- 閭紪锛�511400 TEL锛�020-39198888-8876 FAX锛�020-39198848<br />
- 濂ユ灄宸存柉 涓婃捣澶囧搧涓績鍦板潃锛氫笂娴峰競娴︿笢鏂板尯閲戝悏璺�778鍙�3鍙锋ゼ1F<br />
- 閭紪锛�201206 TEL锛�021-60391318-8877 FAX锛�021-60391316<br />
+ 濂ユ灄宸存柉 鍖椾含澶囧搧涓績鍦板潃锛氬寳浜競鏈濋槼鍖洪厭浠欐ˉ璺�10鍙锋亽閫氬晢鍔″洯B12C搴цタ闂�1F
+ <br /> 閭紪锛�100015 TEL锛�010-59756006-1871 FAX: 010-59756534
+ <br /> 濂ユ灄宸存柉 骞垮窞澶囧搧涓績鍦板潃锛氬箍宸炲競鐣鍖轰笢鐜鐣澶ч亾鍖�537鍙风暘灞卞垱涓氫腑蹇�3鍙锋ゼ1F
+ <br /> 閭紪锛�511400 TEL锛�020-39198888-8876 FAX锛�020-39198848
+ <br /> 濂ユ灄宸存柉 涓婃捣澶囧搧涓績鍦板潃锛氫笂娴峰競娴︿笢鏂板尯閲戝悏璺�778鍙�3鍙锋ゼ1F
+ <br /> 閭紪锛�201206 TEL锛�021-60391318-8877 FAX锛�021-60391316
+ <br />
</td>
<!-- 20210812 SFDC-C5CC5S 淇敼鍦板潃-->
</tr>
</table>
<apex:outputPanel layout="none">
- <div style="page-break-after: always;"/>
+ <div style="page-break-after: always;"></div>
</apex:outputPanel>
-
+ </div>
<apex:variable value="{!1}" var="pNcnt" />
<apex:variable value="{!1}" var="pcnt" />
<apex:repeat value="{!records}" var="record">
- <div style="{position:absolute;width:100%;height:15px"> </div>
- <!-- 20201119 LJH OCSM_BP5-61 update start 涓诲崟鏄樉绀哄姙浜嬪鍜屽鍝佷腑蹇冨垎鏉ユ樉绀轰笖鍐呭涓嶅悓 -->
- <!-- <apex:outputText style="float:left;font-size:22px;margin-top: 15px;" value="{!centreAddress}"/> -->
- <!-- height: 15mm; -->
- <table border="0" width="100%" style="border-collapse: collapse;margin: 0;">
- <apex:outputPanel layout="none" rendered="{!IF(!IsShowLU , true, false)}">
- <tr>
- <td style="font-size:22px;"><apex:outputText value="{!IF(record.isAgencyOrCenter,record.AgencyAddressName,centreAddress)}"/></td>
- <td rowspan="2">
- <img style="float: right; width: 55px; height: 55px;padding: 0px;margin-top: 0mm;" src="{!'/servlet/servlet.FileDownload?file=' + ApplyHeadShow.QRId__c}" />
- </td>
- </tr>
- <tr>
- <td style="font-size:15px;"><c:PDFWbr targetStr="{!IF(record.AgencyOrCenterAddress=='BeiJingCenter','鍖椾含甯傛湞闃冲尯閰掍粰妗ヨ矾10鍙锋亽閫氬晢鍔″洯B12C搴цタ闂�1F 鐢佃瘽:010-59756006-1871',IF(record.AgencyOrCenterAddress=='ShangHaiCenter','涓婃捣甯傛郸涓滄柊鍖哄攼闀囧垱涓氳矾183鍙�2骞�1F 鐢佃瘽:021-60391318-8877',IF(record.AgencyOrCenterAddress=='GuangZhouCenter','骞垮窞甯傜暘绂哄尯涓滅幆琛楃暘绂哄ぇ閬撳寳537鍙风暘灞卞垱涓氫腑蹇�3鍙锋ゼ1F 鐢佃瘽:020-39198888-8876',record.AgencyOrCenterAddress)))}"/></td>
- </tr>
- </apex:outputPanel>
- <apex:outputPanel layout="none" rendered="{!IF(IsShowLU , true, false)}">
- <tr>
- <td style="font-size:22px;height: 55px;line-height: 55px;"><apex:outputText value="{!centreAddress}"/>
- </td>
- <td>
- <img style="float: right; width: 55px; height: 55px;padding: 0px;margin-top: 0mm;" src="{!'/servlet/servlet.FileDownload?file=' + ApplyHeadShow.QRId__c}" />
- </td>
- </tr>
- </apex:outputPanel>
- </table>
- <!-- 20201119 LJH OCSM_BP5-61 update end 涓诲崟鏄樉绀哄姙浜嬪鍜屽鍝佷腑蹇冨垎鏉ユ樉绀轰笖鍐呭涓嶅悓 -->
- <!-- margin-top: 15mm; -->
- <table border="1" width="100%" style="border-collapse: collapse;">
- <tr>
- <th style="box-sizing: border-box;text-align:center;font-size:24px;font-weight:900;" height="40">濂ユ灄宸存柉澶囧搧鍙戣揣娓呭崟
- <!-- <img style="float: right; width: 35px; height: 35px;padding: 0px;" src="{!'/servlet/servlet.FileDownload?file=' + ApplyHeadShow.QRId__c}" /> -->
- <!-- <td align="right" valign="top"><apex:outputField value="{!ApplyHeadShow.QRImg__c}" /></td> -->
- </th>
- </tr>
- <tr>
- <td style="box-sizing: border-box;text-align:right;font-size:13px;" >澶囧搧绠＄悊涓績鐢宠鍗曞彿锛�<apex:outputText value="{!ApplyHeadShow.Name}" /></td> <!-- {!RentalApplyName} 20201119 LJH OCSM_BP5-61 update-->
- </tr>
- <tr style="background-color:white;">
- <td style="box-sizing: border-box;text-align:right;font-size:13px;">鏈崟闄勪欢绗紙 {!pNcnt}锛夐〉/鍏憋紙 {!pageCnt}锛夐〉</td>
- </tr>
- <tr>
- <th style="box-sizing: border-box;text-align:center;font-size:16px;">
- 鈥绘彁绀�
- </th>
- </tr>
- <tr>
- <td style="box-sizing: border-box;text-align:left;font-size:12.3px;">鏈�婂ゥ鏋楀反鏂鍝佸彂璐ф竻鍗曘�嬩竴寮忎袱浠斤紝鐢卞ゥ鏋楀反鏂鍝佸�熺敤鐢宠浜猴紙澶囧搧瀹夎浜猴級鍜屽尰鐤楁満鏋勫�熺敤鏂瑰悇鎵т竴浠斤紝浣滀负鍑哄�熷拰褰掕繕鏃跺弻鏂硅繘<br/>琛屾竻鐐圭‘璁ゅ嚟璇�
- </td>
- </tr>
- </table>
+ <div class="pdf-page">
+ <div class="title1"> </div>
+ <!-- 20201119 LJH OCSM_BP5-61 update start 涓诲崟鏄樉绀哄姙浜嬪鍜屽鍝佷腑蹇冨垎鏉ユ樉绀轰笖鍐呭涓嶅悓 -->
+ <!-- <apex:outputText style="float:left;font-size:22px;margin-top: 15px;" value="{!centreAddress}"/> -->
+ <!-- height: 15mm; -->
+ <table border="0" width="100%" style="border-collapse: collapse;margin: 0;">
+ <apex:outputPanel layout="none" rendered="{!IF(!IsShowLU , true, false)}">
+ <tr>
+ <td style="font-size:22px;">
+ <apex:outputText value="{!IF(record.isAgencyOrCenter,record.AgencyAddressName,centreAddress)}" />
+ </td>
+ <td rowspan="2">
+ <img style="float: right; width: 55px; height: 55px;padding: 0px;margin-top: 0mm;" src="{!qrcode}"
+ />
+ </td>
+ </tr>
+ <tr>
+ <td style="font-size:15px;">
+ <c:PDFWbr targetStr="{!IF(record.AgencyOrCenterAddress=='BeiJingCenter','鍖椾含甯傛湞闃冲尯閰掍粰妗ヨ矾10鍙锋亽閫氬晢鍔″洯B12C搴цタ闂�1F 鐢佃瘽:010-59756006-1871',IF(record.AgencyOrCenterAddress=='ShangHaiCenter','涓婃捣甯傛郸涓滄柊鍖哄攼闀囧垱涓氳矾183鍙�2骞�1F 鐢佃瘽:021-60391318-8877',IF(record.AgencyOrCenterAddress=='GuangZhouCenter','骞垮窞甯傜暘绂哄尯涓滅幆琛楃暘绂哄ぇ閬撳寳537鍙风暘灞卞垱涓氫腑蹇�3鍙锋ゼ1F 鐢佃瘽:020-39198888-8876',record.AgencyOrCenterAddress)))}"
+ />
+ </td>
+ </tr>
+ </apex:outputPanel>
+ <apex:outputPanel layout="none" rendered="{!IF(IsShowLU , true, false)}">
+ <tr>
+ <td style="font-size:22px;height: 55px;line-height: 55px;">
+ <apex:outputText value="{!centreAddress}" />
+ </td>
+ <td>
+ <img style="float: right; width: 55px; height: 55px;padding: 0px;margin-top: 0mm;" src="{!qrcode}"
+ />
+ </td>
+ </tr>
+ </apex:outputPanel>
+ </table>
+ <!-- 20201119 LJH OCSM_BP5-61 update end 涓诲崟鏄樉绀哄姙浜嬪鍜屽鍝佷腑蹇冨垎鏉ユ樉绀轰笖鍐呭涓嶅悓 -->
+ <!-- margin-top: 15mm; -->
+ <table border="1" width="100%" style="border-collapse: collapse;">
+ <tr>
+ <th style="box-sizing: border-box;text-align:center;font-size:24px;font-weight:900;" height="40">濂ユ灄宸存柉澶囧搧鍙戣揣娓呭崟
+ <!-- <img style="float: right; width: 35px; height: 35px;padding: 0px;" src="{!qrcode}" /> -->
+ <!-- <td align="right" valign="top"><apex:outputField value="{!ApplyHeadShow.QRImg__c}" /></td> -->
+ </th>
+ </tr>
+ <tr>
+ <td style="box-sizing: border-box;text-align:right;font-size:13px;">澶囧搧绠＄悊涓績鐢宠鍗曞彿锛�
+ <apex:outputText value="{!ApplyHeadShow.Name}" />
+ </td>
+ <!-- {!RentalApplyName} 20201119 LJH OCSM_BP5-61 update-->
+ </tr>
+ <tr style="background-color:white;">
+ <td style="box-sizing: border-box;text-align:right;font-size:13px;">鏈崟闄勪欢绗紙 {!pNcnt}锛夐〉/鍏憋紙 {!pageCnt}锛夐〉</td>
+ </tr>
+ <tr>
+ <th style="box-sizing: border-box;text-align:center;font-size:16px;">
+ 鈥绘彁绀�
+ </th>
+ </tr>
+ <tr>
+ <td style="box-sizing: border-box;text-align:left;font-size:12.3px;">鏈�婂ゥ鏋楀反鏂鍝佸彂璐ф竻鍗曘�嬩竴寮忎袱浠斤紝鐢卞ゥ鏋楀反鏂鍝佸�熺敤鐢宠浜猴紙澶囧搧瀹夎浜猴級鍜屽尰鐤楁満鏋勫�熺敤鏂瑰悇鎵т竴浠斤紝浣滀负鍑哄�熷拰褰掕繕鏃跺弻鏂硅繘
+ <br/>琛屾竻鐐圭‘璁ゅ嚟璇�
+ </td>
+ </tr>
+ </table>
- <table border="1" width="100%" style="border-collapse: collapse;">
- <colgroup>
- <col width="4%" />
- <col width="8%" />
- <col width="20%" />
- <col width="11%" />
- <col width="29%" />
- <col width="9%" />
- <col width="9%" />
- <col width="7%" />
- </colgroup>
- <tr>
- <td style="box-sizing: border-box;text-align:center;font-size:13px;height: 16px;" colspan="2">鐢宠浜�</td>
- <td style="box-sizing: border-box;text-align:left;font-size: 13px">
- <apex:outputText value="{!ApplyHeadShow.Person_In_Charge__r.name}" />
- </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="5" rowspan="2">
- <apex:outputText value="{!HospitalName}" />
- </td>
- </tr>
- <tr>
- <td style="box-sizing: border-box;text-align:center;font-size:13px;" colspan="2">浣跨敤鐩殑</td>
- <td style="box-sizing: border-box;text-align:left;font-size: 13px;border-right: solid 1px">
- <apex:outputText value="{!ApplyHeadShow.Demo_purpose1__c}" />
- </td>
- </tr>
- <tr>
- <td style="box-sizing: border-box;text-align:center;font-size:13px;height: 16px;" colspan="2">鏀朵欢鑰呭鍚�</td>
- <td style="box-sizing: border-box;text-align:left;font-size: 13px">
- <apex:outputText value="{!ApplyHeadShow.Loaner_received_staff__c}" />
- </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="5" rowspan="2">
- <apex:outputText styleClass="address" value="{!if(isblank(ApplyHeadShow.Shippment_adress_detail__c), ApplyHeadShow.direct_shippment_address__c, ApplyHeadShow.Shippment_adress_detail__c)}" />
- </td>
- </tr>
- <tr>
- <td style="box-sizing: border-box;text-align:center;font-size:13px;" colspan="2">鏀朵欢鑰呯數璇�</td>
- <td style="box-sizing: border-box;text-align:left;font-size: 13px;border-right: solid 1px">
- <apex:outputText value="{!ApplyHeadShow.Loaner_received_staff_phone__c}" />
- </td>
- </tr>
- <tr>
- <!-- 20220124 ljh SFDC-C4U3PH update colspan="8" -->
- <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="7" style="box-sizing: border-box;text-align:center;font-size: 11px;">鏄庣粏</td>
- </tr>
- <tr>
- <!-- <td style="text-align:center;">搴忓彿</td>
+ <table border="1" width="100%" style="border-collapse: collapse;">
+ <colgroup>
+ <col width="4%" />
+ <col width="8%" />
+ <col width="20%" />
+ <col width="11%" />
+ <col width="29%" />
+ <col width="9%" />
+ <col width="9%" />
+ <col width="7%" />
+ </colgroup>
+ <tr>
+ <td style="box-sizing: border-box;text-align:center;font-size:13px;height: 16px;" colspan="2">鐢宠浜�</td>
+ <td style="box-sizing: border-box;text-align:left;font-size: 13px">
+ <apex:outputText value="{!ApplyHeadShow.Person_In_Charge__r.name}" />
+ </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="5" rowspan="2">
+ <apex:outputText value="{!HospitalName}" />
+ </td>
+ </tr>
+ <tr>
+ <td style="box-sizing: border-box;text-align:center;font-size:13px;" colspan="2">浣跨敤鐩殑</td>
+ <td style="box-sizing: border-box;text-align:left;font-size: 13px;border-right: solid 1px">
+ <apex:outputText value="{!ApplyHeadShow.Demo_purpose1__c}" />
+ </td>
+ </tr>
+ <tr>
+ <td style="box-sizing: border-box;text-align:center;font-size:13px;height: 16px;" colspan="2">鏀朵欢鑰呭鍚�</td>
+ <td style="box-sizing: border-box;text-align:left;font-size: 13px">
+ <apex:outputText value="{!ApplyHeadShow.Loaner_received_staff__c}" />
+ </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="5" rowspan="2">
+ <apex:outputText styleClass="address" value="{!if(isblank(ApplyHeadShow.Shippment_adress_detail__c), ApplyHeadShow.direct_shippment_address__c, ApplyHeadShow.Shippment_adress_detail__c)}"
+ />
+ </td>
+ </tr>
+ <tr>
+ <td style="box-sizing: border-box;text-align:center;font-size:13px;" colspan="2">鏀朵欢鑰呯數璇�</td>
+ <td style="box-sizing: border-box;text-align:left;font-size: 13px;border-right: solid 1px">
+ <apex:outputText value="{!ApplyHeadShow.Loaner_received_staff_phone__c}" />
+ </td>
+ </tr>
+ <tr>
+ <!-- 20220124 ljh SFDC-C4U3PH update colspan="8" -->
+ <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="7" style="box-sizing: border-box;text-align:center;font-size: 11px;">鏄庣粏</td>
+ </tr>
+ <tr>
+ <!-- <td style="text-align:center;">搴忓彿</td>
<td style="text-align:center;">澶囧搧set鍨嬪彿</td>
<td style="text-align:center;">绠＄悊缂栧彿</td>
<td style="text-align:center;">浜у搧鍨嬪彿</td>
<td style="text-align:center;">鏈鸿韩鍙�</td>
<td style="text-align:center;">闄勫睘鍝佹槑缁�</td> -->
- <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;" colspan="2">涓枃鍚嶇О</td>
- <td style="box-sizing: border-box;text-align:center;font-size: 11px;">鏈鸿韩鍙�</td>
- <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>
- <!-- 20220124 ljh SFDC-C4U3PH add end -->
- <!-- <td style="text-align:center;">浜岀淮鐮�</td> -->
- </tr>
- <apex:repeat value="{!record.lineList}" var="line">
- <tr>
- <td style="box-sizing: border-box;text-align:center;font-size: 10px;height:30px;padding: 0px;"><c:PDFWbr targetStr="{!line.index}" /></td>
- <td style="box-sizing: border-box;text-align:left;font-size: 10px;padding: 0px;"><c:PDFWbr targetStr="{!line.dManagementnumber}" /></td>
- <td style="box-sizing: border-box;text-align:left;font-size: 10px;padding: 0px;"><c:PDFWbr targetStr="{!line.dModelNo}" /></td>
- <td style="box-sizing: border-box;text-align:left;font-size: 10px;padding: 0px;" colspan="2"><c:PDFWbr targetStr="{!line.dChinaName}" /></td>
- <td style="box-sizing: border-box;text-align:left;font-size: 10px;padding: 0px;"><c:PDFWbr targetStr="{!line.dSerialNumber}" /></td>
- <td style="box-sizing: border-box;text-align:left;font-size: 10px;padding: 0px;"><c:PDFWbr targetStr="{!line.dLoaner_asset_no}" /></td>
- <td style="box-sizing: border-box;text-align:left;font-size: 10px;padding: 0px;"><c:PDFWbr targetStr="{!line.wh_location}" /></td>
+ <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;" colspan="2">涓枃鍚嶇О</td>
+ <td style="box-sizing: border-box;text-align:center;font-size: 11px;">鏈鸿韩鍙�</td>
+ <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:left;font-size: 10px;padding: 0px;"><c:PDFWbr targetStr="" /></td>
- <!-- {!line.Received_ng_detail} -->
+ <td style="box-sizing: border-box;text-align:center;font-size: 11px;min-width:30px">澶囨敞</td>
<!-- 20220124 ljh SFDC-C4U3PH add end -->
- <!-- <td style="text-align:center;font-size: 10px"><c:PDFWbr targetStr="{!line.dQRCode}" /></td> -->
+ <!-- <td style="text-align:center;">浜岀淮鐮�</td> -->
+ </tr>
+ <apex:repeat value="{!record.lineList}" var="line">
+ <tr>
+ <td style="box-sizing: border-box;text-align:center;font-size: 10px;height:30px;padding: 0px;">
+ <c:PDFWbr targetStr="{!line.index}" />
+ </td>
+ <td style="box-sizing: border-box;text-align:left;font-size: 10px;padding: 0px;">
+ <c:PDFWbr targetStr="{!line.dManagementnumber}" />
+ </td>
+ <td style="box-sizing: border-box;text-align:left;font-size: 10px;padding: 0px;">
+ <c:PDFWbr targetStr="{!line.dModelNo}" />
+ </td>
+ <td style="box-sizing: border-box;text-align:left;font-size: 10px;padding: 0px;" colspan="2">
+ <c:PDFWbr targetStr="{!line.dChinaName}" />
+ </td>
+ <td style="box-sizing: border-box;text-align:left;font-size: 10px;padding: 0px;">
+ <c:PDFWbr targetStr="{!line.dSerialNumber}" />
+ </td>
+ <td style="box-sizing: border-box;text-align:left;font-size: 10px;padding: 0px;">
+ <c:PDFWbr targetStr="{!line.dLoaner_asset_no}" />
+ </td>
+ <td style="box-sizing: border-box;text-align:left;font-size: 10px;padding: 0px;">
+ <c:PDFWbr targetStr="{!line.wh_location}" />
+ </td>
+ <!-- 20220124 ljh SFDC-C4U3PH add start -->
+ <td style="box-sizing: border-box;text-align:left;font-size: 10px;padding: 0px;">
+ <c:PDFWbr targetStr="" />
+ </td>
+ <!-- {!line.Received_ng_detail} -->
+ <!-- 20220124 ljh SFDC-C4U3PH add end -->
+ <!-- <td style="text-align:center;font-size: 10px"><c:PDFWbr targetStr="{!line.dQRCode}" /></td> -->
- <!-- <td style="text-align:left;font-size: 13px"><apex:outputText value="{!IF(pcnt < AllSum +1,pcnt,'')}" /></td> -->
- <!-- <td style="text-align:left;font-size: 13px"><apex:outputText value="{!line.index}" /></td>
+ <!-- <td style="text-align:left;font-size: 13px"><apex:outputText value="{!IF(pcnt < AllSum +1,pcnt,'')}" /></td> -->
+ <!-- <td style="text-align:left;font-size: 13px"><apex:outputText value="{!line.index}" /></td>
<td style="text-align:left;font-size: 13px"><apex:outputText value="{!line.setName}" /></td>
<td style="text-align:left;font-size: 13px"><apex:outputText value="{!line.name1}" /></td>
<td style="text-align:left;font-size: 13px"><apex:outputText value="{!line.LoanerCode}" /></td>
<td style="text-align:left;font-size: 13px"><apex:outputText value="{!line.serialNumber1}" /></td>
<td style="text-align:left;font-size: 13px"><apex:outputText value="{!line.AssetModelNo}" /></td> -->
- </tr>
- <apex:variable value="{!pcnt + 1}" var="pcnt" />
- </apex:repeat>
- </table>
- <!-- 20211209 ljh SFDC-C923SR 鏉″舰鐮� -->
- <img style="float:left;position:absolute;z-index: 99;" src="{!barcode}" />
+ </tr>
+ <apex:variable value="{!pcnt + 1}" var="pcnt" />
+ </apex:repeat>
+ </table>
+ <!-- 20211209 ljh SFDC-C923SR 鏉″舰鐮� -->
+ <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">
- <!-- <div style="{position:absolute;width:100%;height:30px"> </div>
- <div style="{position:absolute;width:100%;height:30px"> </div>-->
- <div style="page-break-after: always;"/>
- </apex:outputPanel>
- <apex:variable value="{!pNcnt+1}" var="pNcnt" />
+ <!-- 20211209 ljh SFDC-C923SR 鏉″舰鐮� -->
+ <div style="{position:absolute;width:100%;height:20px"> </div>
+ <apex:outputPanel rendered="{!pNcnt < pageCnt}" layout="none">
+ <!-- <div style="{position:absolute;width:100%;height:30px"> </div>
+ <div style="{position:absolute;width:100%;height:30px"> </div>-->
+ <div style="page-break-after: always;" />
+ </apex:outputPanel>
+ <apex:variable value="{!pNcnt+1}" var="pNcnt" />
+ </div>
</apex:repeat>
- </apex:outputPanel>
- </div>
- </body>
- <script>
- console.log('----start----')
- console.log('----{!ApplyHeadShow.AWS_Data_Id__c}----')
- AWSService.sfSessionId = '{!GETSESSIONID()}';
- //sforce.connection.sessionId = '{!GETSESSIONID()}';
- var staticResources = JSON.parse('{!staticResource}');
- //blockme();
- document.body.onload = function(){
- console.log('document.body.onload')
- if ({!addFlag} || !'{!ApplyHeadShow.Shippment_adress_detail__c}') {
- AWSService.query(staticResources.queryUrl, '{!ApplyHeadShow.AWS_Data_Id__c}', function(data){
- console.log('data----------')
- console.log(data);
- //unblockUI();
- if ({!addFlag}) {
- jQuery(".Shippmentadress").html(data.object.directShippmentAddress);
- }
- //document.getElementById("Caller_phone__c").innerHTML = data.object.callerPhone;
- if (!'{!ApplyHeadShow.Shippment_adress_detail__c}') {
- jQuery(".address").html(data.object.directShippmentAddress);
- //document.getElementById("allPage:address").innerHTML = data.object.directShippmentAddress;
- }
- jsPdfDownload();
- }, staticResources.token);
- }else{
- jsPdfDownload();
- }
+ </apex:outputPanel>
+ </div>
+ </body>
+ <script>
+ console.log('----start----')
+ console.log('----{!ApplyHeadShow.AWS_Data_Id__c}----')
+ AWSService.sfSessionId = '{!GETSESSIONID()}';
+ //sforce.connection.sessionId = '{!GETSESSIONID()}';
+ var staticResources = JSON.parse('{!staticResource}');
+ //blockme();
+ document.body.onload = function () {
+ console.log('document.body.onload')
+ if ({!addFlag
+ } || !'{!ApplyHeadShow.Shippment_adress_detail__c}') {
+ AWSService.query(staticResources.queryUrl, '{!ApplyHeadShow.AWS_Data_Id__c}', function (data) {
+ console.log('data----------')
+ console.log(data);
+ //unblockUI();
+ if ({!addFlag
+ }) {
+ jQuery(".Shippmentadress").html(data.object.directShippmentAddress);
+ }
+ //document.getElementById("Caller_phone__c").innerHTML = data.object.callerPhone;
+ if (!'{!ApplyHeadShow.Shippment_adress_detail__c}') {
+ jQuery(".address").html(data.object.directShippmentAddress);
+ //document.getElementById("allPage:address").innerHTML = data.object.directShippmentAddress;
+ }
+ jsPdfDownload();
+ }, staticResources.token);
+ }else {
+ jsPdfDownload();
+ }
}
- function jsPdfDownload(){
- let pdfName = "娴嬭瘯";
- let id = "pdf-wrapper";
- var target = document.getElementById(id);
- target.style.background = "#FFFFFF";
- if(pdfName==''||pdfName==undefined) pdfName= getNowFormatDate();
-
- html2canvas(target, {
+ function jsPdfDownload() {
+
+ let jtargets = jQuery("#pdf-wrapper .pdf-page");
+ let j_arr = new Array(jtargets.length + 1).join(0).split('').map(function () { return false });
+ let landscape = false;
+ let pw = 595.28;
+ let ph = 841.89;
+ const marginw = 40;
+
+ let orientation = '';
+ if (landscape) {
+ pw += ph; ph = pw - ph; pw = pw - ph;
+ orientation = 'l';
+ }
+ var pdf = new jsPDF(orientation, 'pt', 'a4');// 绗竴涓弬鏁板～瀛楁瘝l锛屾敞鎰忎笉鏄暟瀛�1锛屼负妯悜pdf
+ jtargets.each(function (i, e) {
+ e.style.background = "#FFFFFF";
+ })
+
+ let rei = 0;
+ let recursion = null;
+ recursion = function (i) {
+ if (i >= jtargets.length) {
+ Fun(pdf);
+ return;
+ }
+ e = jtargets[i];
+ html2canvas(e, {
scale: 2,
- onrendered:function(canvas) {
+ onrendered: function (canvas) {
+
+ let canvas_max_page_num = 1;
+ let canvas_current_page_num = 0;
var contentWidth = canvas.width;
var contentHeight = canvas.height;
-
+
//涓�椤祊df鏄剧ずhtml椤甸潰鐢熸垚鐨刢anvas楂樺害;
- var pageHeight = contentWidth / 592.28 * 841.89;
+ var pageHeight = contentWidth / pw * ph;
//鏈敓鎴恜df鐨刪tml椤甸潰楂樺害
var leftHeight = contentHeight;
//椤甸潰鍋忕Щ
var position = 0;
//a4绾哥殑灏哄[595.28,841.89]锛宧tml椤甸潰鐢熸垚鐨刢anvas鍦╬df涓浘鐗囩殑瀹介珮
- var imgWidth = 565.28;//595.28//宸﹀彸杈硅窛20
- var imgHeight = 605.28/contentWidth * contentHeight;//宸﹀彸杈硅窛20
-
+ var imgWidth = pw - 2 * marginw;//595.28//宸﹀彸杈硅窛20
+ var imgHeight = imgWidth / contentWidth * contentHeight;//宸﹀彸杈硅窛20
+
var pageData = canvas.toDataURL('image/jpeg', 1.0);
-
- var pdf = new jsPDF('', 'pt', 'a4');
-
+
+
+ if (i) {
+ pdf.addPage();
+ }
//鏈変袱涓珮搴﹂渶瑕佸尯鍒嗭紝涓�涓槸html椤甸潰鐨勫疄闄呴珮搴︼紝鍜岀敓鎴恜df鐨勯〉闈㈤珮搴�(841.89)
//褰撳唴瀹规湭瓒呰繃pdf涓�椤垫樉绀虹殑鑼冨洿锛屾棤闇�鍒嗛〉
if (leftHeight < pageHeight) {
- pdf.addImage(pageData, 'JPEG', 15, 0, imgWidth, imgHeight );//宸﹀彸杈硅窛7.5
+ pdf.addImage(pageData, 'JPEG', marginw, 0, imgWidth, imgHeight);//宸﹀彸杈硅窛20
} else {
- while(leftHeight > 0) {
- pdf.addImage(pageData, 'JPEG', 15, position, imgWidth, imgHeight)//宸﹀彸杈硅窛7.5
+ while (leftHeight > 0) {
+
+
+ canvas_current_page_num++;
+ pdf.addImage(pageData, 'JPEG', marginw, position, imgWidth, imgHeight)//宸﹀彸杈硅窛20
leftHeight -= pageHeight;
- position -= 841.89;
+ position -= ph;
+
+ if (canvas_max_page_num > 0 && canvas_current_page_num >= canvas_max_page_num) {
+ break;
+ }
+
//閬垮厤娣诲姞绌虹櫧椤�
- if(leftHeight > 0) {
+ if (leftHeight > 0) {
pdf.addPage();
}
}
}
- Fun(pdf);
+
+ recursion(i + 1);
}
})
- }
- var staticResourceFile = JSON.parse('{!staticResourceFile}');
- function Fun(pdf){
- var form = jQuery("<form method='post'></form>");
- jQuery(document.body).append(form);
- let href = window.location.href
- let arr = href.split('/')
- form.attr({"action":staticResourceFile.viewUnifiedContactUrl+"?from="+encodeURIComponent(href)+"&fileName="+encodeURIComponent(arr[arr.length-1].split('?')[0])});
- // 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>
+ };
+ recursion(rei);
+
+
+
+ }
+ var staticResourceFile = JSON.parse('{!staticResourceFile}');
+ function Fun(pdf) {
+
+ var form = jQuery("<form method='post'></form>");
+ jQuery(document.body).append(form);
+ let href = window.location.href
+ let arr = href.split('/')
+ form.attr({ "action": staticResourceFile.viewUnifiedContactUrl + "?from=" + encodeURIComponent(href) + "&fileName=" + encodeURIComponent(arr[arr.length - 1].split('?')[0]) });
+ // 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();
+
+ // jQuery("body > *").each(function(){
+ // jQuery(this).css('display','none');
+ // })
+ // jQuery("body").append('<embed style="position:absolute; left: 0; top: 0;" width="100%" height="100%" src="'+pdf.output('datauristring')+'" type="application/pdf"/>')
+
+ }
+ </script>
+
</html>
</apex:page>
\ No newline at end of file
--
Gitblit v1.9.1