From 5c01ebbfddb6b8674430b47c22977bea2e350084 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期三, 13 四月 2022 10:58:46 +0800
Subject: [PATCH] BackupPIPLFunction0413
---
force-app/main/default/pages/NewAndEditContact.page | 1
force-app/main/default/classes/PIHelper.cls | 13
force-app/main/default/classes/QISPDFControllerTest.cls | 5
force-app/main/default/classes/NewAndEditLeadController.cls | 5
force-app/main/default/pages/InsReportPDF.page | 30
force-app/main/default/classes/NewRepairController.cls | 114 +++
force-app/main/default/pages/NewRepair.page | 2
force-app/main/default/pages/XinDailyReport.page | 37 +
force-app/main/default/classes/NewAndEditCaseController.cls | 33
force-app/main/default/pages/SearchVisitor.page | 20
force-app/main/default/classes/NewRepairControllerTest.cls | 20
force-app/main/default/classes/NFM612Rest.cls | 5
force-app/main/default/classes/StartTradingController.cls | 5
force-app/main/default/classes/QISPDFController.cls | 74 ++
force-app/main/default/pages/NewAndEditAgencyContact.page | 18
force-app/main/default/pages/FixtureRentalPDF.page | 756 ++++++++++++++---------
force-app/main/default/pages/NewAndEditQIS.page | 1
force-app/main/default/pages/NewAndEditCase.page | 27
force-app/main/default/pages/NewRentalApply.page | 1
force-app/main/default/classes/LayoutDescriberHelper.cls | 2
force-app/main/default/classes/LightningUtil.cls | 91 ++
force-app/main/default/classes/XinDailyReportController.cls | 6
force-app/main/default/pages/NewOnCall.page | 1
force-app/main/default/aura/AgencyAccount/AgencyAccount.cmp | 3
force-app/main/default/pages/NewConsumApply.page | 1
force-app/main/default/pages/StraightBackAddress.page | 89 ++
force-app/main/default/pages/NewAndEditASEActivity.page | 1
force-app/main/default/pages/NewAndEditInspectionReport.page | 15
force-app/main/default/classes/NewAndEditQISController.cls | 6
force-app/main/default/pages/NewAndEditReport.page | 5
force-app/main/default/classes/StraightBackAddressController.cls | 54 +
force-app/main/default/aura/NewAgencyContact/NewAgencyContact.cmp | 4
force-app/main/default/aura/NewAgencyContact/NewAgencyContactController.js | 22
force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page | 89 +-
force-app/main/default/classes/NFM606Controller.cls | 6
force-app/main/default/pages/OFSInsReportLayout.page | 2
force-app/main/default/pages/NewAndEditInquiryForm.page | 33
force-app/main/default/pages/NewAndEditAddress.page | 1
force-app/main/default/pages/NewAndEditLead.page | 40
force-app/main/default/pages/NewAndEditTenderinformation.page | 1
force-app/main/default/pages/QISPDF.page | 212 ++++--
force-app/main/default/classes/StraightBackAddressControllerTest.cls | 26
force-app/main/default/classes/NewConsumApplyEquipSetDetailController.cls | 21
43 files changed, 1,313 insertions(+), 585 deletions(-)
diff --git a/force-app/main/default/aura/AgencyAccount/AgencyAccount.cmp b/force-app/main/default/aura/AgencyAccount/AgencyAccount.cmp
index 6f7d3c8..486b5df 100644
--- a/force-app/main/default/aura/AgencyAccount/AgencyAccount.cmp
+++ b/force-app/main/default/aura/AgencyAccount/AgencyAccount.cmp
@@ -77,8 +77,7 @@
<div class="slds-truncate">
<a href="{!'/partner/s/agency-contact/' + item.Id}" style="position: relative;">
- <span class="encrypt">{!item.Name}</span>
- <span class="decrypt">{!item.awsdata.name}</span>
+ {!item.Name}
</a>
</div>
</th>
diff --git a/force-app/main/default/aura/NewAgencyContact/NewAgencyContact.cmp b/force-app/main/default/aura/NewAgencyContact/NewAgencyContact.cmp
index d7c9ded..e8a6bcb 100644
--- a/force-app/main/default/aura/NewAgencyContact/NewAgencyContact.cmp
+++ b/force-app/main/default/aura/NewAgencyContact/NewAgencyContact.cmp
@@ -2,6 +2,7 @@
controller="NewAgencyContactController">
<aura:attribute name = "recordId" type = "Id" default = ""/>
+ <aura:attribute name="title" type="string"/>
<aura:handler name="init" value="{!this}" action="{!c.doInit}" />
<aura:attribute name="layout" type="LayoutDescriberHelper.LayoutWrapper"/>
<aura:attribute name="record_data" type="Map"/>
@@ -9,6 +10,7 @@
<aura:attribute name="showSpinner" type="Boolean" default = "False"/>
<aura:attribute name="staticResource" type="Map"/>
<aura:attribute name="pi_fields_map" type="Map"/>
+ <aura:attribute name="isClone" type="Boolean" default = "False"/>
<ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
<ltng:require scripts="{! $Resource.jquery183minjs }" />
@@ -16,7 +18,7 @@
<!-- header -->
<header class="slds-modal__header">
<h2 id="modal-heading-01" class="slds-modal__title slds-hyphenate">
- Create Agency Contact
+ {!v.title}
</h2>
</header>
diff --git a/force-app/main/default/aura/NewAgencyContact/NewAgencyContactController.js b/force-app/main/default/aura/NewAgencyContact/NewAgencyContactController.js
index 2a57fe3..49f4c47 100644
--- a/force-app/main/default/aura/NewAgencyContact/NewAgencyContactController.js
+++ b/force-app/main/default/aura/NewAgencyContact/NewAgencyContactController.js
@@ -5,13 +5,24 @@
if(!rid){
pid = window.location.href.replace("https://","").split("/")[4];
}
+ let isClone = component.get('v.isClone');
+ if(!rid || isClone){
+ component.set('v.title',$A.get("$Label.c.New")+'.瀹㈡埛浜哄憳');
+ }else{
+ component.set('v.title',$A.get("$Label.c.Edit")+'.瀹㈡埛浜哄憳');
+ }
+ let record_type_id = null;
+ let pageref = component.get("v.pageReference")
+ if(!record_type_id && pageref){
+ record_type_id = pageref.state.recordTypeId
+ }
component.set("v.showSpinner", true);
helper.CallBackAction(component,'Init',{
rid : rid,
pid : pid,
//rid : component.get('v.recordId'),
- record_type_id : component.get("v.pageReference").state.recordTypeId,
+ record_type_id : record_type_id,
},function(data){
component.set("v.showSpinner", false);
@@ -106,9 +117,12 @@
let staticResource = component.get('v.staticResource');
let record_id = component.get('v.recordId');
+ let record_type_id = component.get('v.recordTypeId');
+
+ let isClone = component.get('v.isClone');
let url = staticResource.newUrl;
let payloadPi = {};
- if (record_id) {
+ if (record_id && !isClone) {
url = staticResource.updateUrl
payloadPi['dataId'] = component.get('v.record_data').AWS_Data_Id__c;
}
@@ -143,7 +157,7 @@
let obj = result.object[0];
let data = {};
- if(record_id){
+ if(record_id && !isClone){
data.Id = record_id;
}else{
data.AWS_Data_Id__c = obj.dataId;
@@ -190,7 +204,7 @@
"type" : "success"
});
- if (record_id){
+ if (record_id && !isClone){
$A.get("e.force:closeQuickAction").fire();
$A.get('e.force:refreshView').fire();
diff --git a/force-app/main/default/classes/LayoutDescriberHelper.cls b/force-app/main/default/classes/LayoutDescriberHelper.cls
index af6df40..ec17bad 100644
--- a/force-app/main/default/classes/LayoutDescriberHelper.cls
+++ b/force-app/main/default/classes/LayoutDescriberHelper.cls
@@ -100,7 +100,7 @@
/*Map<String, object> nameDetails = (Map<String,object>) layoutComponents.get('Name');*/
String fieldLabel = (String) fields.get('label');
boolean placeholderF = (boolean) fields.get('placeholder');
- boolean isEditable = (boolean) fields.get('editableForNew'); // Check the editable prop
+ boolean isEditable = (boolean) fields.get('editableForUpdate')||(boolean)fields.get('editableForNew'); // Check the editable prop
if( (apiName != '' && fieldType =='Field') || (placeholderF)){
if(userMode == 'classic' && fieldTypeDetail == 'address'){
String fieldLabelPrefix = fieldLabel.split(' ')[0] == 'Address'?'':fieldLabel.split(' ')[0];
diff --git a/force-app/main/default/classes/LightningUtil.cls b/force-app/main/default/classes/LightningUtil.cls
index bc7e76a..85425e2 100644
--- a/force-app/main/default/classes/LightningUtil.cls
+++ b/force-app/main/default/classes/LightningUtil.cls
@@ -2,6 +2,12 @@
public LightningUtil() {
}
+ // 绮剧悽绉戞妧 zxk 鏌ヨ鐢ㄦ埛鐨勭敤鎴蜂骇鍝佸尯鍒嗗瓧娈� start
+ public static User loginUserId(){
+ system.debug('UserInfo.getUserId()================>'+UserInfo.getUserId());
+ return [select UserPro_Type__c from User where id =: UserInfo.getUserId()];
+ }
+ // 绮剧悽绉戞妧 zxk 鏌ヨ鐢ㄦ埛鐨勭敤鎴蜂骇鍝佸尯鍒嗗瓧娈� end
public static List<Agency_Contact__c> selectOCMAgencyContact(Set<String> hospitalSet, Set<String> ahospitalSet) {
return [select Id, Agency_Hospital__c, IsOlympusContact__c, Name, Doctor_Division1__c, Type__c, Hospital_DC_Name__c,Department_Cateogy_F__c,Hospital_Name__c,
AWS_Data_Id__c // 20220222 PI鏀归�� by Bright
@@ -153,41 +159,86 @@
public static void upsertAgencyOpportunity(List<Agency_Opportunity__c> upsertList) {
upsert upsertList Agency_Opportunity__c.TargetInputKey__c;
}
-
+ //缁忛攢鍟嗙郴缁�
public static List<Agency_Report__c> selectAgencyReport(Date week, String person_str) {
if (String.isBlank(person_str)) {
List<Contact> person_list = selectAgencyPerson();
- return [Select Id, Name, Report_Date__c, Product_Category1__r.Name, Product_Category2__r.Name, Product_Category3__r.Name, Product_Category1__c, Product_Category2__c, Product_Category3__c, Department_Cateogy__c, Purpose_Type__c, Agency_Report_Header__c, Agency_Hospital__r.Name, Agency_Hospital__r.Hospital__c, OppName__c,
- Person_In_Charge2__c, Person_In_Charge2__r.Name, doctor2__c, doctor2__r.Name, Submit_date__c,
+ return [Select Id, Name, Report_Date__c, Product_Category1__r.Name, Product_Category2__r.Name, Product_Category3__r.Name, Product_Category1__c, Product_Category2__c, Product_Category3__c,ConsumptionOfConsumables__c, WorkMark__c,warlocksNumber__c,Department_Cateogy__c,ProductClassification__c,WarlockClassification__c,ProductCcategory__c, productCategories__c,DealerPersonnel__c,WorkRecord__c,Purpose_Type__c,SupportNeeds__c, Agency_Report_Header__c, Agency_Hospital__r.Name, Agency_Hospital__r.Hospital__c, OppName__c,
+ Person_In_Charge2__c,DealerPersonnel__r.Name, Person_In_Charge2__r.Name, doctor2__c, doctor2__r.Name, Submit_date__c,
doctor2__r.AWS_Data_Id__c,Person_In_Charge2__r.AWS_Data_Id__c,// 20220222 PI鏀归�� by Bright
- Product_Category__c, Product_Category__r.Name, Result__c, visitor_title__c, Opportunity__c, Opportunity__r.Name
+ Product_Category__c, Product_Category__r.Name, Result__c, visitor_title__c, Opportunity__c, Opportunity__r.Name,EffectProgress__c,
+ UseProduct1__c,UseProduct2__c,UseProduct3__c,UseProduct1__r.Name,UseProduct2__r.Name,UseProduct3__r.Name
From Agency_Report__c
- where Submit_date__c=:week and Person_In_Charge2__c in :person_list order by LastModifiedDate desc];
+ where Submit_date__c=:week and Person_In_Charge2__c in :person_list and WeeklyReportClassification__c = '' order by LastModifiedDate desc];
} else {
- return [Select Id, Name, Report_Date__c, Product_Category1__r.Name, Product_Category2__r.Name, Product_Category3__r.Name, Product_Category1__c, Product_Category2__c, Product_Category3__c, Department_Cateogy__c, Purpose_Type__c, Agency_Report_Header__c, Agency_Hospital__r.Name, Agency_Hospital__r.Hospital__c, OppName__c,
- Person_In_Charge2__c, Person_In_Charge2__r.Name, doctor2__c, doctor2__r.Name, Submit_date__c,
+ return [Select Id, Name, Report_Date__c, Product_Category1__r.Name, Product_Category2__r.Name, Product_Category3__r.Name, Product_Category1__c, Product_Category2__c, Product_Category3__c,ConsumptionOfConsumables__c, WorkMark__c,warlocksNumber__c,Department_Cateogy__c,DealerPersonnel__c,ProductClassification__c,WarlockClassification__c,ProductCcategory__c,productCategories__c,WorkRecord__c,Purpose_Type__c,SupportNeeds__c, Agency_Report_Header__c, Agency_Hospital__r.Name, Agency_Hospital__r.Hospital__c, OppName__c,
+ Person_In_Charge2__c,DealerPersonnel__r.Name, Person_In_Charge2__r.Name, doctor2__c, doctor2__r.Name, Submit_date__c,
doctor2__r.AWS_Data_Id__c,Person_In_Charge2__r.AWS_Data_Id__c,// 20220222 PI鏀归�� by Bright
- Product_Category__c, Product_Category__r.Name, Result__c, visitor_title__c, Opportunity__c, Opportunity__r.Name
+ Product_Category__c, Product_Category__r.Name, Result__c, visitor_title__c, Opportunity__c, Opportunity__r.Name,EffectProgress__c,
+ UseProduct1__c,UseProduct2__c,UseProduct3__c,UseProduct1__r.Name,UseProduct2__r.Name,UseProduct3__r.Name
From Agency_Report__c
- where Submit_date__c=:week and Person_In_Charge2__c=:person_str order by LastModifiedDate desc];
+ where Submit_date__c=:week and Person_In_Charge2__c=:person_str and WeeklyReportClassification__c = '' order by LastModifiedDate desc];
}
}
-
- public static List<Agency_Report__c> selectMAgencyReport(Date date1, Date date2 ,List<Contact> conMList) {
- List<Agency_Report__c> reportlist = [Select Id, Name, Report_Date__c, Product_Category1__r.Name, Product_Category2__r.Name, Product_Category3__r.Name, Product_Category1__c, Product_Category2__c, Product_Category3__c, Department_Cateogy__c, Purpose_Type__c, Agency_Report_Header__c, Agency_Hospital__r.Name, Agency_Hospital__r.Hospital__c, OppName__c,
- Person_In_Charge2__c, Person_In_Charge2__r.Name, doctor2__c, doctor2__r.Name, Submit_date__c,
+ //杩芥函绯荤粺
+ public static List<Agency_Report__c> selectAgencyReport01(Date week, String person_str) {
+ system.debug('person_strperson_str=================>'+person_str);
+ if (String.isBlank(person_str)) {
+ List<Contact> person_list = selectAgencyPerson01();
+ return [Select Id, Name, Report_Date__c, Product_Category1__r.Name, Product_Category2__r.Name, Product_Category3__r.Name, Product_Category1__c, Product_Category2__c, Product_Category3__c,ConsumptionOfConsumables__c, WorkMark__c,warlocksNumber__c,Department_Cateogy__c,ProductClassification__c,WarlockClassification__c,ProductCcategory__c,productCategories__c, DealerPersonnel__c,WorkRecord__c, Agency_Report_Header__c, Agency_Hospital__r.Name, Agency_Hospital__r.Hospital__c, OppName__c,
+ Person_In_Charge2__c,DealerPersonnel__r.Name, Person_In_Charge2__r.Name, doctor2__c, doctor2__r.Name, Submit_date__c,
+ Product_Category__c, Product_Category__r.Name, Result__c, visitor_title__c, Opportunity__c, Opportunity__r.Name,EffectProgress__c,
doctor2__r.AWS_Data_Id__c,// 20220222 PI鏀归�� by Bright
- Product_Category__c, Product_Category__r.Name, Result__c, visitor_title__c, Opportunity__c, Opportunity__r.Name
+ UseProduct1__c,UseProduct2__c,UseProduct3__c,UseProduct1__r.Name,UseProduct2__r.Name,UseProduct3__r.Name
From Agency_Report__c
- where Person_In_Charge2__c in :conMList and Report_Date__c >= :date1 and Report_Date__c <= :date2 ];
+ where Submit_date__c=:week and Person_In_Charge2__c in :person_list and WeeklyReportClassification__c != '' order by LastModifiedDate desc];
+ } else {
+ return [Select Id, Name, Report_Date__c, Product_Category1__r.Name, Product_Category2__r.Name, Product_Category3__r.Name, Product_Category1__c, Product_Category2__c, Product_Category3__c,ConsumptionOfConsumables__c, WorkMark__c,warlocksNumber__c,Department_Cateogy__c,DealerPersonnel__c,ProductClassification__c,WarlockClassification__c,ProductCcategory__c,productCategories__c, WorkRecord__c, Agency_Report_Header__c, Agency_Hospital__r.Name, Agency_Hospital__r.Hospital__c, OppName__c,
+ Person_In_Charge2__c,DealerPersonnel__r.Name, Person_In_Charge2__r.Name, doctor2__c, doctor2__r.Name, Submit_date__c,
+ doctor2__r.AWS_Data_Id__c,// 20220222 PI鏀归�� by Bright
+ Product_Category__c, Product_Category__r.Name, Result__c, visitor_title__c, Opportunity__c, Opportunity__r.Name,EffectProgress__c,
+ UseProduct1__c,UseProduct2__c,UseProduct3__c,UseProduct1__r.Name,UseProduct2__r.Name,UseProduct3__r.Name
+ From Agency_Report__c
+ where Submit_date__c=:week and Person_In_Charge2__c=:person_str and WeeklyReportClassification__c != '' order by LastModifiedDate desc];
+ }
+ }
+ //缁忛攢鍟嗙郴缁�
+ public static List<Agency_Report__c> selectMAgencyReport(Date date1, Date date2 ,List<Contact> conMList) {
+ List<Agency_Report__c> reportlist = [Select Id, Name, Report_Date__c, Product_Category1__r.Name, Product_Category2__r.Name, Product_Category3__r.Name, Product_Category1__c, Product_Category2__c, Product_Category3__c,ConsumptionOfConsumables__c,warlocksNumber__c,WorkMark__c,Department_Cateogy__c, DealerPersonnel__c,WorkRecord__c, ProductClassification__c,WarlockClassification__c,ProductCcategory__c,productCategories__c,Purpose_Type__c, Agency_Report_Header__c, Agency_Hospital__r.Name, Agency_Hospital__r.Hospital__c, OppName__c,
+ Person_In_Charge2__c,DealerPersonnel__r.Name,Person_In_Charge2__r.Name, doctor2__c, doctor2__r.Name, Submit_date__c,//鏀彺闇�姹係upportNeeds__c
+ doctor2__r.AWS_Data_Id__c,// 20220222 PI鏀归�� by Bright
+ Product_Category__c, Product_Category__r.Name, Result__c, visitor_title__c, Opportunity__c, Opportunity__r.Name,EffectProgress__c,SupportNeeds__c,
+ UseProduct1__c,UseProduct2__c,UseProduct3__c,UseProduct1__r.Name,UseProduct2__r.Name,UseProduct3__r.Name
+ From Agency_Report__c
+ where Person_In_Charge2__c in :conMList and Report_Date__c >= :date1 and Report_Date__c <= :date2 and WeeklyReportClassification__c = '' ];
return reportlist;
}
-
- public static List<Agency_Report__c> selectAgencyReportById(String report_id) {
- return [Select Id, Name, Department_Cateogy__c, Purpose_Type__c, Agency_Report_Header__c, Agency_Hospital__r.Name, Agency_Hospital__r.Hospital__c, OppName__c,
- Person_In_Charge2__c, Person_In_Charge2__r.Name, doctor2__c, doctor2__r.Name, Submit_date__c,
+ //杩芥函绯荤粺
+ public static List<Agency_Report__c> selectMAgencyReport01(Date date1, Date date2 ,List<Contact> conMList) {
+ List<Agency_Report__c> reportlist = [Select Id, Name, Report_Date__c, Product_Category1__r.Name, Product_Category2__r.Name, Product_Category3__r.Name, Product_Category1__c, Product_Category2__c, Product_Category3__c,ConsumptionOfConsumables__c,warlocksNumber__c,WorkMark__c,Department_Cateogy__c, DealerPersonnel__c,WorkRecord__c, ProductClassification__c,WarlockClassification__c,ProductCcategory__c,productCategories__c,Agency_Report_Header__c, Agency_Hospital__r.Name, Agency_Hospital__r.Hospital__c, OppName__c,
+ Person_In_Charge2__c,DealerPersonnel__r.Name,Person_In_Charge2__r.Name, doctor2__c, doctor2__r.Name, Submit_date__c,
doctor2__r.AWS_Data_Id__c,// 20220222 PI鏀归�� by Bright
- Product_Category__c, Product_Category__r.Name, Result__c, visitor_title__c, Opportunity__c, Opportunity__r.Name
+ Product_Category__c, Product_Category__r.Name, Result__c, visitor_title__c, Opportunity__c, Opportunity__r.Name,EffectProgress__c,
+ UseProduct1__c,UseProduct2__c,UseProduct3__c,UseProduct1__r.Name,UseProduct2__r.Name,UseProduct3__r.Name
+ From Agency_Report__c
+ where Person_In_Charge2__c in :conMList and Report_Date__c >= :date1 and Report_Date__c <= :date2 and WeeklyReportClassification__c != '' ];
+ return reportlist;
+ }
+ //缁忛攢鍟嗙郴缁熺殑
+ public static List<Agency_Report__c> selectAgencyReportById(String report_id) {
+ return [Select Id, Name, Department_Cateogy__c,Purpose_Type__c, ConsumptionOfConsumables__c,warlocksNumber__c,WorkMark__c,WorkRecord__c,EffectProgress__c,ProductClassification__c,ProductCcategory__c,productCategories__c, Agency_Report_Header__c, Agency_Hospital__r.Name, Agency_Hospital__r.Hospital__c, OppName__c,
+ Person_In_Charge2__c,DealerPersonnel__c,DealerPersonnel__r.Name, Person_In_Charge2__r.Name, doctor2__c, doctor2__r.Name, Submit_date__c,
+ doctor2__r.AWS_Data_Id__c,// 20220222 PI鏀归�� by Bright
+ Product_Category__c, Product_Category__r.Name, Result__c, visitor_title__c , Opportunity__c, Opportunity__r.Name
+ From Agency_Report__c
+ where id=:report_id ];
+ }
+ //杩芥函绯荤粺鐨�
+ public static List<Agency_Report__c> selectAgencyReportById01(String report_id) {
+ return [Select Id, Name, Department_Cateogy__c, ConsumptionOfConsumables__c,warlocksNumber__c,WorkMark__c,WorkRecord__c,EffectProgress__c,ProductClassification__c,ProductCcategory__c,productCategories__c, Agency_Report_Header__c, Agency_Hospital__r.Name, Agency_Hospital__r.Hospital__c, OppName__c,
+ Person_In_Charge2__c,DealerPersonnel__c,DealerPersonnel__r.Name, Person_In_Charge2__r.Name, doctor2__c, doctor2__r.Name, Submit_date__c,
+ doctor2__r.AWS_Data_Id__c,// 20220222 PI鏀归�� by Bright
+ Product_Category__c, Product_Category__r.Name, Result__c, visitor_title__c
From Agency_Report__c
where id=:report_id];
}
diff --git a/force-app/main/default/classes/NFM606Controller.cls b/force-app/main/default/classes/NFM606Controller.cls
index 9b2dd95..28d07d6 100644
--- a/force-app/main/default/classes/NFM606Controller.cls
+++ b/force-app/main/default/classes/NFM606Controller.cls
@@ -163,7 +163,7 @@
me.NumberOfRecord = '' + gds.GeData.size();
gds.Monitoring = me;
-
+
logstr = iflog.Log__c + '\nNumberOfRecord=' + gds.GeData.size() + ' ';
NFMUtil.Monitoring Monitoring = new NFMUtil.Monitoring();
Monitoring.Tag = gds.Monitoring.Tag;
@@ -196,9 +196,9 @@
if (rowData != null) {
upsert rowData;
}
- iflog.Log__c = iflog.Log__c + logstr;
+ iflog.Log__c = logstr;
+ system.debug('======================================'+logstr);
upsert iflog;
-
}
private static GeData getStateAndCity(GeData ged,Contact con){
diff --git a/force-app/main/default/classes/NFM612Rest.cls b/force-app/main/default/classes/NFM612Rest.cls
index 66bbc67..9918df4 100644
--- a/force-app/main/default/classes/NFM612Rest.cls
+++ b/force-app/main/default/classes/NFM612Rest.cls
@@ -255,9 +255,10 @@
repair.ProcessResult__c = ged.applyRepairInfo.processResult; //澶勭悊缁撴灉
// 2022/4/6 zhangyuheng update start
- repair.RepairFinishDate__c = NFMUtil.parseStr2Date(ged.repairOderInfo.RepairFinishDate) ; //淇悊鍝佸鐞嗗畬鎴愭棩
+ repair.RepairFinishDate__c = NFMUtil.parseDateTimeStr2Date(ged.repairOderInfo.RepairFinishDate) ; //淇悊鍝佸鐞嗗畬鎴愭棩
repair.ApplicanterPhone__c = ged.repairOderInfo.ApplicanterPhone; //澶勭悊浜虹數璇�
- repair.CancelleRepairTime__c = NFMUtil.parseStr2Date(ged.repairOderInfo.CancelDate); //鍙楃悊浜哄彇娑堟姤淇棩
+ repair.CancelleRepairTime__c = NFMUtil.parseDateTimeStr2Date(ged.repairOderInfo.CancelDate); //鍙楃悊浜哄彇娑堟姤淇棩
+ // repair.CancelleRepairTime__c = NFMUtil.parseStr2Date(ged.repairOderInfo.CancelDate); //鍙楃悊浜哄彇娑堟姤淇棩
repair.RepairCancelReason__c = ged.repairOderInfo.cancelReportReason; //淇悊鍙栨秷鍘熷洜
// 2022/4/6 zhangyuheng update end
diff --git a/force-app/main/default/classes/NewAndEditCaseController.cls b/force-app/main/default/classes/NewAndEditCaseController.cls
index 4db40d0..dd6c070 100644
--- a/force-app/main/default/classes/NewAndEditCaseController.cls
+++ b/force-app/main/default/classes/NewAndEditCaseController.cls
@@ -13,6 +13,7 @@
public static Map<String, Schema.SObjectType> schemaMap = Schema.getGlobalDescribe();
public static String sobjectTypeValue = 'Case';
public Boolean isNewMode{set;get;}
+ public Boolean isCloneMode{protected set;get;}
public String rtTypeId {get; set;}
public String AWSDataId{set;get;}
public String contactId{set;get;}//For Lookup field
@@ -33,6 +34,7 @@
public string AWSToSobjectEncryptedMapJson{get{return JSON.serialize(AWSToSobjectEncryptedMap);}}
public NewAndEditCaseController(ApexPages.StandardController controller) {
isNewMode = true;
+ isCloneMode = false;
Input_Required_Field_Msg = Label.Input_Required_Field_Msg;
PIPL_Name_Label = Label.PIPL_Name_Label;
PIPL_Input_Account_Error_Msg = label.PIPL_Input_Account_Error_Msg;
@@ -40,6 +42,10 @@
//鑾峰彇鎵�鏈夊瓧娈�
List<String> fieldList = new List<String>(Schema.getGlobalDescribe().get('Case').getDescribe().fields.getMap().keyset());
// Add fields to controller. This is to avoid the SOQL error in visualforce page
+ Map<string,string> mso = ApexPages.currentPage().getParameters();
+ if(mso != null && mso.containsKey('newclone')){
+ isCloneMode = true;
+ }
if (!Test.isRunningTest()) {
controller.addFields(fieldList);
}
@@ -60,7 +66,8 @@
contactsInfo = JSON.serialize(sfIdToAWSIdMap);
}else{
//鏂板缓
- rtTypeId = ApexPages.currentPage().getParameters().get('RecordType');
+ // rtTypeId = ApexPages.currentPage().getParameters().get('RecordType');
+ rtTypeId = mso.get('RecordType');
obj.put('OwnerId',UserInfo.getUserId());
}
LayoutDescriberHelper.LayoutWrapper LayoutWrapperValue = LayoutDescriberHelper.describeSectionWithFieldsWrapper(rtTypeId, 'Case','classic');
@@ -127,10 +134,13 @@
}
}
+ System.debug('caseInfo='+caseInfo);
System.debug('caseInfo.Account__c='+caseInfo.Account__c);
if (!String.isBlank(caseInfo.ContactId) && (String.isBlank(caseInfo.Account__c) || Id.valueOf(caseInfo.Account__c).to15() =='000000000000000')) {
- Contact c = [select id,AccountId from Contact where id = :caseInfo.ContactId];
- caseInfo.Account__c = c.AccountId;
+ if (Id.valueOf(caseInfo.ContactId).to15() !='000000000000000') {
+ Contact c = [select id,AccountId from Contact where id = :caseInfo.ContactId];
+ caseInfo.Account__c = c.AccountId;
+ }
}
//2. Save Record Process
@@ -138,18 +148,27 @@
Response resp = new Response();
Savepoint sp = Database.setSavepoint();
String rid = '';
+ String awsDataId = '';
+ Boolean isClone = false;
try{
System.debug('abcde');
- if(isNew){
+ awsDataId = (String)caseInfo.get('AWS_Data_Id__c');
+ System.debug('awsDataId = ' + awsDataId);
+ Case[] cases = [select id from Case where AWS_Data_Id__c =:awsDataId];
+
+ if(!isNew){
+ isClone = cases.size() == 0;
+ }
+ if(isNew || isClone){
System.debug('caseInfozhj = ' + caseInfo);
if(!Test.isRunningTest()){
insert caseInfo;
}
}else{
System.debug('into update');
- String awsDataId = (String)caseInfo.get('AWS_Data_Id__c');
- System.debug('awsDataId = ' + awsDataId);
- Case[] cases = [select id from Case where AWS_Data_Id__c =:awsDataId];
+ // String awsDataId = (String)caseInfo.get('AWS_Data_Id__c');
+ // System.debug('awsDataId = ' + awsDataId);
+ // Case[] cases = [select id from Case where AWS_Data_Id__c =:awsDataId];
System.debug('cases ========================= ' + cases);
System.debug('Cases[0].id = ' + cases[0].id);
caseInfo.put('Id',cases[0].id);//For testing;
diff --git a/force-app/main/default/classes/NewAndEditLeadController.cls b/force-app/main/default/classes/NewAndEditLeadController.cls
index 6ff38fd..b75e931 100644
--- a/force-app/main/default/classes/NewAndEditLeadController.cls
+++ b/force-app/main/default/classes/NewAndEditLeadController.cls
@@ -134,6 +134,11 @@
// if(mso.containsKey('CF00N10000006qNtt_lkid ')){
// controller.getRecord().put('Department_Class__c',mso.get('CF00N10000006qNtt_lkid '));
// }
+ // 2022-04-13 鏉ユ簮 jz start
+ if (mso.containsKey('LeadSource')) {
+ controller.getRecord().put('LeadSource', mso.get('LeadSource'));
+ }
+ // 2022-04-13 鏉ユ簮 jz end
rtTypeId = ApexPages.currentPage().getParameters().get('RecordType');
obj.put('OwnerId',UserInfo.getUserId());
}
diff --git a/force-app/main/default/classes/NewAndEditQISController.cls b/force-app/main/default/classes/NewAndEditQISController.cls
index 3ec4469..e9cdf36 100644
--- a/force-app/main/default/classes/NewAndEditQISController.cls
+++ b/force-app/main/default/classes/NewAndEditQISController.cls
@@ -1,5 +1,6 @@
global with sharing class NewAndEditQISController extends NewAndEditBaseController{
public String Input_Required_Field_Msg{set;get;}
+ public String qisId{set;get;}
public NewAndEditQISController(ApexPages.StandardController controller) {
Input_Required_Field_Msg = Label.Input_Required_Field_Msg;
List<String> fieldList = new List<String>(Schema.getGlobalDescribe().get('QIS_Report__c').getDescribe().fields.getMap().keyset());
@@ -12,13 +13,16 @@
//Updated by Chen Yanan 20220323 Start
String contactId = controller.getRecord().Id;
+ Map<string,string> mso = ApexPages.currentPage().getParameters();
if(contactId == null){
- Map<string,string> mso = ApexPages.currentPage().getParameters();
system.debug('mso='+mso);
if(mso.containsKey('CF00N10000002FHFK_lkid')){
controller.getRecord().put('Name', '*');
}
}
+ if(mso.containsKey('CF00N100000073PA0_lkid')){
+ controller.getRecord().put('QIS_pre__c',mso.get('CF00N100000073PA0_lkid'));
+ }
system.debug('controller.getRecord()='+controller.getRecord());
//Updated by Chen Yanan 20220323 End
}
diff --git a/force-app/main/default/classes/NewConsumApplyEquipSetDetailController.cls b/force-app/main/default/classes/NewConsumApplyEquipSetDetailController.cls
index 17cc810..52bbc36 100644
--- a/force-app/main/default/classes/NewConsumApplyEquipSetDetailController.cls
+++ b/force-app/main/default/classes/NewConsumApplyEquipSetDetailController.cls
@@ -11,6 +11,7 @@
public String awsToken{set;get;}
public static Map<String, Schema.SObjectType> schemaMap = Schema.getGlobalDescribe();
public static String sobjectTypeValue = 'Consum_Apply_Equipment_Set_Detail__c';
+ public Boolean isCloneMode{protected set;get;}
public Boolean isNewMode{set;get;}
public String rtTypeId {get; set;}
public String AWSDataId{set;get;}
@@ -24,9 +25,14 @@
public String sobjectPrefix{set;get;}
public NewConsumApplyEquipSetDetailController(ApexPages.StandardController controller) {
isNewMode = true;
+ isCloneMode = false;
Input_Required_Field_Msg = Label.Input_Required_Field_Msg;
sobjecttypeForFrontEnd = sobjectTypeValue;
//鑾峰彇鎵�鏈夊瓧娈�
+ Map<string,string> mso = ApexPages.currentPage().getParameters();
+ if(mso != null && mso.containsKey('newclone')){
+ isCloneMode = true;
+ }
List<String> fieldList = new List<String>(Schema.getGlobalDescribe().get('Consum_Apply_Equipment_Set_Detail__c').getDescribe().fields.getMap().keyset());
if (!Test.isRunningTest()) {
controller.addFields(fieldList);
@@ -98,17 +104,26 @@
Response resp = new Response();
Savepoint sp = Database.setSavepoint();
String rid = '';
+ Boolean isClone = false;
+ String awsDataId = '';
try{
System.debug('abcde');
+ awsDataId = (String)consumApplyInfo.get('AWS_Data_Id__c');
+ System.debug('awsDataId = ' + awsDataId);
+ Consum_Apply_Equipment_Set_Detail__c[] ConsumApplys = [select id from Consum_Apply_Equipment_Set_Detail__c where AWS_Data_Id__c =:awsDataId];
+
+ if(!isNew || isClone){
+ isClone = ConsumApplys.size() == 0;
+ }
if(isNew){
System.debug('consumApplyInfozhj = ' + consumApplyInfo);
insert consumApplyInfo;
System.debug('consumApplyInfo.Id' + consumApplyInfo.Id);
}else{
System.debug('into update');
- String awsDataId = (String)consumApplyInfo.get('AWS_Data_Id__c');
- System.debug('awsDataId = ' + awsDataId);
- Consum_Apply_Equipment_Set_Detail__c[] ConsumApplys = [select id from Consum_Apply_Equipment_Set_Detail__c where AWS_Data_Id__c =:awsDataId];
+ // String awsDataId = (String)consumApplyInfo.get('AWS_Data_Id__c');
+ // System.debug('awsDataId = ' + awsDataId);
+ // Consum_Apply_Equipment_Set_Detail__c[] ConsumApplys = [select id from Consum_Apply_Equipment_Set_Detail__c where AWS_Data_Id__c =:awsDataId];
System.debug('ConsumApplys[0].id = ' + ConsumApplys[0].id);
consumApplyInfo.put('Id',ConsumApplys[0].id);//For testing;
update consumApplyInfo;
diff --git a/force-app/main/default/classes/NewRepairController.cls b/force-app/main/default/classes/NewRepairController.cls
index b246859..6e97867 100644
--- a/force-app/main/default/classes/NewRepairController.cls
+++ b/force-app/main/default/classes/NewRepairController.cls
@@ -190,18 +190,82 @@
if(mso.containsKey('00N10000008rsVuEAI')){
controller.getRecord().put('ProblemDescription__c',mso.get('00N10000008rsVuEAI'));
}
+ //濡傛灉鏄祴璇曠幆澧�
+ Boolean isTest = NFMUtil.isSandbox();
//鎶ヤ慨浜�00N1m0000054ufW
- if(mso.containsKey('00N1m0000054ufW')){
- controller.getRecord().put('RepairApplicant__c',mso.get('00N1m0000054ufW'));
+ String RepairApplicant = isTest==true?'00N1m0000054ufW':'00N10000009H1rQ';
+ if(mso.containsKey(RepairApplicant)){
+ controller.getRecord().put('RepairApplicant__c',mso.get(RepairApplicant));
}
//鎶ヤ慨浜哄尰闄�00N1m0000054ufU
- if(mso.containsKey('00N1m0000054ufU')){
- controller.getRecord().put('RepairApplicantHospital__c',mso.get('00N1m0000054ufU'));
+ String RepairApplicantHospital = isTest==true?'00N1m0000054ufU':'00N10000009H1rP';
+ if(mso.containsKey(RepairApplicantHospital)){
+ controller.getRecord().put('RepairApplicantHospital__c',mso.get(RepairApplicantHospital));
}
//鎶ヤ慨浜虹瀹�00N1m0000054ufT
- if(mso.containsKey('00N1m0000054ufT')){
- controller.getRecord().put('RepairApplicantDepartment__c',mso.get('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':'CF00N10000009H1rR_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;
+ }
+ }
+ //鎶ヤ慨鍙戣捣鏃�
+ 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
if(mso.containsKey('00N1m0000054ufE')){
controller.getRecord().put('DeliveryLogisticsMode__c',mso.get('00N1m0000054ufE'));
@@ -222,15 +286,7 @@
if(mso.containsKey('00N10000008rsVS')){
controller.getRecord().put('DelayReportReason__c',mso.get('00N10000008rsVS'));
}
- //鎶ヤ慨瀛愬崟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;
- }
- }
+
rtTypeId = ApexPages.currentPage().getParameters().get('RecordType');
if(String.isBlank(rtTypeId)||String.isEmpty(rtTypeId)){
List<RecordType> rtList = new List<RecordType>([select Id,DeveloperName from RecordType where SobjectType ='Repair__c' and DeveloperName ='Repair']);
@@ -264,9 +320,35 @@
@RemoteAction
global static Response EncryptUpdate(string rid){
+ system.debug('rid='+rid);
+ Response r = new Response();
+ 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 = '绗﹀悎鏉′欢鐨勬暟鎹湭鎵惧埌';
+ return r;
+ }
+ Repair__c rep = reps[0];
+ if(!rep.Encrypt_Update_Flag__c){
+ r.status = 'success';
+ r.message = '';
+ return r;
+ }
boolean b = AWSServiceTool2.EncryptPushData(new string[]{rid});
- Response r = new Response();
+ rep.Encrypt_Update_Flag__c = false;
+ if(!Test.isRunningTest()){
+ update rep;
+ }
r.status = b ? 'success' : 'failed';
r.message = b ? '' : '鍔犲瘑鎺ㄩ�佸け璐�';
r.recordId = rid;
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/PIHelper.cls b/force-app/main/default/classes/PIHelper.cls
index 8143c9b..f4bb2b0 100644
--- a/force-app/main/default/classes/PIHelper.cls
+++ b/force-app/main/default/classes/PIHelper.cls
@@ -143,7 +143,7 @@
PIIntegration piIntegration = new PIIntegration();
//鏌ヨurl
System.debug('thhsobjectType = ' + sobjectType);
- PI_Policy_Configuration__c config = [SELECT Full_New_URL__c,Full_Search_URL__c,Full_Update_URL__c,Full_Undelete_URL__c,Full_Read_URL__c,Full_Delete_URL__c,Full_View_Unified_Contact_URL__c,TransactionURL__c FROM PI_Policy_Configuration__c WHERE Sobject_Type__c =:sobjectType];
+ PI_Policy_Configuration__c config = [SELECT Full_New_URL__c,Full_New_Encrypt_URL__c,Full_Update_Encrypt_URL__c,Full_Search_URL__c,Full_Update_URL__c,Full_Undelete_URL__c,Full_Read_URL__c,Full_Delete_URL__c,Full_View_Unified_Contact_URL__c,TransactionURL__c FROM PI_Policy_Configuration__c WHERE Sobject_Type__c =:sobjectType];
System.debug('thhconfig = ' + config);
//鑾峰彇appid鍜宎ppsecret
@@ -174,6 +174,9 @@
token = (String)results.get('object');
System.debug('token = ' + token);
}catch(Exception e){
+ system.debug(e.getMessage());
+ system.debug(e.getStackTraceString());
+
Transaction_Log__c traLog = new Transaction_Log__c();
traLog.Module__c = 'Get Token';
traLog.Status__c = 'fail';
@@ -185,9 +188,9 @@
//Insert Get Token Log
//鑾峰彇鏁忔劅瀛楁
- piIntegration.PIDetails = [select id,PI_Policy_Configuration__r.Full_New_URL__c, Enable_Encrypt__c, SF_Field_API_Name__c,SF_Field_Encrypted_API__c, AWS_Field_API__c,AWS_Encrypted_Field_API__c,Field_Type__c from PI_Field_Policy_Detail__c where PI_Policy_Configuration_Name__c =:sobjectType and Enable_Encrypt__c=true];
+ piIntegration.PIDetails = [select id,PI_Policy_Configuration__r.Full_New_URL__c,PI_Policy_Configuration__r.Full_New_Encrypt_URL__c,PI_Policy_Configuration__r.Full_Update_Encrypt_URL__c, Enable_Encrypt__c, SF_Field_API_Name__c,SF_Field_Encrypted_API__c, AWS_Field_API__c,AWS_Encrypted_Field_API__c,Field_Type__c from PI_Field_Policy_Detail__c where PI_Policy_Configuration_Name__c =:sobjectType and Enable_Encrypt__c=true];
if(displayByOrderNumberObject.contains(sobjectType)){
- piIntegration.PIDetails = [select id,PI_Policy_Configuration__r.Full_New_URL__c, Enable_Encrypt__c, SF_Field_API_Name__c,SF_Field_Encrypted_API__c, AWS_Field_API__c,AWS_Encrypted_Field_API__c,Field_Type__c from PI_Field_Policy_Detail__c where PI_Policy_Configuration_Name__c =:sobjectType and Enable_Encrypt__c=true order by Order_Number__c];
+ piIntegration.PIDetails = [select id,PI_Policy_Configuration__r.Full_New_URL__c,PI_Policy_Configuration__r.Full_New_Encrypt_URL__c,PI_Policy_Configuration__r.Full_Update_Encrypt_URL__c, Enable_Encrypt__c, SF_Field_API_Name__c,SF_Field_Encrypted_API__c, AWS_Field_API__c,AWS_Encrypted_Field_API__c,Field_Type__c from PI_Field_Policy_Detail__c where PI_Policy_Configuration_Name__c =:sobjectType and Enable_Encrypt__c=true order by Order_Number__c];
}
List<String> vLookUpFields = new List<String>();
List<String> PIFields = new List<String>();
@@ -209,6 +212,8 @@
piIntegration.deleteUrl = config.Full_Delete_URL__c;
piIntegration.undeleteUrl = config.Full_Undelete_URL__c;
piIntegration.viewUnifiedContactUrl = config.Full_View_Unified_Contact_URL__c;
+ piIntegration.newEncryptUrl = config.Full_New_Encrypt_URL__c;
+ piIntegration.updateEncryptUrl = config.Full_Update_Encrypt_URL__c;
piIntegration.transactionURL = config.TransactionURL__c;
piIntegration.hostUrl = awsConfiguration.Host_URL__c;
piIntegration.searchUrl = config.Full_Search_URL__c;
@@ -231,6 +236,8 @@
public String deleteUrl{set;get;}
public String undeleteUrl{set;get;}
public String viewUnifiedContactUrl{set;get;}
+ public String newEncryptUrl{set;get;}
+ public String updateEncryptUrl{set;get;}
public String hostUrl{set;get;}
public String token{set;get;}
public String awsAppId{set;get;}
diff --git a/force-app/main/default/classes/QISPDFController.cls b/force-app/main/default/classes/QISPDFController.cls
index 6272db1..f51b606 100644
--- a/force-app/main/default/classes/QISPDFController.cls
+++ b/force-app/main/default/classes/QISPDFController.cls
@@ -8,6 +8,13 @@
// HWAG-BC68W3 鏁呴殰鍙戠敓鏃ヤ负绌烘椂锛� 瀹冧负鐪� start
public Boolean outOfGuarantee { get; private set; }
// HWAG-BC68W3 鏁呴殰鍙戠敓鏃ヤ负绌烘椂锛� 瀹冧负鐪� end
+
+ public string Photo_1_Text { get; private set; }
+ public string Photo_2_Text { get; private set; }
+ public string Photo_3_Text { get; private set; }
+ public string Photo_4_Text { get; private set; }
+
+
public QISPDFController() {
qr = new QIS_Report__c();
usr = new User();
@@ -53,6 +60,73 @@
//HWAG-BC68W3 end
inGuarantee = true;
}
+
+ Photo_1_Text = getImageByUrl(qr.Photo_1_Text__c);
+ Photo_2_Text = getImageByUrl(qr.Photo_2_Text__c);
+ Photo_3_Text = getImageByUrl(qr.Photo_3_Text__c);
+ Photo_4_Text = getImageByUrl(qr.Photo_4_Text__c);
}
}
+
+ public static String getImageByUrl(string urlStr){
+ //urlStr = 'https://ocsm--stagefull--c.documentforce.com/servlet/rtaImage?eid=a0f1000000cS7qH&feoid=00N10000006P4rz&refid=0EM10000002WIgq';
+ // 'https://ocsm--stagefull.my.salesforce.com/services/data/v51.0/sobjects/QIS_Report__c/a0f1000000IJay1/richTextImageFields/Photo_1__c/0EM100000017hLN
+ System.debug('urlStr='+urlStr);
+ Id eid = getUrlParameters(urlStr,'eid');
+ if (string.isBlank(eid)) {
+ System.debug('eid not found');
+ return null;
+ }
+
+ Id feoid = getUrlParameters(urlStr,'feoid');
+ if (string.isBlank(feoid)) {
+ System.debug('feoid not found');
+ return null;
+ }
+
+ Id refid = getUrlParameters(urlStr,'refid');
+ if (string.isBlank(refid)) {
+ System.debug('refid not found');
+ return null;
+ }
+
+ string body = MetaDataUtility.ToolingQuery('select id,FullName from CustomField where id=\''+feoid+'\'');
+ if(string.isBlank(body)){
+ System.debug('body is blank');
+ return null;
+ }
+ string sobjecttype = eid.getSobjectType().getDescribe().getName();
+ List<object> lo = (List<object>)(((Map<string,object>)JSON.deserializeUntyped(body)).get('records'));
+ Map<string,object> mso = (Map<string,object>)(lo[0]);
+ string f = ((string)mso.get('FullName')).replace(sobjecttype+'.', '');
+
+ String urlForClassic = 'https://'+System.URL.getOrgDomainUrl().getHost()+'/services/data/v53.0/sobjects/'+sobjecttype+'/'+eid+'/richTextImageFields/'+f+'/'+refid;
+
+ system.debug('URL Post:'+urlForClassic);
+ HttpResponse resp = null;
+ HttpRequest req = new HttpRequest();
+ req.setMethod('GET');
+ req.setEndpoint(urlForClassic);
+ req.setHeader('Authorization', 'Bearer ' + UserInfo.getsessionid());
+ Http client = new Http();
+ resp = client.send(req);
+ system.debug('getStatusCode:'+resp.getStatusCode());
+ return 'data:image/png;base64,' + EncodingUtil.base64Encode(resp.getBodyAsBlob());
+ }
+
+ public static String getUrlParameters(string url,string para){
+ //string url = 'https://sfpi-mebg-test.olympuschina.com:8081/stg/api/file/convert?from=https%3A%2F%2Focsm--stagefull--c.visualforce.com%2Fapex%2FQISPDF%3Fid%3Da0f1000000cS7qH&fileName=QISPDF';
+ if (string.isBlank(url) || string.isBlank(para)) {
+ return null;
+ }
+ Pattern p = Pattern.compile('(?<=' + para + '=)[^&]*');
+ Matcher m = p.matcher(url);
+ if (m.find()) {
+ return m.group();
+ }else {
+ system.debug('no found '+para+' in url='+url);
+ return null;
+ }
+
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/QISPDFControllerTest.cls b/force-app/main/default/classes/QISPDFControllerTest.cls
index 3bd1442..49a9357 100644
--- a/force-app/main/default/classes/QISPDFControllerTest.cls
+++ b/force-app/main/default/classes/QISPDFControllerTest.cls
@@ -38,4 +38,9 @@
QISPDFController controller = new QISPDFController();
controller.init();
}
+
+ static testMethod void Test1(){
+ QISPDFController.getImageByUrl('https://ocsm--stagefull--c.documentforce.com/servlet/rtaImage?eid=a0f1000000cS7qH&refid=0EM10000002WIgq');
+ QISPDFController.getImageByUrl('https://ocsm--stagefull--c.documentforce.com/servlet/rtaImage?eid=a0f1000000cS7qH&feoid=00N10000006P4rz');
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/StartTradingController.cls b/force-app/main/default/classes/StartTradingController.cls
index feb1533..98bb6bc 100644
--- a/force-app/main/default/classes/StartTradingController.cls
+++ b/force-app/main/default/classes/StartTradingController.cls
@@ -78,7 +78,7 @@
this.lead = [select id,SI_OppoLeadSec__c,owner_not_automatically_update__c, Hospital_Name__c, Opportunity_stage__c,Hospital_Name__r.RecordType.DeveloperName, Hospital_Name__r.Parent.RecordType.DeveloperName,
LastName, FirstName, LeadSource, Other_Society__c, Opp_Name__c, Purchase_Reason__c, Trade__c, Sales_Root__c,
Close_Forecasted_Date__c, Competitor__c, Hospital_Budget__c, Promise_Class__c, Dicision_Maker__c, Purchase_Type__c,
- Sales_Method__c, Fund_Basis__c, OwnerId, Wholesale_Price__c, Lead_No__c,CreatedDate,CreatedById
+ Sales_Method__c, Fund_Basis__c, OwnerId, Wholesale_Price__c, Lead_No__c,Inquiry_Num__c,CreatedDate,CreatedById
from Lead where id =: this.leadId];
// 瑷虹檪绉戦伕鎶炪儶銈广儓銇彇寰楋紙鏉′欢锛氱梾闄�=銉兗銉夋儏鍫便伄鐥呴櫌鍚嶇О锛�
@@ -276,6 +276,9 @@
else{
opp.Name = '*';
}
+ //20220412 SWAG-CBUB2W you start
+ opp.Inquiry_Num__c = this.lead.Inquiry_Num__c;
+ //20220412 SWAG-CBUB2W you end
opp.From_Lead_TF__c = true;
opp.Trade__c = (String.isBlank(this.lead.Trade__c)) ? '鍐呰部' : this.lead.Trade__c;
opp.StageName = '寮曞悎';
diff --git a/force-app/main/default/classes/StraightBackAddressController.cls b/force-app/main/default/classes/StraightBackAddressController.cls
index 6a358f5..4cc489f 100644
--- a/force-app/main/default/classes/StraightBackAddressController.cls
+++ b/force-app/main/default/classes/StraightBackAddressController.cls
@@ -163,6 +163,7 @@
newCon = new Contact();
return null;
}
+
//鏌ヨ瀹㈡埛璁板綍绫诲瀷
public PageReference queryRecordType(){
if(insUpdData.Customer__c!=null){
@@ -216,6 +217,7 @@
}
return null;
}
+ /*
//閲囩敤鎸夐挳
public PageReference adoptSave(){
//adoptId 瑕侀噰鐢ㄧ殑鍦板潃鏁版嵁id
@@ -280,7 +282,9 @@
}
rc.address_Telephone__c=tableData[i].address.Telephone__c;
rc.Detailed_Address__c=address;
- update rc;
+ if(!Test.isRunningTest()){
+ update rc;
+ }
//淇濆瓨鏁版嵁鍒颁繚鏈夎澶囪〃涓�
Asset ast = new Asset(
@@ -309,13 +313,14 @@
}
return null;
}
-
+*/
//閲嶅畾鍚戝埌 淇悊椤甸潰
public PageReference redirectPag(){
PageReference ref = new Pagereference('/' + RepairId);
ref.setRedirect(true);
return ref;
}
+
/**
* 妫�绱㈡暟鎹煡璇�
@@ -677,6 +682,51 @@
+ ' RecordType.name,Parent.Parent.Id FROM Account WHERE ID = \'' + accId + '\'';
return AccountSql;
}
+
+ @RemoteAction
+ public static string SaveEx(string repaire_json,string asset_json, string address_id){
+ return SaveExCore(repaire_json,asset_json,address_id);
+ }
+
+ public static string SaveExCore(string repaire_json,string asset_json, string address_id){
+ string message = null;
+ string savemessage = null;
+ savepoint sp = Database.setsavepoint();
+ try {
+ Repair__c r = (Repair__c)JSON.deserialize(repaire_json,Repair__c.class);
+ Asset ast = (Asset)JSON.deserialize(asset_json,Asset.class);
+ Address__c add = new Address__c(Id=address_id,Using_Datetime__c = Datetime.now());
+ update r;
+ update ast;
+ update add;
+ }catch(DmlException e) {
+ Integer index = 0;
+ System.debug(e.getNumDml());
+ System.debug(e.getDmlFields(index));
+ System.debug(e.getDmlId(index));
+ System.debug(e.getDmlIndex(index));
+ System.debug(e.getDmlMessage(index));
+ System.debug(e.getDmlStatusCode(index));
+ System.debug(e.getDmlType(index));
+ system.debug(e.getMessage());
+ system.debug(e.getStackTraceString());
+
+ System.debug('into catch'+e.getMessage());
+ Database.rollback(sp);
+
+ message ='淇濆瓨澶辫触锛屽師鍥�:'+ e.getDmlMessage(index);
+ savemessage = e.getMessage()+e.getStackTraceString();
+ } catch (Exception e) {
+ System.debug('into catch'+e.getMessage());
+ Database.rollback(sp);
+
+ savemessage = e.getMessage()+e.getStackTraceString();
+ message = '淇濆瓨澶辫触';
+ } finally {
+ PIHelper.saveTransLog('StraightBackAddressController',address_id,address_id,address_id, repaire_json ,asset_json,message);
+ }
+ return message;
+ }
/**
* 涓轰簡鏂逛究鍓嶆table鑾峰彇鍊�
diff --git a/force-app/main/default/classes/StraightBackAddressControllerTest.cls b/force-app/main/default/classes/StraightBackAddressControllerTest.cls
index 250e7e7..0da125e 100644
--- a/force-app/main/default/classes/StraightBackAddressControllerTest.cls
+++ b/force-app/main/default/classes/StraightBackAddressControllerTest.cls
@@ -8,6 +8,7 @@
strList.add('Address__c');
strList.add('Contact');
strList.add('Repair__c');
+ strList.add('Agency_Contact__c');
TestDataUtility.CreatePIPolicyConfigurations(strList);
}
@isTest
@@ -120,7 +121,7 @@
//娴嬭瘯鏋勯�犲櫒閲岄潰鐨勪唬鐮�
PageReference peg = new PageReference('/apex/StraightBackAddress?id='+rpr.id);
System.Test.setCurrentPage(peg);
-
+
StraightBackAddressController sbac = new StraightBackAddressController();
sbac.txtName = '鍖椾含';
sbac.txtAddress = '甯�';
@@ -135,16 +136,24 @@
sbac.insUpdData.Contacts__c = null;
sbac.insUpdData.Create_Contacts__c = '鐜嬩簲';
sbac.save();
- sbac.adoptSave();
+ //sbac.adoptSave();
sbac.searchBtn();
-
+ sbac.insUpdData.Customer__c = depart.Id;
+ sbac.queryRecordType();
+
+ sbac.redirectPag();
+ sbac.optionAddressClassification.Address_Classification__c = '缁忛攢鍟�';
+ sbac.searchBtn();
+/*
StraightBackAddressController ss = new StraightBackAddressController();
ss.txtName = '缁忛攢鍟�';
ss.txtAddress = '鍝堝搱';
- sbac.typeText = '鍔炰簨澶�';
+ ss.typeText = '缁忛攢鍟�';
ss.UpdId = ascc.id;
ss.adoptId = ascc.id;
+ ss.searchBtn();
ss.init();//椤甸潰鍒濆鍖栨柟娉�
+
ss.onEditor();//淇敼鎸夐挳鏂规硶
ss.onCopy();//澶嶅埗鎸夐挳鏂规硶
ss.insUpdData.Address_Classification__c = '';
@@ -154,9 +163,16 @@
ss.insUpdData.Detailed_Address__c = null;
ss.insUpdData.Customer__c = null;
ss.save();
- ss.searchBtn();
+*/
}
+ @isTest
+ static void testSaveEx() {
+ StraightBackAddressController.SaveExCore(null,null,null);
+ StraightBackAddressController.SaveExCore('{"attributes":{"type":"Repair__c"}}','{"attributes":{"type":"Asset"}}','a4R1m000000Lfme');
+
+ }
+
/**
* 涓轰簡鏂逛究鍓嶆table鑾峰彇鍊�
*/
diff --git a/force-app/main/default/classes/XinDailyReportController.cls b/force-app/main/default/classes/XinDailyReportController.cls
index a91874d..c12d850 100644
--- a/force-app/main/default/classes/XinDailyReportController.cls
+++ b/force-app/main/default/classes/XinDailyReportController.cls
@@ -2340,18 +2340,17 @@
if('鐢宠珛涓�'.equals(report.Status__c )){
XinDailyReportController.updateTask( report.id);
//sla淇℃伅鏇存柊 zh start
-
//2021-08-27 鏉ㄦ澃鍏� 淇敼閫昏緫锛氭槸鍚﹂�炬湡閮借皟鐢╯aveSLADetails鏂规硶锛屽皢鏄惁閫炬湡浼犲叆鏂规硶锛屾柟娉曞唴鍋氶�昏緫澶勭悊
if (eventCAndSLA.size()>0 && SLAIds.size()>0) {
UpdateSLACompleteNumber.saveSLADetails(eventCAndSLA, SLAIds,report.Submit_DateTime_New__c <= report.Report_Deadline__c );
}
if (report.Submit_DateTime_New__c <= report.Report_Deadline__c ) { //鎻愪氦鏃ヨ秴杩囨渶鍚庢彁浜ゆ湡闄愶紝涓嶈鍏ユ鏁�
-
if (eventCAndMainC.size()>0 && mainCIds.size()>0) {
UpdateSLACompleteNumber.saveSLARecorded(eventCAndMainC, mainCIds);
}
}
+
//sla淇℃伅鏇存柊 zh end
// 浠诲姟妗嗘灦bug 搴斿 by zys start 鍘熶唬鐮�
@@ -3667,6 +3666,9 @@
// 20200420 浠诲姟鏃ユ姤绠＄悊 add gzw end
activities.add(a);
actSize = activities.size();
+ //Add log by Li Jun 20220407 Start
+ system.debug('Activity Data:'+JSON.serialize(activities));
+ //Add log by Li Jun 20220407 end
}
public String delIndex {
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
diff --git a/force-app/main/default/pages/InsReportPDF.page b/force-app/main/default/pages/InsReportPDF.page
index f811b6e..5230689 100644
--- a/force-app/main/default/pages/InsReportPDF.page
+++ b/force-app/main/default/pages/InsReportPDF.page
@@ -228,22 +228,22 @@
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();
+ // 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"/>')
+ 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"/>')
}
diff --git a/force-app/main/default/pages/NewAndEditASEActivity.page b/force-app/main/default/pages/NewAndEditASEActivity.page
index ec21f0b..9f8c918 100644
--- a/force-app/main/default/pages/NewAndEditASEActivity.page
+++ b/force-app/main/default/pages/NewAndEditASEActivity.page
@@ -65,6 +65,7 @@
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
+ delete payloadJson.OwnerId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
}
diff --git a/force-app/main/default/pages/NewAndEditAddress.page b/force-app/main/default/pages/NewAndEditAddress.page
index ea98368..169722e 100644
--- a/force-app/main/default/pages/NewAndEditAddress.page
+++ b/force-app/main/default/pages/NewAndEditAddress.page
@@ -167,6 +167,7 @@
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
+ delete payloadJson.OwnerId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
}
diff --git a/force-app/main/default/pages/NewAndEditAgencyContact.page b/force-app/main/default/pages/NewAndEditAgencyContact.page
index 5230dab..704cfbe 100644
--- a/force-app/main/default/pages/NewAndEditAgencyContact.page
+++ b/force-app/main/default/pages/NewAndEditAgencyContact.page
@@ -63,6 +63,7 @@
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
+ delete payloadJson.OwnerId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
}
@@ -122,6 +123,8 @@
}
var staticResources = JSON.parse('{!staticResource}');
+ var staticResourceAWSContact = JSON.parse('{!staticResourceAWSContact}');
+
var requiredFieldAPIList = JSON.parse('{!requiredFieldAPIListStr}');
var fieldAPIToLabelMap = JSON.parse('{!fieldAPIToLabelMapStr}');
console.log('{!staticResource}');
@@ -418,12 +421,15 @@
let contactsInfo = JSON.parse('{!LookUpOverrideFieldsMapJson}');
let dataId = contactsInfo[sfId];
- AWSService.query(staticResourcesContact.queryUrl,dataId,function(result){
- if(result.object){
- document.querySelector("[data-id='Contact__c']").value = result.object.lastName;
- }
-
- },staticResources.token);
+ if(dataId){
+ AWSService.query(staticResourceAWSContact.queryUrl,dataId,function(result){
+ if(result.object){
+ document.querySelector("[data-id='Contact__c']").value = result.object.lastName;
+ }
+
+ },staticResources.token);
+ }
+
}
</script>
diff --git a/force-app/main/default/pages/NewAndEditCase.page b/force-app/main/default/pages/NewAndEditCase.page
index 5f79017..44934f5 100644
--- a/force-app/main/default/pages/NewAndEditCase.page
+++ b/force-app/main/default/pages/NewAndEditCase.page
@@ -24,7 +24,7 @@
//鍒ゆ柇insert or update
function ProcessPI(caseJson, payloadForNewPI) {
blockme();
- if ({!isNewMode}) {
+ if ({!isNewMode} || {!isCloneMode}) {
NewPIToAWS(caseJson, payloadForNewPI)
}else {
UpdatePIToAWS(caseJson, payloadForNewPI)
@@ -121,6 +121,9 @@
console.log(nodelist[index].id.indexOf('lkwgt'));
if (nodelist[index].id.indexOf('lkwgt') == -1) {
let vlookUpNodeId = nodelist[index].id + '_lkid';
+ if (nodelist[index].getAttribute("data-id") == 'Field1_staff__c') {
+ vlookUpNodeId = nodelist[index].id.substring(0,nodelist[index].id.length-4) + '_lkid';
+ }
let vlookUpNodeValue = document.getElementById(vlookUpNodeId).value;
result[nodelist[index].getAttribute("data-id")] = vlookUpNodeValue;
}
@@ -141,12 +144,6 @@
index++;
}
}
- //閽堝id鐨勬墜鍔ㄦ坊鍔�
- if (document.getElementById("page:form:block:j_id31:0:j_id32:j_id33:1:j_id34_lkid") && (!result.hasOwnProperty("Field1_staff__c") || !result["Field1_staff__c"])){
- if(document.getElementById("page:form:block:j_id31:0:j_id32:j_id33:1:j_id34_lkid").value != '000000000000000'){
- result["Field1_staff__c"] = document.getElementById("page:form:block:j_id31:0:j_id32:j_id33:1:j_id34_lkid").value;
- }
- }
return result;
}
@@ -157,9 +154,15 @@
//闇�瑕佽В瀵嗗瓧娈�
var queryBack = function queryBack(data) {
console.log('data = ' + data);
- document.querySelector("[data-id='cic_telephone__c']").value = data.object.cicTelephone;
- document.querySelector("[data-id='CASE_CUSTOMER__c']").value = data.object.caseCustomer;
- document.querySelector("[data-id='Customer_manual__c']").value = data.object.customerManual;
+ if (document.querySelector("[data-id='cic_telephone__c']")) {
+ document.querySelector("[data-id='cic_telephone__c']").value = data.object.cicTelephone;
+ }
+ if (document.querySelector("[data-id='CASE_CUSTOMER__c']")) {
+ document.querySelector("[data-id='CASE_CUSTOMER__c']").value = data.object.caseCustomer;
+ }
+ if (document.querySelector("[data-id='Customer_manual__c']")) {
+ document.querySelector("[data-id='Customer_manual__c']").value = data.object.customerManual;
+ }
};
var insertOrUpdateBack = function insertOrUpdateBack(payloadJson, result, isNewMode) {
@@ -175,7 +178,7 @@
payloadJson.Customer_manual_Encrypted__c = r.object[0].customerManualEncrypt;
//payloadJson.AWS_Data_Id__c = r.object[0].dataId;
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
- if (isNewMode) {
+ if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
@@ -240,6 +243,7 @@
//1. Get Case Information from Form
let caseJson = getCaseInformation();
//2. Validate the Case field value formate, for example the email formate or phone formate
+ /*
let validationResultMessage = validateFieldValueFormate();
console.log(validationResultMessage);
if (!validationResultMessage) {
@@ -248,6 +252,7 @@
alertErrorMessage('鎵嬫満鏍煎紡杈撳叆鏈夎锛岃閲嶆柊杈撳叆锛�');
return
}
+ */
// Check Required Field
let checkRequiredFieldMsgResult = checkRequiredFieldMsg(caseJson);
if (checkRequiredFieldMsgResult) {
diff --git a/force-app/main/default/pages/NewAndEditContact.page b/force-app/main/default/pages/NewAndEditContact.page
index 29881e7..f55f953 100644
--- a/force-app/main/default/pages/NewAndEditContact.page
+++ b/force-app/main/default/pages/NewAndEditContact.page
@@ -63,6 +63,7 @@
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
+ delete payloadJson.OwnerId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
}
diff --git a/force-app/main/default/pages/NewAndEditInquiryForm.page b/force-app/main/default/pages/NewAndEditInquiryForm.page
index b3e7658..ddbdc8d 100644
--- a/force-app/main/default/pages/NewAndEditInquiryForm.page
+++ b/force-app/main/default/pages/NewAndEditInquiryForm.page
@@ -65,6 +65,7 @@
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
+ delete payloadJson.OwnerId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
}
@@ -228,20 +229,26 @@
} else if (ele.type == 'checkbox') {
result[field_api_name] = ele.checked;
} else if (ele.type == 'select-multiple') {
- //field_api_name
- let multiple = field_api_name;
- let targets = "";
- //InquiryForm鐗规畩澶勭悊
- if(multiple == "Product1__c"){
- targets = GetEleByClass(config.ApiPrefix+'_'+field_api_name).parentNode.children[1].rows[1].cells[2].innerText;
- }else if(multiple == "Request1__c"){
- targets = GetEleByClass(config.ApiPrefix+'_'+field_api_name).parentNode.children[2].rows[1].cells[2].innerText;
- }else{
- targets = GetEleByClass(config.ApiPrefix+'_'+field_api_name).parentNode.children[1].children[0].children[1].children[2].children[0].innerText;
+ //After Update By zhj 20220411 Start
+ let multiple = nodelist[index].getAttribute("data-id");
+ let targets = document.querySelector("[data-id=" + multiple + "]").options;
+ let selValues = [];
+ for(i=0; i < targets.length; i++){
+ if(targets[i].selected){
+ selValues.push(targets[i].value);
+ }
}
- targets = targets.replace(/\n/g, ";");
- console.log('targets = ' + targets);
- result[field_api_name] = targets;
+ let setValuesStr = JSON.stringify(selValues);
+ setValuesStr = setValuesStr.substring(1,setValuesStr.length-1);
+ if(setValuesStr){
+ setValuesStr = setValuesStr.replace(/"/g,"");
+ if(setValuesStr.indexOf(',')!=-1){
+ setValuesStr = setValuesStr.replace(/,/g,";");
+ }
+ }
+ console.log('targets = ' + setValuesStr);
+ result[nodelist[index].getAttribute("data-id")] = setValuesStr;
+ //After Update By zhj 20220411 end
} else {
result[field_api_name] = ele.value;
}
diff --git a/force-app/main/default/pages/NewAndEditInspectionReport.page b/force-app/main/default/pages/NewAndEditInspectionReport.page
index 226472d..4a0c0a1 100644
--- a/force-app/main/default/pages/NewAndEditInspectionReport.page
+++ b/force-app/main/default/pages/NewAndEditInspectionReport.page
@@ -59,6 +59,7 @@
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
+ delete payloadJson.OwnerId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
}
@@ -186,7 +187,14 @@
return error_msg;
}
-
+ function getCKEinstance(api_name){
+ let t = jQuery("label[for$='textAreaDelegate_"+api_name+"']").parent().next().find("textarea")[0];
+ if(t && t.id){
+ return CKEDITOR.instances[t.id]
+
+ }
+ return null;
+ }
function getSobjectInformation() {
let nodelist = document.getElementsByClassName(config.ApiPrefix);
@@ -235,8 +243,9 @@
}
//璧嬪�煎瘜鏂囨湰鍖哄煙
//绉戝璐熻矗浜虹瀛�
- if(document.querySelector("[title = 'RTF 绶ㄨ集鍣�, page:form:block:j_id51:0:j_id52:j_id53:5:j_id54:textAreaDelegate_ResponsiblePerson_Sign__c']")){
- result.ResponsiblePerson_Sign__c = document.querySelector("[title = 'RTF 绶ㄨ集鍣�, page:form:block:j_id51:0:j_id52:j_id53:5:j_id54:textAreaDelegate_ResponsiblePerson_Sign__c']").contentWindow.document.getElementsByTagName('body')[0].innerHTML
+
+ if(getCKEinstance('ResponsiblePerson_Sign__c')){
+ result.ResponsiblePerson_Sign__c = getCKEinstance('ResponsiblePerson_Sign__c').getData()
}
if(document.querySelector("[data-id='Reporter__c']")){
result['Reporter__c'] = document.getElementById(document.querySelector("[data-id='Reporter__c']").children[7].children[0].id + '_lkid').value;
diff --git a/force-app/main/default/pages/NewAndEditLead.page b/force-app/main/default/pages/NewAndEditLead.page
index b030efe..51b78f1 100644
--- a/force-app/main/default/pages/NewAndEditLead.page
+++ b/force-app/main/default/pages/NewAndEditLead.page
@@ -118,12 +118,26 @@
} else if (nodelist[index].type == 'checkbox') {
result[nodelist[index].getAttribute("data-id")] = nodelist[index].checked;
} else if (nodelist[index].type == 'select-multiple') {
- //nodelist[index].getAttribute("data-id")
+ //After Update By zhj 20220411 Start
let multiple = nodelist[index].getAttribute("data-id");
- let targets = document.querySelector("[data-id=" + multiple + "]").parentNode.children[1].children[0].children[1].children[2].children[0].innerText;
- targets = targets.replace(/\n/g, ";");
- console.log('targets = ' + targets);
- result[nodelist[index].getAttribute("data-id")] = targets;
+ let targets = document.querySelector("[data-id=" + multiple + "]").options;
+ let selValues = [];
+ for(i=0; i < targets.length; i++){
+ if(targets[i].selected){
+ selValues.push(targets[i].value);
+ }
+ }
+ let setValuesStr = JSON.stringify(selValues);
+ setValuesStr = setValuesStr.substring(1,setValuesStr.length-1);
+ if(setValuesStr){
+ setValuesStr = setValuesStr.replace(/"/g,"");
+ if(setValuesStr.indexOf(',')!=-1){
+ setValuesStr = setValuesStr.replace(/,/g,";");
+ }
+ }
+ console.log('targets = ' + setValuesStr);
+ result[nodelist[index].getAttribute("data-id")] = setValuesStr;
+ //After Update By zhj 20220411 end
} else {
result[nodelist[index].getAttribute("data-id")] = nodelist[index].value;
}
@@ -171,6 +185,7 @@
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
+ delete payloadJson.OwnerId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
}
@@ -481,7 +496,7 @@
document.querySelector("[data-id='Status']").value = '鏈窡杩�'
//浼氳璇㈤棶鍗�
if ('{!ifc.Id}')
- document.getElementById('page:form:block:j_id34:0:j_id35:j_id36:15:j_id37_lkid').value = '{!ifc.Id}'
+ document.getElementById(document.querySelector("[data-id='Lead_Inquiry_form__c']").id+'_lkid').value = '{!ifc.Id}'
if ('{!ifc.Name}')
document.querySelector("[data-id='Lead_Inquiry_form__c']").value = '{!ifc.Name}'
//瀹㈡埛濮撳悕
@@ -489,25 +504,24 @@
document.getElementById(document.querySelector("[data-id='Contact_Name__c']").id + '_lkid').value = '{!ifc.Contact_Id__c}'
//鍖婚櫌
if ('{!ifc.Hospital_Name__c}')
- document.getElementById('page:form:block:j_id34:0:j_id35:j_id36:2:j_id37_lkold').value = '{!ifc.Hospital_Name__c}'
+ document.getElementById(document.querySelector("[data-id='Hospital_Name__c']").id+'_lkold').value = '{!ifc.Hospital_Name__c}'
if ('{!ifc.Hospital_ID__c}')
- document.getElementById('page:form:block:j_id34:0:j_id35:j_id36:2:j_id37_lkid').value = '{!ifc.Hospital_ID__c}'
+ document.getElementById(document.querySelector("[data-id='Hospital_Name__c']").id+'_lkid').value = '{!ifc.Hospital_ID__c}'
//鎴樼暐绉戝鍒嗙被
if ('{!ifc.Department_Class__c}')
- document.getElementById('page:form:block:j_id34:0:j_id35:j_id36:4:j_id37_lkold').value = '{!ifc.Department_Class__c}'
+ document.getElementById(document.querySelector("[data-id='Department_Class__c']").id+'_lkold').value = '{!ifc.Department_Class__c}'
if ('{!ifc.Department_ID__c}')
- document.getElementById('page:form:block:j_id34:0:j_id35:j_id36:4:j_id37_lkid').value = '{!ifc.Department_ID__c}'
+ document.getElementById(document.querySelector("[data-id='Department_Class__c']").id+'_lkid').value = '{!ifc.Department_ID__c}'
//宸叉湁璇环鍚嶇О
if ('{!ifc.Opp_Name_Search__c}')
- //document.getElementById('page:form:block:j_id34:0:j_id35:j_id36:12:j_id37_lkold').value = '{!ifc.Opp_Name_Search__c}'
document.getElementById(document.querySelector("[data-id='Opp_Name_Search__c']").id + '_lkold').value = '{!ifc.Opp_Name_Search__c}'
if ('{!ifc.Opp_Name_Search_ID__c}')
document.getElementById(document.querySelector("[data-id='Opp_Name_Search__c']").id + '_lkid').value = '{!ifc.Opp_Name_Search_ID__c}'
//涓昏瀛︿細
if ('{!ifc.Campaign__c}')
- document.getElementById('page:form:block:j_id34:1:j_id35:j_id36:3:j_id37_lkold').value = '{!ifc.Campaign__c}'
+ document.getElementById(document.querySelector("[data-id='Campaign__c']").id +'_lkold').value = '{!ifc.Campaign__c}'
if ('{!ifc.Campaign_ID__c}')
- document.getElementById('page:form:block:j_id34:1:j_id35:j_id36:3:j_id37_lkid').value = '{!ifc.Campaign_ID__c}'
+ document.getElementById(document.querySelector("[data-id='Campaign__c']").id +'_lkid').value = '{!ifc.Campaign_ID__c}'
//鍙栨秷鍘熷洜
if ('{!ifc.Cancel_Reason__c}')
document.querySelector("[data-id='Cancel_Reason__c']").value = '{!ifc.Cancel_Reason__c}'
diff --git a/force-app/main/default/pages/NewAndEditQIS.page b/force-app/main/default/pages/NewAndEditQIS.page
index 6ca0acf..5e63772 100644
--- a/force-app/main/default/pages/NewAndEditQIS.page
+++ b/force-app/main/default/pages/NewAndEditQIS.page
@@ -64,6 +64,7 @@
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
+ delete payloadJson.OwnerId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
}
diff --git a/force-app/main/default/pages/NewAndEditReport.page b/force-app/main/default/pages/NewAndEditReport.page
index 16baa76..bd565c3 100644
--- a/force-app/main/default/pages/NewAndEditReport.page
+++ b/force-app/main/default/pages/NewAndEditReport.page
@@ -72,7 +72,6 @@
result[nodelist[index].getAttribute("data-id")] = nodelist[index].checked;
} else if (nodelist[index].type == 'select-multiple') {
//nodelist[index].getAttribute("data-id")
- let multiple = nodelist[index].getAttribute("data-id");
//let targets = document.querySelector("[data-id=" + multiple + "]").nextSibling.children[0].children[1].children[2].innerText;
//Before Update By Li Jun 20220411
// let targets = document.querySelector("[data-id=" + multiple + "]").parentNode.children[2].children[0].children[1].children[2].children[0].innerText;
@@ -82,6 +81,7 @@
//Before Update By Li Jun 20220411
//After Update By Li Jun 20220411 Start
+ let multiple = nodelist[index].getAttribute("data-id");
let targets = document.querySelector("[data-id=" + multiple + "]").options;
let selValues = [];
for(i=0; i < targets.length; i++){
@@ -493,6 +493,7 @@
payloadJson.sex_Encrypted__c = result.object[0].sexEncrypt;
if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = result.object[0].dataId;
+ delete payloadJson.OwnerId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
}
@@ -599,7 +600,7 @@
<!--Each section has layoutFields, let's iterate them as well-->
<apex:repeat value="{!layoutSection.layoutFields}" var="layoutField">
- <apex:inputField html-data-id="{!layoutField.fieldAPI}" styleClass="{!layoutField.fieldAPI}" value="{!Report__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)}"
+ <apex:inputField html-title="{!layoutField.fieldAPI}" html-data-id="{!layoutField.fieldAPI}" styleClass="{!layoutField.fieldAPI}" value="{!Report__c[layoutField.fieldAPI]}" rendered="{!not(layoutField.isPlaceHOlder)}"
required="{!layoutField.isRequired}" />
<apex:pageblocksectionitem rendered="{!layoutField.isPlaceHolder}">
</apex:pageblocksectionitem>
diff --git a/force-app/main/default/pages/NewAndEditTenderinformation.page b/force-app/main/default/pages/NewAndEditTenderinformation.page
index a0d15b5..12159f0 100644
--- a/force-app/main/default/pages/NewAndEditTenderinformation.page
+++ b/force-app/main/default/pages/NewAndEditTenderinformation.page
@@ -59,6 +59,7 @@
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
+ delete payloadJson.OwnerId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
}
diff --git a/force-app/main/default/pages/NewConsumApply.page b/force-app/main/default/pages/NewConsumApply.page
index 588c175..ca6033e 100644
--- a/force-app/main/default/pages/NewConsumApply.page
+++ b/force-app/main/default/pages/NewConsumApply.page
@@ -62,6 +62,7 @@
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
+ delete payloadJson.OwnerId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
}
diff --git a/force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page b/force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page
index dbbb072..c4a7688 100644
--- a/force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page
+++ b/force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page
@@ -1,10 +1,3 @@
-<!--
- @description :
- @author : ChangeMeIn@UserSettingsUnder.SFDoc
- @group :
- @last modified on : 04-02-2022
- @last modified by : ChangeMeIn@UserSettingsUnder.SFDoc
--->
<apex:page standardController="Consum_Apply_Equipment_Set_Detail__c" extensions="NewConsumApplyEquipSetDetailController" id="page">
<apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
@@ -57,7 +50,7 @@
payloadJson.Trial_User__c = r.object[0].trialUser;
payloadJson.Trial_User_Encrypt__c = r.object[0].trialUserEncrypt;
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
- if (isNewMode) {
+ if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
@@ -69,8 +62,7 @@
// New Or Edit
function ProcessPI(consumApplyJson, payloadForNewPI) {
blockme();
- if ({!isNewMode
- }) {
+ if ({!isNewMode} || {!isCloneMode}) {
NewPIToAWS(consumApplyJson, payloadForNewPI)
}else {
UpdatePIToAWS(consumApplyJson, payloadForNewPI)
@@ -280,16 +272,26 @@
<script>
//Append Page
sfdcPage.appendToOnloadQueue(function () {
+ //鍒ゆ柇鏄惁涓哄彧璇婚�夐」
var layoutSections = JSON.parse('{!layoutSectionsStr}');
- for (let m = 0; m < layoutSections.length; m++) {
- let layoutSection = layoutSections[m].layoutFields;
- for (let n = 0; n < layoutSection.length; n++) {
- let layoutField = layoutSection[n];
- if (layoutField.fieldAPI != '' && document.querySelector("[data-id='"+layoutField.fieldAPI+"']") != null) {
- document.querySelector("[data-id='"+layoutField.fieldAPI+"']").disabled = !(layoutField.editableField);
+ for (let m = 0; m < layoutSections.length; m++) {
+ let layoutSection = layoutSections[m].layoutFields;
+ for (let n = 0; n < layoutSection.length; n++) {
+ let layoutField = layoutSection[n];
+ if (layoutField.fieldAPI != '' && document.querySelector("[data-id='"+layoutField.fieldAPI+"']") != null) {
+ let e = document.querySelector("[data-id='"+layoutField.fieldAPI+"']");
+ e.disabled = !(layoutField.editableField);
+ if (!(layoutField.editableField)) {
+ if (e.getAttribute("multiple") && e.getAttribute("multiple") == 'multiple') {
+ e.parentNode.classList.add("disabledbutton");
+ }
+ if (e.tagName == 'DIV') {
+ e.classList.add("disabledbutton");
+ }
+ }
+ }
}
}
- }
//2. Query AWS Data by dataId
console.log('Mode for consumApply Page:' + {!isNewMode});
if (!{!isNewMode}) {
@@ -298,36 +300,37 @@
};
document.querySelector("[data-id='OwnerId']").classList.add("disabledbutton");
- jQuery(".lookupInput").each(function(i,e){
- let je =jQuery(e).find('input');
- je.attr("readonly","");
- je.css("background","unset");
+ //zhj 2022/04/11 start
+ // jQuery(".lookupInput").each(function(i,e){
+ // let je =jQuery(e).find('input');
+ // je.attr("readonly","");
+ // je.css("background","unset");
- let dataid = je.attr('data-id');
- if(['Hospital_Name__c','Department_Class__c','OwnerId'].indexOf(dataid) > -1) return;
- jQuery(e).children(":last-child").before('<img class="closeIcon" data-id="'+dataid+'" generate="" alt="Clear" src="/s.gif" style="display: inline-block;">');
- })
+ // let dataid = je.attr('data-id');
+ // if(['Hospital_Name__c','Department_Class__c','OwnerId'].indexOf(dataid) > -1) return;
+ // jQuery(e).children(":last-child").before('<img class="closeIcon" data-id="'+dataid+'" generate="" alt="Clear" src="/s.gif" style="display: inline-block;">');
+ // })
- jQuery(".lookupInput").on("mouseenter","img[generate]",function(e){
- this.className = "closeIconOn";
- });
+ // jQuery(".lookupInput").on("mouseenter","img[generate]",function(e){
+ // this.className = "closeIconOn";
+ // });
- jQuery(".lookupInput").on("mouseleave","img[generate]",function(e){
- this.className = "closeIcon"
- });
+ // jQuery(".lookupInput").on("mouseleave","img[generate]",function(e){
+ // this.className = "closeIcon"
+ // });
- jQuery(".lookupInput").on("click","img[generate]",function(e){
- let id = jQuery("input[data-id='"+jQuery(this).attr("data-id")+ "']").attr("id");
- let input = document.getElementById(id);
- if(input){
- input.value = '';
- let hidden = document.getElementById(id+'_lkid');
- if(hidden){
- hidden.value = '';
- }
- }
- });
-
+ // jQuery(".lookupInput").on("click","img[generate]",function(e){
+ // let id = jQuery("input[data-id='"+jQuery(this).attr("data-id")+ "']").attr("id");
+ // let input = document.getElementById(id);
+ // if(input){
+ // input.value = '';
+ // let hidden = document.getElementById(id+'_lkid');
+ // if(hidden){
+ // hidden.value = '';
+ // }
+ // }
+ // });
+ //zhj 2022/04/11 end
});
</script>
<div class="pbBottomButtons">
diff --git a/force-app/main/default/pages/NewOnCall.page b/force-app/main/default/pages/NewOnCall.page
index c64cdb1..58c29d0 100644
--- a/force-app/main/default/pages/NewOnCall.page
+++ b/force-app/main/default/pages/NewOnCall.page
@@ -56,6 +56,7 @@
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
if (isNewMode|| {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
+ delete payloadJson.OwnerId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
}
diff --git a/force-app/main/default/pages/NewRentalApply.page b/force-app/main/default/pages/NewRentalApply.page
index 10321bc..658a126 100644
--- a/force-app/main/default/pages/NewRentalApply.page
+++ b/force-app/main/default/pages/NewRentalApply.page
@@ -58,6 +58,7 @@
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
if (isNewMode || {!isCloneMode}) {
payloadJson.AWS_Data_Id__c = r.object[0].dataId;
+ delete payloadJson.OwnerId;
} else {
payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
}
diff --git a/force-app/main/default/pages/NewRepair.page b/force-app/main/default/pages/NewRepair.page
index 4db1fd5..585e2c5 100644
--- a/force-app/main/default/pages/NewRepair.page
+++ b/force-app/main/default/pages/NewRepair.page
@@ -227,7 +227,7 @@
//page:form:block:j_id34:17:j_id35:j_id36:2:j_id37
//page:form:block:j_id34:17:j_id35:j_id36:2:j_id37
if(document.getElementById('page:form:block:j_id34:17:j_id35:j_id36:2:j_id37')){
- result.Return_Without_Repair_Reason__c = document.getElementById('page:form:block:j_id34:17:j_id35:j_id36:2:j_id37').value;
+ result.Return_Without_Repair_Reason__c = document.getElementById('page:form:block:j_id34:17:j_id35:j_id36:2:j_id37').value=='_\x01_'?'':document.getElementById('page:form:block:j_id34:17:j_id35:j_id36:2:j_id37').value;
}
console.log(JSON.stringify(result));
return result;
diff --git a/force-app/main/default/pages/OFSInsReportLayout.page b/force-app/main/default/pages/OFSInsReportLayout.page
index 9e5d847..3b0ba46 100644
--- a/force-app/main/default/pages/OFSInsReportLayout.page
+++ b/force-app/main/default/pages/OFSInsReportLayout.page
@@ -218,7 +218,7 @@
for (let i = 0; i < divs.length; i++) {
for (let j = 0; j < divs[i].classList.length; j++) {
for(let clsi in divs[i].classList){let cls=divs[i].classList[clsi];
- if (cls.indexOf('error')>-1) {
+ if (typeof cls == 'string' && cls.indexOf('error')>-1) {
return true;
}
}
diff --git a/force-app/main/default/pages/QISPDF.page b/force-app/main/default/pages/QISPDF.page
index 073c274..9fa3336 100644
--- a/force-app/main/default/pages/QISPDF.page
+++ b/force-app/main/default/pages/QISPDF.page
@@ -22,8 +22,8 @@
/* 20220221 PI鏀归�� by 寰愪寒 start */
body{margin: 0 auto;
width: 780px;}
- #title1{height: 30px;}
- #title2{height: 110px;}
+ .title1{height: 30px;}
+ .title2{height: 110px;}
/* 20220221 PI鏀归�� by 寰愪寒 end */
@@ -42,7 +42,8 @@
<body style="font-family: MS Gothic;">
<div id="pdf-wrapper">
- <div id="title1"></div>
+ <div class="pdf-page">
+
<table width="100%" border="0">
<tr>
<td width="25%">
@@ -398,9 +399,11 @@
</tr>
</table>
- <div style="page-break-after: always;"></div>
- <div id="title2"></div>
+ </div>
+ <div style="page-break-after: always;"></div>
+ <div class="pdf-page">
+
<table width="100%" border="0">
<tr>
<td width="25%">
@@ -453,34 +456,36 @@
<br/>
<table width="100%" border="1" cellspacing="2" style="font-size: 8pt;">
<tr>
- <td>
- <table width="100%" border="1" cellspacing="0">
- <tr><td style="height:300px; text-align: center;"><apex:image value="{!qr.Photo_1_Text__c}" width="80%" rendered="{!NOT(ISBLANK(qr.Photo_1_Text__c))}" /></td></tr>
+ <td style="width:50%">
+ <table width="100%" border="0" cellspacing="0">
+ <tr><td style="height:300px; text-align: center;"><apex:image id="Photo_1_Text" value="{!Photo_1_Text}" width="80%" rendered="{!NOT(ISBLANK(qr.Photo_1_Text__c))}" /></td></tr>
<tr><td style="height:40px;"></td></tr>
</table>
</td>
<td style="border-left-color: white;">
- <table width="100%" border="1" cellspacing="0">
- <tr><td style="height:300px; text-align: center;"><apex:image value="{!qr.Photo_2_Text__c}" width="80%" rendered="{!NOT(ISBLANK(qr.Photo_2_Text__c))}" /></td></tr>
+ <table width="100%" border="0" cellspacing="0">
+ <tr><td style="height:300px; text-align: center;"><apex:image value="{!Photo_2_Text}" width="80%" rendered="{!NOT(ISBLANK(qr.Photo_2_Text__c))}" /></td></tr>
<tr><td style="height:40px;"></td></tr>
</table>
</td>
</tr>
<tr>
<td style="border-top-color: white;">
- <table width="100%" border="1" cellspacing="0">
- <tr><td style="height:300px; text-align: center;"><apex:image value="{!qr.Photo_3_Text__c}" width="80%" rendered="{!NOT(ISBLANK(qr.Photo_3_Text__c))}" /></td></tr>
+ <table width="100%" border="0" cellspacing="0">
+ <tr><td style="height:300px; text-align: center;"><apex:image value="{!Photo_3_Text}" width="80%" rendered="{!NOT(ISBLANK(qr.Photo_3_Text__c))}" /></td></tr>
<tr><td style="height:40px;"></td></tr>
</table>
</td>
<td style="border-left-color: white; border-top-color: white;">
- <table width="100%" border="1" cellspacing="0">
- <tr><td style="height:300px; text-align: center;"><apex:image value="{!qr.Photo_4_Text__c}" width="80%" rendered="{!NOT(ISBLANK(qr.Photo_4_Text__c))}" /></td></tr>
+ <table width="100%" border="0" cellspacing="0">
+ <tr><td style="height:300px; text-align: center;"><apex:image value="{!Photo_4_Text}" width="80%" rendered="{!NOT(ISBLANK(qr.Photo_4_Text__c))}" /></td></tr>
<tr><td style="height:40px;"></td></tr>
</table>
</td>
</tr>
</table>
+ </div>
+
</div>
</body>
@@ -489,16 +494,16 @@
AWSService.sfSessionId = '{!GETSESSIONID()}';
var staticResources = JSON.parse('{!staticResource}');
var staticResourceFile = JSON.parse('{!staticResourceFile}');
- function Fun(pdf){
+ 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": 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.attr({ "name": "base64Str" });
input.val(pdf.output('datauristring').substr(28));
form.append(input);
form.submit();
@@ -512,65 +517,126 @@
let id = "pdf-wrapper";
var target = document.getElementById(id);
- 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, {
- scale: 2,
- onrendered:function(canvas) {
- var contentWidth = canvas.width;
- var contentHeight = canvas.height;
-
- //涓�椤祊df鏄剧ずhtml椤甸潰鐢熸垚鐨刢anvas楂樺害;
- var pageHeight = contentWidth / 592.28 * 841.89;
- //鏈敓鎴恜df鐨刪tml椤甸潰楂樺害
- var leftHeight = contentHeight;
- //椤甸潰鍋忕Щ
- var position = 0;
- //a4绾哥殑灏哄[595.28,841.89]锛宧tml椤甸潰鐢熸垚鐨刢anvas鍦╬df涓浘鐗囩殑瀹介珮
- var imgWidth = 515.28;//595.28//宸﹀彸杈硅窛20
- var imgHeight = 515.28/contentWidth * contentHeight;//宸﹀彸杈硅窛20
-
- var pageData = canvas.toDataURL('image/jpeg', 1.0);
-
- var pdf = new jsPDF('', 'pt', 'a4');
-
- //鏈変袱涓珮搴﹂渶瑕佸尯鍒嗭紝涓�涓槸html椤甸潰鐨勫疄闄呴珮搴︼紝鍜岀敓鎴恜df鐨勯〉闈㈤珮搴�(841.89)
- //褰撳唴瀹规湭瓒呰繃pdf涓�椤垫樉绀虹殑鑼冨洿锛屾棤闇�鍒嗛〉
- if (leftHeight < pageHeight) {
- pdf.addImage(pageData, 'JPEG', 40, 0, imgWidth, imgHeight );//宸﹀彸杈硅窛20
- } else {
- while(leftHeight > 0) {
- pdf.addImage(pageData, 'JPEG', 40, position, imgWidth, imgHeight)//宸﹀彸杈硅窛20
- leftHeight -= pageHeight;
- position -= 841.89;
- //閬垮厤娣诲姞绌虹櫧椤�
- if(leftHeight > 0) {
- pdf.addPage();
- }
- }
- }
- Fun(pdf);
- }
- })
- }
+ // 鎶奿mageDta杞崲鎴恥rl
+ // page_height锛氫竴椤电殑楂樺害
+ function ImageDataToUrl(img_data,page_height){
+ let cvs = document.createElement("CANVAS");
+ cvs.width = img_data.width;
+ cvs.height = page_height;
+ var ctx= cvs.getContext("2d");
+ ctx.fillStyle="white";
+ ctx.fillRect(0,0,cvs.width,cvs.height);// 濉厖canvas鎵�鏈夊尯鍩熶负鐧借壊
+ ctx.putImageData(img_data,0,0);
+ return cvs.toDataURL('image/jpeg', 1.0);
+ }
+ function jsPdfDownload() {
- //blockme();
- document.body.onload = function(){
-
- AWSService.query(staticResources.queryUrl, '{!qr.AWS_Data_Id__c}', function(data){
- //unblockUI();
- document.getElementById("Responsible_Person_HP__c").innerHTML = data.object.responsiblePersonHP;
- document.getElementById("Caller_phone__c").innerHTML = data.object.callerPhone;
+ 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;
+ const marginh = 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) {
+ /**
+ 鏈柟娉曢渶瑕佸仛鍑犱釜浜嬫儏
+ 1.闇�瑕佹妸canvas鐨勫唴瀹瑰垎椤垫樉绀哄埌pdf鐨勯〉涓�
+ 2.canvas鐨勫楂橀渶瑕佸拰pdf鐨勫楂樿繘琛屾槧灏�
+ 3.鎴彇鍒扮殑鍐呭闇�瑕佹斁杩涗竴椤靛楂樼殑canvas閲岄潰锛屽苟瀵瑰叾浣欏尯鍩熷埛鐧�
+ */
+ var ctx = canvas.getContext("2d");
+ let canvas_max_page_num = 9;
+ let canvas_current_page_num = 0;
+ var contentWidth = canvas.width;
+ var contentHeight = canvas.height;
+
+
+ //鏈敓鎴恜df鐨刪tml椤甸潰楂樺害
+ var leftHeight = contentHeight;
+ //椤甸潰鍋忕Щ
+ var position = 0;
+
+ //a4绾哥殑灏哄[595.28,841.89]锛宧tml椤甸潰鐢熸垚鐨刢anvas鍦╬df涓浘鐗囩殑瀹介珮
+ var outputWidth = pw - 2 * marginw;//595.28//宸﹀彸杈硅窛20
+ let rate = outputWidth / 780;//杈撳嚭瀹藉害鍜屽唴瀹瑰搴︾殑姣斾緥
+ var outputHeight = ph - 2 * marginh;//宸﹀彸杈硅窛20
+ let onePdfPageInCanvasHeight = contentWidth/outputWidth*outputHeight;//涓�椤祊df鍦╟anvas涓殑楂樺害;
+ //var pageData = canvas.toDataURL('image/jpeg', 1.0);
+ var pageData = null;
+ var imgData = null;
+
+ var captureHeight = null;// 鎴彇鐨勫綋鍓峜anvas椤电殑楂樺害
+
+ let j = i;
+ while(position < contentHeight){
+
+ if (j++) {
+ pdf.addPage();
+ }
+
+ if(position+onePdfPageInCanvasHeight>contentHeight){
+ captureHeight = contentHeight-position;
+ }else{
+ captureHeight = onePdfPageInCanvasHeight;
+ }
+
+ imgData = ctx.getImageData(0,position,contentWidth,captureHeight);
+ pageData = ImageDataToUrl(imgData,onePdfPageInCanvasHeight);
+ pdf.addImage(pageData, 'JPEG', marginw, marginh, outputWidth, outputHeight);//宸﹀彸杈硅窛20,琚緭鍑虹殑鍥剧墖浼氳鎷変几涓簅utputWidth锛宱utputHeight鐨勫楂�
+ canvas_current_page_num++;
+ position += onePdfPageInCanvasHeight;
+ if (canvas_max_page_num > 0 && canvas_current_page_num >= canvas_max_page_num) {
+ break;
+ }
+ }
+
+ recursion(i + 1);
+ }
+ })
+ };
+ recursion(rei);
+
+
+
+ }
+
+ //blockme();
+ document.body.onload = function(){
- jsPdfDownload();
- }, staticResources.token);
+ AWSService.query(staticResources.queryUrl, '{!qr.AWS_Data_Id__c}', function(data){
+ //unblockUI();
+ document.getElementById("Responsible_Person_HP__c").innerHTML = data.object.responsiblePersonHP;
+ document.getElementById("Caller_phone__c").innerHTML = data.object.callerPhone;
+ if(confirm("PDF宸插姞杞藉畬姣曪紝鏄惁鏄剧ず锛�")){
+ jsPdfDownload();
+ }
+ }, staticResources.token);
+ }
- }
+
+
</script>
<!-- 20220221 PI鏀归�� by 寰愪寒 end -->
</html>
diff --git a/force-app/main/default/pages/SearchVisitor.page b/force-app/main/default/pages/SearchVisitor.page
index d754bb0..5e1f93c 100644
--- a/force-app/main/default/pages/SearchVisitor.page
+++ b/force-app/main/default/pages/SearchVisitor.page
@@ -203,6 +203,20 @@
}
}
+
+ function showPITR(obj){
+ var awsDataId = obj.childNodes[1].childNodes[2].value;
+ if(awsDataId.length == 1){
+ let sfId = j$(escapeVfId('Page:mainForm:idSearchVisitor:idAddVisitor:' + awsDataId + ':idAddHiddenId')).val()
+ awsDataId = sfIdToAWSIdMapValue.get(sfId);聽
+ }
+ if(contactInfo[awsDataId]){
+ document.getElementById(obj.childNodes[1].childNodes[0].id).innerText = contactInfo[awsDataId].lastName;
+ document.getElementById(obj.childNodes[3].childNodes[0].id).innerText = contactInfo[awsDataId].doctorDivision1;
+ document.getElementById(obj.childNodes[4].childNodes[0].id).innerText = contactInfo[awsDataId].phone;
+ }
+ }
+
function hidePIDiv(obj){
document.getElementById(obj.id+'_PI').remove();
}
@@ -437,7 +451,7 @@
<tr>
<td>
<div id="iframelike">
- <apex:pageBlockTable id="idRezultVisitor" value="{!scwl}" var="scw" border="1" columns="8" columnsWidth="47px,90px,,90px,180x,90px,40px,200px">
+ <apex:pageBlockTable id="idRezultVisitor" value="{!scwl}" var="scw" onRowMouseOver="showPITR(this)" border="1" columns="8" columnsWidth="47px,90px,,90px,180x,90px,40px,200px">
<apex:column >
<apex:facet name="header">{!$Label.Selected}</apex:facet>
<input type="button" id="idSlt" value="{!$Label.Selected}" onclick="sltContact('{!scw.index}');" class="btn" style="width:40px"/>
@@ -446,6 +460,7 @@
<apex:facet name="header">{!$Label.Visitor_Name}</apex:facet>
<apex:outputLink onmouseover="showPIDiv('{!scw.con.AWS_Data_Id__c}',this)" onmouseout="hidePIDiv(this)" value="/{!scw.con.Id}" id="idName" target="_blank">{!scw.con.Name}</apex:outputLink>
<apex:inputText id="idHiddenId" value="{!scw.conid}" style="display:none" />
+ <apex:inputText id="AWSDataId" value="{!scw.con.AWS_Data_Id__c}" style="display:none" />
</apex:column>
<apex:column >
<apex:facet name="header">{!$Label.Department_Name}</apex:facet>
@@ -486,7 +501,7 @@
<tr>
<td>
<div id="iframelike2">
- <apex:pageBlockTable id="idAddVisitor" value="{!acwl}" var="acw" border="1" columns="7" columnsWidth="47px,90px,,90px,180x,90px,40px">
+ <apex:pageBlockTable id="idAddVisitor" value="{!acwl}" var="acw" border="1" columns="7" onRowMouseOver="showPITR(this)" columnsWidth="47px,90px,,90px,180x,90px,40px">
<apex:column >
<apex:facet name="header">{!$Label.Back}</apex:facet>
<input type="button" id="idDel" value="{!$Label.Back}" onclick="delContact('{!acw.index}');" class="btn" style="width:40px"/>
@@ -496,6 +511,7 @@
<!-- <apex:outputText id="idAddName" value="{!IF(acw.con.Name==null,'銆�',acw.con.Name)}" /> -->
<apex:outputLink onmouseover="showPIDiv('{!acw.index}',this)" onmouseout="hidePIDiv(this)" value="/{!acw.conid}" id="idAddName" target="_blank">{!IF(acw.con.Name==null,'銆�',acw.con.Name)}</apex:outputLink>
<apex:inputText id="idAddHiddenId" value="{!acw.conid}" style="display:none" />
+ <apex:inputText id="AWSDataId" value="{!acw.index}" style="display:none" />
</apex:column>
<apex:column >
<apex:facet name="header">{!$Label.Department_Name}</apex:facet>
diff --git a/force-app/main/default/pages/StraightBackAddress.page b/force-app/main/default/pages/StraightBackAddress.page
index fe52d01..64926a3 100644
--- a/force-app/main/default/pages/StraightBackAddress.page
+++ b/force-app/main/default/pages/StraightBackAddress.page
@@ -424,6 +424,30 @@
rc.address_ZipCode__c=addressAwsData[address.AWS_Data_Id__c].zipCode;
}
+ let GetAsset = function(){
+ let ast = new sforce.SObject('Asset');
+ ast.Id = '{!pc.Delivered_Product__c}',
+ ast.address_Contacts__c= contactsName,
+ ast.address_ZipCode__c = address.ZipCode__c,
+ ast.address_City__c = cityName,
+ ast.address_Telephone__c = address.Telephone__c,
+ ast.address_Contacts_Name__c = ContactPerson,
+ ast.Detailed_Address__c= address_str
+ if (addressAwsData.hasOwnProperty(address.AWS_Data_Id__c)) {
+ ast.address_ZipCode__c=addressAwsData[address.AWS_Data_Id__c].zipCode;
+ ast.address_Telephone__c=addressAwsData[address.AWS_Data_Id__c].telephone;
+ }
+ return ast;
+ }
+
+ //淇濆瓨鏁版嵁鍒颁繚鏈夎澶囪〃涓�
+ let UpdateAsset = function(){
+ let ast = GetAsset();
+ let result = sforce.connection.update([ast]);
+ let b = result[0].getBoolean('success');
+ return b;
+ }
+
let UpdateRepair = function(callback){
AWSService.post(staticResourceRepair.updateUrl,[{
dataId:'{!pc.AWS_Data_Id__c}',
@@ -446,7 +470,43 @@
rc.Detailed_Address__c = data.object[0].detailedAddress;
rc.Detailed_Address_Encrypt__c = data.object[0].detailedAddressEncrypt;
- UpdateSobject(staticResourceRepair,rc,data.txId,callback);
+ //UpdateSobject(staticResourceRepair,rc,data.txId,callback);
+ Visualforce.remoting.Manager.invokeAction(
+ 'StraightBackAddressController.SaveEx',
+ JSON.stringify(rc), JSON.stringify(GetAsset()), address.Id,
+ function (result, event) {
+
+ let message = '';
+ if (event.status) {
+ if (result) {
+ message = result;
+ }else{
+ }
+ }else{
+ }
+ let tobj = {
+ txId: data.txId
+ };
+ if(message) {
+ console.log('call sf to insert log');
+ tobj.isSuccess = 0;
+ }else {
+ console.log('call sf Log Id: ' + rc.id);
+ tobj.sfRecordId = rc.id;
+ tobj.isSuccess = 1;
+ }
+
+ AWSService.post(staticResource.transactionUrl,tobj,function(data){
+ if (message) {
+ ub();
+ alert(message);
+ }else{
+ window.location.href = '/{!RepairId}';
+ }
+ },staticResource.token);
+ },
+ { escape: true }
+ );
}else{
alert('AWS鏇存柊淇悊澶辫触');
ub();
@@ -454,24 +514,7 @@
},staticResourceRepair.token)
}
- //淇濆瓨鏁版嵁鍒颁繚鏈夎澶囪〃涓�
- let UpdateAsset = function(){
- let ast = new sforce.SObject('Asset');
- ast.Id = '{!pc.Delivered_Product__c}',
- ast.address_Contacts__c= contactsName,
- ast.address_ZipCode__c = address.ZipCode__c,
- ast.address_City__c = cityName,
- ast.address_Telephone__c = address.Telephone__c,
- ast.address_Contacts_Name__c = ContactPerson,
- ast.Detailed_Address__c= address_str
- if (addressAwsData.hasOwnProperty(address.AWS_Data_Id__c)) {
- ast.address_ZipCode__c=addressAwsData[address.AWS_Data_Id__c].zipCode;
- ast.address_Telephone__c=addressAwsData[address.AWS_Data_Id__c].telephone;
- }
- let result = sforce.connection.update([ast]);
- let b = result[0].getBoolean('success');
- return b;
- }
+
let UpdateAddress = function(){
@@ -485,6 +528,8 @@
}
b();
+ UpdateRepair();
+ /*
UpdateRepair(function(data){
if (data.isSuccess) {
let b = UpdateAsset();
@@ -505,7 +550,7 @@
ub();
alert('SF鏇存柊淇悊澶辫触');
}
- })
+ })*/
//椤甸潰閲嶅畾鍚�
//return redirectPag();
@@ -827,10 +872,10 @@
<apex:param name="addressDataIds" assignTo="{!addressDataIds}" value=""></apex:param>
</apex:actionFunction>
<!-- 閲囩敤鏂规硶 -->
- <apex:actionFunction name="adoptSave" action="{!adoptSave}" rerender="oppBlock2,message" onComplete="ub();">
+ <!--<actionFunction name="adoptSave" action="{!adoptSave}" rerender="oppBlock2,message" onComplete="ub();">
<apex:param name="adoptId" assignTo="{!adoptId}" value="" />
<apex:param name="isUpload" assignTo="{!isUpload}" value="" />
- </apex:actionFunction>
+ </actionFunction>-->
<!-- 淇濆瓨鍜屼慨鏀规柟娉� -->
<apex:actionFunction name="save" action="{!save}" rerender="oppBlock2,message" onComplete="ub();Trans()"></apex:actionFunction>
<!-- 鐐瑰嚮淇敼鎸夐挳鑾峰彇淇敼鏁版嵁鏂规硶 -->
diff --git a/force-app/main/default/pages/XinDailyReport.page b/force-app/main/default/pages/XinDailyReport.page
index 04f2664..07d4934 100644
--- a/force-app/main/default/pages/XinDailyReport.page
+++ b/force-app/main/default/pages/XinDailyReport.page
@@ -80,6 +80,34 @@
searchPayload.contactName = '';
return JSON.stringify(searchPayload);
}
+
+ function refreshContactAll(){
+ let contactIdsFromSF = [];
+ // let allSizeForAct =document.getElementById('Page:mainForm:idDayEdit:AllSize').value;
+ let allSizeForAct = j$(escapeVfId('idActSize')).value();
+ console.log('allSizeForAct:'+allSizeForAct);
+ for(let i=0;i<allSizeForAct;i++){
+ for(let j=1;j<6;j++){
+ let contactIdForVis = document.getElementById("Page:mainForm:idDayEdit:idActivities:"+i+":idVisitor"+j+"_IdHidden").value;
+ contactIdsFromSF.push(contactIdForVis);
+ }
+ };
+ sforce.connection.sessionId = '{!GETSESSIONID()}';
+ var condition = '';
+ for(var i=0;i<contactIdsFromSF.length;i++){
+ if(contactIdsFromSF[i] != ''){
+ condition += "," + "\'"+contactIdsFromSF[i]+"\'";
+ }
+ }
+ condition = condition.substr(1);
+ console.log('condition = ' + condition);
+ var record = sforce.connection.query("select AWS_Data_Id__c from Contact where id in("+condition+")");
+ var records = record.getArray("records");
+ for(var i =0;i<records.length;i++){
+ contactAWSIds.push(records[i].AWS_Data_Id__c);
+ }
+ searchContactAll();
+ }
function searchContactAll(){
let data = preparePayloadForSearchContact();
let searchCallBack = function searchCallBack(result){
@@ -95,7 +123,8 @@
}
}
console.log('AWS Result:'+JSON.stringify(sfIdToContactInfo));
- let allSizeForAct =document.getElementById('Page:mainForm:idDayEdit:AllSize').value;
+ // let allSizeForAct =document.getElementById('Page:mainForm:idDayEdit:AllSize').value;
+ let allSizeForAct = j$(escapeVfId('idActSize')).value();
console.log('Act size:'+allSizeForAct);
for(let i=0;i<allSizeForAct;i++){
for(let j=1;j<6;j++){
@@ -105,7 +134,9 @@
if(sfIdToContactInfo.hasOwnProperty(contactIdForVis)){
document.getElementById("Page:mainForm:idDayEdit:idActivities:"+i+":idVisitor"+j).value = sfIdToContactInfo[contactIdForVis].lastName;
}
- }
+ }else{
+ document.getElementById("Page:mainForm:idDayEdit:idActivities:"+i+":idVisitor"+j).value = '';
+ }
}
}
};
@@ -1624,7 +1655,7 @@
<td> </td>
<td><apex:commandButton value="{!$Label.Add_Line}" id="idAddAct" action="{!addActivity}"
reRender="Activities,idAddActPanel" onClick="blockme();"
- onComplete="bindAllDoubleTap();setVisitorPlaceDisabled();unblockUI();initSetPage();"
+ onComplete="bindAllDoubleTap();setVisitorPlaceDisabled();unblockUI();initSetPage();refreshContactAll();"
style="width:100px;display:{!IF(actSize>14,'none','')}"/></td>
<th> </th>
<td> </td>
--
Gitblit v1.9.1