PIPLDeploy0320

Li Jun

2022-03-20 db4e75dabb6c61be6c3a09e9f11707f6018c2ef2

PIPLDeploy0320

 force-app/main/default/aura/NewAgencyContact/NewAgencyContactController.js

@@ -125,6 +125,13 @@
                    }

                    if (item.behavior == "Required" && !item.value ) {
                        let fs = component.find("field");
                        for(let fi in fs){
                            let f = fs[fi];
                            if(!f.get('v.value')){
                                f.reset();
                            }
                        }
                        return;
                    }
                }

 force-app/main/default/classes/NewAndEditInquiryFormController.cls

@@ -36,6 +36,48 @@
        return save(new Inquiry_form__c(),leadJson,transId,isNew);
    }

    @RemoteAction
    global static String queryAccount(String accountTypes,String accountId) {
        System.debug('accountType='+accountTypes);
        System.debug('accountId='+accountId);
        List<Object> types = (List<Object>)JSON.deserializeUntyped(accountTypes);
        System.debug('types='+types);
        String soql = 'select Id,Name,';
        for (Object t : types) {
            soql += (String)t+',';
        }
        soql = soql.substring(0,soql.length()-1);
        soql += ' from Account where id=\''+accountId+'\'';
        System.debug('soql='+soql);
        Sobject account = Database.query(soql);

        Map<String, Map<String, String>> m = new Map<String, Map<String, String>>();
        
        System.debug('account='+account);
        for (Object ty : types) {
            String t = (String)ty;
            if (account.get(t) != null){
                Sobject acc = Database.query('select Id,Name from Account where id=\''+account.get(t)+'\'');
                Map<String, String> n = new Map<String, String>();
                n.put('Id', (String)acc.get('Id'));
                n.put('Name', (String)acc.get('Name'));
                m.put(t, n);
            }
        }
        // if (account.get('Hospital__c') != null){
        //     m.put('Hospital__c', (String)account.get('Hospital__c'));
        //     m.put('Hospital__r.Name', (String)account.get('Hospital__r.Name'));
        // }
        // if (account.get('Department_Class__c') != null){
        //     m.put('Department_Class__c', (String)account.get('Department_Class__c'));
        //     m.put('Department_Class__r.Name', (String)account.get('Department_Class__r.Name'));
        // }
        System.debug('m='+m);
        return JSON.serialize(m);

        // return (String)account.get('Hospital__c');
    }

    private void checkUrl(String urlStr, String sobjType){
        Map<String, String> urlFieldMap = new Map<String, String>();
        urlFieldMap = ApexPages.currentPage().getParameters();

 force-app/main/default/classes/StraightBackAddressController.cls

@@ -68,6 +68,12 @@
    public String addressDataIds{set;get;} 
    // Add by Li Jun for PIPL 20220308 End

    public String accRecordTypeId {set;get;}//当前 记录类型id 

    public String accOfficeTypeId {set;get;}//记录类型id  办事处
    public String accAgencyTypeId {set;get;}//记录类型id  販売店
    public String accAgencyContactTypeId {set;get;}//记录类型id  经销商联系人

    public StraightBackAddressController() {
        //获取url数据
        RepairId = System.currentPageReference().getParameters().get('id');
@@ -100,6 +106,9 @@
     * 开始方法
     */
    public PageReference init(){
        accOfficeTypeId = Schema.SObjectType.Account.getRecordTypeInfosByDeveloperName().get('Office').getRecordTypeId();
        accAgencyTypeId = Schema.SObjectType.Account.getRecordTypeInfosByDeveloperName().get('Agency').getRecordTypeId();
        accAgencyContactTypeId = Schema.SObjectType.Account.getRecordTypeInfosByDeveloperName().get('AgencyContact').getRecordTypeId();
        String RepairSql = makeTextRepairSql(RepairId);
        try{
            pc = Database.query(RepairSql);
@@ -147,7 +156,19 @@
        newCon = new Contact();
        return null;
    }

    //查询客户记录类型
    public PageReference queryRecordType(){
        if(insUpdData.Customer__c!=null){
            String accid = insUpdData.Customer__c;
            Account acc = [SELECT id,name,RecordTypeId FROM Account WHERE id =: accid];
            System.debug('acc---'+acc);
            System.debug('insUpdData---'+insUpdData);
            if(acc!=null&&acc.RecordTypeId!=null&&insUpdData.Customer__c!=null){
                accRecordTypeId = acc.RecordTypeId;
            }
        }
        return null;
    }
    //编辑获取数据
    public PageReference onEditor(){
        if(!String.isBlank(UpdId)){
@@ -494,7 +515,12 @@
                            surname = surname.substring(0,1);
                        }
                        System.debug('newCon = '+newCon);
                        addContact = new Contact(LastName=surname,FirstName=monicker,AccountId=insUpdData.Customer__c,RecordTypeId=typeL,AWS_Data_Id__c = newCon.AWS_Data_Id__c,LastName_Encrypted__c=newCon.LastName_Encrypted__c);
                        addContact = new Contact(LastName = surname,
                                                FirstName = monicker,
                                                AccountId = insUpdData.Customer__c,
                                                RecordTypeId = typeL,
                                                AWS_Data_Id__c = newCon.AWS_Data_Id__c,
                                                LastName_Encrypted__c = newCon.LastName_Encrypted__c);
                        try{
                            //新增一条联系人数据
                            insert addContact;
@@ -558,7 +584,7 @@
    }
    //查询地址表数据
    private String makeTextAddressSql(String typeSearchId) {
        String AddressSql = 'SELECT AWS_Data_Id__c,ID,Address_Classification__c,Customer__c,Customer__r.Name,Contacts__c,Contacts__r.Name,Contacts__r.AWS_Data_Id__c,Telephone__c'
        String AddressSql = 'SELECT AWS_Data_Id__c,ID,Address_Classification__c,Customer__c,Customer__r.Name,Customer__r.Type,Customer__r.RecordTypeId,Contacts__c,Contacts__r.Name,Contacts__r.AWS_Data_Id__c,Telephone__c'
                        +',Province__c,Province__r.Name,City__c,City__r.name,Detailed_Address__c,Create_Contacts__c,ZipCode__c,CreatedByid,Detailed_Address_Encrypted__c,Telephone_Encrypted__c,ZipCode_Encrypted__c,Contacts__r.LastName_Encrypted__c'
                        + ' FROM Address__c where id != null';
        //类型筛选

 force-app/main/default/pages/ConsumTrial.page

@@ -400,6 +400,7 @@
                createDiv.style.background="#dddddd";
                createDiv.style.position = "absolute";
                parentNode.appendChild(createDiv);  
                parentNode.style.position = "relative";
            }

            function hidePIDiv(awsDataId){

 force-app/main/default/pages/NewAndEditASEActivity.page

@@ -1,10 +1,3 @@
<!--
  @description       : 
  @author            : ChangeMeIn@UserSettingsUnder.SFDoc
  @group             : 
  @last modified on  : 03-17-2022
  @last modified by  : ChangeMeIn@UserSettingsUnder.SFDoc
-->
<apex:page standardController="ASEActivity__c" extensions="NewAndEditASEActivityController" id="page">
    <apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
    <script src="../../soap/ajax/53.0/connection.js" type="text/javascript"></script>
@@ -26,6 +19,7 @@
            SaveAndNew:false,
            AWSToSobjectMap:{!AWSToSobjectMapJson},
            AWSToSobjectNonEncryptedMap:{!AWSToSobjectNonEncryptedMapJson},
            AWSToSobjectNonEncryptedMapKeySet:{!AWSToSobjectNonEncryptedMapKeySet},
            AWSToSobjectEncryptedMap:{!AWSToSobjectEncryptedMapJson},
            SobjectToAWSModel:function (sobjJson) {
                let leadPayloadList = [];
@@ -117,7 +111,7 @@
                            
                        }
                        else{
                            console.log(f + 'is not in data.object');
                            console.log(f + ' is not in data.object');
                        }
                    }
                }
@@ -141,6 +135,7 @@
        var staticResourcesContact = JSON.parse('{!staticResourceContact}');
        console.log('{!staticResource}');
        var VLookUpFields = {! VLookUpFieldsJson};
               
        function ProcessPI(sobjJson, payloadForNewPI) {
            blockme();
            if ({!isNewMode}) {
@@ -166,8 +161,15 @@
            return '';
        }

        function IsFormElement(tag_name){
            return ['input','select','textarea'].indexOf(tag_name)>-1;
        function IsFormTag(tag_name){
            if (!tag_name) {
                return false;
            }
            return ['input','select','textarea'].indexOf(tag_name.toLowerCase())>-1;
        }
        
        function IsFormElement(e){
            return IsFormTag(e.tagName);
        }

        function getPIPayload(sobjJson) {
@@ -188,7 +190,7 @@
            if(phone ){
                if(phone.value){
                    if(!/^1[3|5|8|7][0-9]\d{4,8}$/.test(phone.value)){
                        error_msg += ';电话号码错误';
                        error_msg += ';电话号码错误';
                    }
                }else{
                    if(phone.previousSibling && phone.previousSibling.className.indexOf('requiredBlock')>-1){
@@ -220,11 +222,12 @@

            let nodelist = document.getElementsByClassName(config.ApiPrefix);
            let result = {}
            for (let index = 0; index < nodelist.length; index++) {
                let ele = nodelist[index];
                let field_api_name = GetEleApiName(ele);
            for (let index in api_id_map) {
                let ele = document.getElementById(api_id_map[index]);
                
                let field_api_name = index;
                let tag_name = ele.tagName.toLowerCase();
                if(!IsFormElement(tag_name)){
                if(!IsFormTag(tag_name)){
                    console.log('tag_name='+tag_name+',field_api_name'+field_api_name+' is not a form element');
                    continue;
                }
@@ -521,6 +524,20 @@
                </apex:pageBlockSection>
            </apex:repeat>
            <script>
                var init_nodes = document.getElementsByClassName("PIBackApi");
                var api_id_map={};
                for(let ei in init_nodes){
                    let e = init_nodes[ei];
                    if(IsFormElement(e)){
                        if(e.getAttribute("multiple") != 'multiple' || e.style.display == 'none' && e.id.indexOf('selected') < 0){
                            api_id_map[GetEleApiName(e)] = e.id;
                        }
                	 
                    }
                }
                console.log(api_id_map);

                
                sfdcPage.appendToOnloadQueue(function () {
                    var layoutSections = JSON.parse('{!layoutSectionsStr}');
                    for (let m = 0; m < layoutSections.length; m++) {
@@ -566,10 +583,10 @@
                        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');
                            input.value = '';
                            let hidden = document.getElementById(id+'_lkid');
                            if(hidden){
                                hidden.value = '';
                                hidden.value = '';
                            }
                        }
                    });

 force-app/main/default/pages/NewAndEditInquiryForm.page

@@ -425,15 +425,7 @@
        function queryContactName() {
            let sfId = document.getElementById(document.querySelector("[data-id='Contact_Name__c']").id + '_lkid').value;
            let contactsInfo = JSON.parse('{!LookUpOverrideFieldsMapJson}');
            // if (contactsInfo == null){
            //     contactsInfo = JSON.parse('{!urlCheckContactAWSid}');
            // }
            let dataId = contactsInfo[sfId];
            // let dataId = JSON.parse('{!urlCheckContactAWSid}')
            // if (dataId == '') {
            //     let contactsInfo = JSON.parse('{!LookUpOverrideFieldsMapJson}');
            //     dataId = contactsInfo[sfId];
            // }
            let queryContactBack = function(data){
                //To Do later
                console.log('ContactData = ' + data.object);
@@ -518,7 +510,6 @@
            //     document.querySelector("[data-id='Lead_link__c']").value = result.object.lastName;
            // })
        }
        
    </script>
    <div class="bPageTitle">
        <div class="ptBody">
@@ -653,7 +644,88 @@
                            }
                        }
                    });

                    let eleHospitalName = document.querySelector("[data-id='Hospital_Name__c']");
                    let vlook_HospitalName = document.getElementById(eleHospitalName.id + '_lkid');
                    
                    // let eleInput = eleHospitalName.parentNode.childNodes[0];
                    // let eleImg = eleHospitalName.parentNode.childNodes[1];
                    // let eleBlank = eleHospitalName.parentNode.childNodes[2];


                    if("\v"=="v"){//true为IE浏览器  
                        vlook_ele.attachEvent("onporpertychange",function(e){
                            console.log("inputting!!");
                        });
                    }else{
                        eleHospitalName.parentNode.addEventListener("click",function(e){
                            console.log("inputting!!");
                            var hospitalNameValue = vlook_HospitalName.value;
                            if (hospitalNameValue != "000000000000000" && hospitalNameValue != '') {
                                console.log("hospitalNameValue = " + hospitalNameValue);

                                var ls = ['Department_Class__c','Hospital__c'];
                                setVlookup(ls,hospitalNameValue);
                            }else{
                                clearVlookup('Department_Class__c');
                                clearVlookup('Hospital__c');
                            }
                        });
                    }
                });

                function setVlookup(lookups, lookup_id){
                    let controllerSaveMethod = '{!$RemoteAction.NewAndEditInquiryFormController.queryAccount}';
                    Visualforce.remoting.Manager.invokeAction(
                        controllerSaveMethod, 
                        JSON.stringify(lookups), lookup_id,
                        function (result, event) {
                            console.log("result = " + result);
                            if (result != null ){
                                var obj = JSON.parse(result.replaceAll('&'+'quot;','"'));
                                for (let i = 0; i < lookups.length; i++) {
                                    let lookup = lookups[i];
                                    if (!obj[lookup]) {
                                        continue;
                                    }
                                    let ele = document.querySelector("[data-id='"+lookup+"']");
                                    let elei1 = document.getElementById(ele.id + '_lkid');
                                    let elei2 = document.getElementById(ele.id + '_lkold');

                                    ele.value=obj[lookup].Name;
                                    elei1.value = obj[lookup].Id;
                                    elei2.value = obj[lookup].Name;

                                    let inputele = document.querySelector("[data-id='"+lookup+"']").parentNode;
                                    if (inputele.childNodes.length > 4){
                                        inputele.childNodes[0].style = "";
                                        inputele.childNodes[1].style = "display: inline-block;";
                                        inputele.childNodes[2].style = "display: none;";
                                    }

                                }
                            }
                        },
                        { escape: true }
                    );
                }

                function clearVlookup(lookup){
                    let ele = document.querySelector("[data-id='"+lookup+"']");
                    let elei1 = document.getElementById(ele.id + '_lkid');
                    let elei2 = document.getElementById(ele.id + '_lkold');

                    ele.value='';
                    elei1.value = '';
                    elei2.value = '';

                    let inputele = document.querySelector("[data-id='"+lookup+"']").parentNode;
                    if (inputele.childNodes.length > 4){
                        inputele.childNodes[0].style = "display: none;";
                        inputele.childNodes[1].style = "display: none;";
                        inputele.childNodes[2].style = "";
                    }
                }
            </script>
            <div class="pbBottomButtons">
                <table cellspacing="0" cellpadding="0" border="0">

 force-app/main/default/pages/NewAndEditRepairSubOrder.page

@@ -26,6 +26,7 @@
            SaveAndNew:false,
            AWSToSobjectMap:{!AWSToSobjectMapJson},
            AWSToSobjectNonEncryptedMap:{!AWSToSobjectNonEncryptedMapJson},
            AWSToSobjectNonEncryptedMapKeySet:{!AWSToSobjectNonEncryptedMapKeySet},
            AWSToSobjectEncryptedMap:{!AWSToSobjectEncryptedMapJson},
            SobjectToAWSModel:function (sobjJson) {
                let leadPayloadList = [];
@@ -192,7 +193,7 @@
            if(phone ){
                if(phone.value){
                    if(!/^1[3|5|8|7][0-9]\d{4,8}$/.test(phone.value)){
                        error_msg += ';电话号码错误';
                        error_msg += ';电话号码错误';
                    }
                }else{
                    if(phone.previousSibling && phone.previousSibling.className.indexOf('requiredBlock')>-1){
@@ -617,10 +618,10 @@
                        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');
                            input.value = '';
                            let hidden = document.getElementById(id+'_lkid');
                            if(hidden){
                                hidden.value = '';
                                hidden.value = '';
                            }
                        }
                    });

 force-app/main/default/pages/NewAndEditTenderinformation.page

@@ -222,8 +222,9 @@
                        targets.push(ele.selectedOptions[i].value);
                    }
                    //targets = targets.replace(/\n/g, ";");
                    console.log('targets = ' + targets);
                    result[field_api_name] = targets.join(";");
                    if (targets !=''){
                        result[field_api_name] = targets.join(";");
                    }
                } else {
                    result[field_api_name] = ele.value;
                }
@@ -404,6 +405,16 @@
            </apex:repeat>
            <script>
                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);
                            }
                        }
                    }
                    //1. Set Last Name label
                    //document.querySelector("[data-id='LastName']").parentNode.parentNode.parentNode.children[2].children[0].innerText = '姓名';
                    //2. Query AWS Data by dataId 
@@ -424,16 +435,7 @@
                            oi.value = '{!CurrentUserId}'
                        }
                    }  
                    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);
                            }
                        }
                    }
                    
                    jQuery(".lookupInput").each(function(i,e){
                        let je =jQuery(e).find('input');
                        je.attr("readonly","");

 force-app/main/default/pages/NewConsumApply.page

@@ -2,7 +2,7 @@
  @description       : 
  @author            : ChangeMeIn@UserSettingsUnder.SFDoc
  @group             : 
  @last modified on  : 03-17-2022
  @last modified on  : 03-18-2022
  @last modified by  : ChangeMeIn@UserSettingsUnder.SFDoc
-->
<apex:page standardController="Consum_Apply__c" extensions="NewConsumApplyController" id="page">
@@ -264,21 +264,33 @@
            return template.content.firstChild;
        }
        function queryContactName() {
            // let sfId = document.getElementById(document.querySelector("[data-id='Account__c']").id + '_lkid').value;
            // let contactsInfo = JSON.parse('{!contactsInfo}');
            // let dataId = contactsInfo[sfId];
            // let url = staticResourcesContact.queryUrl + '?dataId=' + dataId;
            // fetch(url, {
            //     method: 'GET',
            //     headers: {
            //         'Content-Type': 'application/json',
            //         'pi-token': staticResources.token
            //     }
            // }).then((data) => {
            //     return data.json();
            // }).then((result) => {
            //     document.querySelector("[data-id='Loaner_medical_Staff__c']").value = result.object.lastName;
            // })
            let sfId = document.getElementById(document.querySelector("[data-id='Account__c']").id + '_lkid').value;
            let contactsInfo = JSON.parse('{!contactsInfo}');
            let dataId = contactsInfo[sfId];
            let url = staticResourcesContact.queryUrl + '?dataId=' + dataId;
            fetch(url, {
                method: 'GET',
                headers: {
                    'Content-Type': 'application/json',
                    'pi-token': staticResources.token
                }
            }).then((data) => {
                return data.json();
            }).then((result) => {
            let dataId = '';
            if ('{!contactsInfo}' != '') {
                let contactsInfo = JSON.parse('{!contactsInfo}');
                dataId = contactsInfo[sfId];
            } else if ('{!AWSDataId}' != '') {
                dataId = '{!AWSDataId}';
            }
            let queryBackContactName = function queryBackContactName(result){
                document.querySelector("[data-id='Loaner_medical_Staff__c']").value = result.object.lastName;
            })
            };
            AWSService.query(staticResourcesContact.queryUrl, dataId, queryBackContactName, staticResourcesContact.token);
        }
        //自定义lookup查询
        function searchContact(contactNodeId){

 force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page

@@ -2,7 +2,7 @@
  @description       : 
  @author            : ChangeMeIn@UserSettingsUnder.SFDoc
  @group             : 
  @last modified on  : 03-17-2022
  @last modified on  : 03-18-2022
  @last modified by  : ChangeMeIn@UserSettingsUnder.SFDoc
-->
<apex:page standardController="Consum_Apply_Equipment_Set_Detail__c" extensions="NewConsumApplyEquipSetDetailController" id="page">
@@ -55,7 +55,7 @@
            console.log('Result from AWS' + JSON.stringify(r));
            console.log('payloadJson=' + JSON.stringify(payloadJson));
            payloadJson.Trial_User__c = r.object[0].trialUser;
            payloadJson.Trail_User_Encrypt__c = r.object[0].trialUserEncrypt;
            payloadJson.Trial_User_Encrypt__c = r.object[0].trialUserEncrypt;
            payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
            if (isNewMode) {
                payloadJson.AWS_Data_Id__c = r.object[0].dataId;

 force-app/main/default/pages/NewRentalApply.page

@@ -2,7 +2,7 @@
  @description       : 
  @author            : ChangeMeIn@UserSettingsUnder.SFDoc
  @group             : 
  @last modified on  : 03-17-2022
  @last modified on  : 03-18-2022
  @last modified by  : ChangeMeIn@UserSettingsUnder.SFDoc
-->
<apex:page standardController="Rental_Apply__c" extensions="RentalApplyController" id="page">
@@ -251,22 +251,20 @@
            return template.content.firstChild;
        }
        function queryContactName() {
            // let sfId = document.getElementById(document.querySelector("[data-id='Loaner_medical_Staff__c']").id + '_lkid').value;
            function queryContactName() {
            let sfId = document.getElementById(document.querySelector("[data-id='Account__c']").id + '_lkid').value;
            let contactsInfo = JSON.parse('{!contactsInfo}');
            let dataId = contactsInfo[sfId];
            let url = staticResourcesContact.queryUrl + '?dataId=' + dataId;
            fetch(url, {
                method: 'GET',
                headers: {
                    'Content-Type': 'application/json',
                    'pi-token': staticResources.token
                }
            }).then((data) => {
                return data.json();
            }).then((result) => {
            let dataId = '';
            if ('{!contactsInfo}' != '') {
                let contactsInfo = JSON.parse('{!contactsInfo}');
                dataId = contactsInfo[sfId];
            } else if ('{!AWSDataId}' != '') {
                dataId = '{!AWSDataId}';
            }
            let queryBackContactName = function queryBackContactName(result){
                document.querySelector("[data-id='Loaner_medical_Staff__c']").value = result.object.lastName;
            })
            };
            AWSService.query(staticResourcesContact.queryUrl, dataId, queryBackContactName, staticResourcesContact.token);
        }
        }
        //自定义lookup查询
        function searchContact(contactNodeId){

 force-app/main/default/pages/NewRepair.page

@@ -2,7 +2,7 @@
  @description       : 
  @author            : ChangeMeIn@UserSettingsUnder.SFDoc
  @group             : 
  @last modified on  : 03-17-2022
  @last modified on  : 03-19-2022
  @last modified by  : ChangeMeIn@UserSettingsUnder.SFDoc
-->
<apex:page standardController="Repair__c" extensions="NewRepairController" id="page">
@@ -19,6 +19,8 @@
    </style>
    <script>
        //Initial Required Information
        var staticResourceContact = JSON.parse('{!staticResourceContact}');
        var staticResourceAddress = JSON.parse('{!staticResourceAddress}');
        var staticResources = JSON.parse('{!staticResource}');
        var requiredFieldAPIList = JSON.parse('{!requiredFieldAPIListStr}');
        var fieldAPIToLabelMap = JSON.parse('{!fieldAPIToLabelMapStr}');
@@ -41,16 +43,16 @@
        }

        //Query Required Parameter
        var queryBack = function queryBack(data) {
            console.log('data = ' + data);
            document.querySelector("[data-id='address_Contacts__c']").value = data.object.addressContacts;
            document.querySelector("[data-id='address_Contacts_Name__c']").value = data.object.addressContactsName;
            document.querySelector("[data-id='address_Telephone__c']").value = data.object.addressTelephone;
            document.querySelector("[data-id='address_ZipCode__c']").value = data.object.addressZipCode;
            document.querySelector("[data-id='Detailed_Address__c']").value = data.object.detailedAddress;
            document.querySelector("[data-id='RepairApplicant__c']").value = data.object.repairApplicant;
            unblockUI();
        };
        // var queryBack = function queryBack(data) {
        //     console.log('data = ' + data);
        //     document.querySelector("[data-id='address_Contacts__c']").value = data.object.addressContacts;
        //     document.querySelector("[data-id='address_Contacts_Name__c']").value = data.object.addressContactsName;
        //     document.querySelector("[data-id='address_Telephone__c']").value = data.object.addressTelephone;
        //     document.querySelector("[data-id='address_ZipCode__c']").value = data.object.addressZipCode;
        //     document.querySelector("[data-id='Detailed_Address__c']").value = data.object.detailedAddress;
        //     document.querySelector("[data-id='RepairApplicant__c']").value = data.object.repairApplicant;
        //     unblockUI();
        // };

        //Check If Insert Or Update
        var insertOrUpdateBack = function insertOrUpdateBack(payloadJson, result, isNewMode) {
@@ -167,6 +169,27 @@
            AWSService.query(staticResources.queryUrl, '{!AWSDataId}', queryBack, staticResources.token);
        }

        var queryBack = function queryBack(data) {
                    console.log(data);
                    document.querySelector("[data-id='address_Contacts__c']").innerHTML = data.object.addressContacts;
                    document.querySelector("[data-id='address_Contacts_Name__c']").innerHTML = data.object.addressContactsName;
                    document.querySelector("[data-id='address_Telephone__c']").innerHTML = data.object.addressTelephone;
                    document.querySelector("[data-id='address_ZipCode__c']").innerHTML = data.object.addressZipCode;
                    document.querySelector("[data-id='Detailed_Address__c']").innerHTML = data.object.detailedAddress;
                    document.querySelector("[data-id='RepairApplicant__c']").innerHTML = data.object.repairApplicant;
                    AWSService.query(staticResourceAddress.queryUrl, '{!DecryptAWSDataId}', queryBackDecrypt, staticResourceAddress.token);
                };
        var queryBackContact = function queryBack(data) {
                    console.log(data);
                    document.querySelector("[data-id='address_Contacts__c']").innerHTML = data.object.lastName;
                };
        var queryBackDecrypt = function queryBack(data) {
                    document.querySelector("[data-id='Detailed_Address__c']").innerHTML = data.object.detailedAddress;
                    document.querySelector("[data-id='address_ZipCode__c']").innerHTML = data.object.zipCode;
                    document.querySelector("[data-id='address_Telephone__c']").innerHTML = data.object.telephone;
                    AWSService.query(staticResourceContact.queryUrl, '{!ContactAWSDataId}', queryBackContact, staticResourceContact.token);
                }

        //Update Sensitive Information to AWS
        function UpdatePIToAWS(repairJson, payloadForNewPI) {
            let controllerSaveMethod = '{!$RemoteAction.NewRepairController.saveRepair}';

 force-app/main/default/pages/StraightBackAddress.page

@@ -140,7 +140,10 @@
            }
            blockme();
            console.log('{!insUpdData}')
            if(document.getElementById("allPage:allForm:oppBlock2:UpdAddressId:Create_Contacts__c").value){
            if(document.getElementById("allPage:allForm:oppBlock2:UpdAddressId:Create_Contacts__c").value //【联系人（新建）】不为空
                &&document.getElementById("allPage:allForm:oppBlock2:UpdAddressId:CustomerRecordType").value!='{!accOfficeTypeId}'////记录类型id  办事处
                &&document.getElementById("allPage:allForm:oppBlock2:UpdAddressId:CustomerRecordType").value!='{!accAgencyTypeId}'//记录类型id  販売店
                &&document.getElementById("allPage:allForm:oppBlock2:UpdAddressId:CustomerRecordType").value!='{!accAgencyContactTypeId}'){//记录类型id  经销商联系人
                //new contact
                ProcessPI({},GetEditObj('contact'),'contact',function(){
                    //new address
@@ -355,7 +358,7 @@
                    PIData[Id] = temp;
                };
                for(var i=0;i<tableDataStr.length;i++){
                    if(tableDataStr[i].address.Contacts__r){
                    if(tableDataStr[i].address.AWS_Data_Id__c){
                        correct++;
                        AWSService.queryRepair(staticResource.queryUrl,
                                                tableDataStr[i].address.AWS_Data_Id__c,
@@ -457,9 +460,12 @@
            let y=window.event.y; 
            createDiv.style.left=x;  
            createDiv.style.top=y;  
            createDiv.style.height='100px';  
            createDiv.style.width='100px'; 
            createDiv.style.background="#dddddd";
            createDiv.style.position = "absolute";
            parentNode.appendChild(createDiv);  
            parentNode.style.position = "relative";
        }

        function hidePIDiv(awsDataId){
@@ -527,6 +533,11 @@
            document.getElementById(contactNodeId).value = contactInfo.ContactId;
            document.getElementById(closeField).value = contactInfo.Name;     
        }
        function queryRecordType(){
            if(document.getElementById('allPage:allForm:oppBlock2:UpdAddressId:Customer__r_Name').value){
                queryRecordType();
            }
        }
        //2022 02 28 张华建 display PI Data end
    </script>
    <apex:form id="allForm">
@@ -547,6 +558,8 @@
            </apex:actionFunction>
            <!-- 保存和修改方法 -->
            <apex:actionFunction name="save" action="{!save}" rerender="oppBlock2,message" onComplete="unblockUI();{!IF(isSearchBtn,'searchBtnJs()',false)};Trans()"></apex:actionFunction>
            <!-- 查询客户记录类型方法 -->
            <apex:actionFunction name="queryRecordType" action="{!queryRecordType}" rerender="oppBlock2,message" onComplete="unblockUI();"></apex:actionFunction>
            <!-- 点击修改按钮获取修改数据方法 -->
            <apex:actionFunction name="onEditor" action="{!onEditor}" rerender="oppBlock2,checEventFrame,insUpdDataStr" onComplete="decrypt();unblockUI();">
                <apex:param name="UpdId" assignTo="{!UpdId}" value="" />
@@ -682,7 +695,7 @@
            <apex:pageBlock id="oppBlock2" tabStyle="Report">
                <apex:pageblocksection title="编辑地址" id="UpdAddressId" rendered="true" columns="4">
                    <apex:inputfield value="{!insUpdData.Address_Classification__c}" id="Address_Classification__c" />
                    <apex:inputfield value="{!insUpdData.Customer__c}" id="Customer__r_Name" required="false" />
                    <apex:inputfield value="{!insUpdData.Customer__c}" id="Customer__r_Name" required="false" onchange="queryRecordType();" />
                    <!-- Before PIPL 20220308 -->
                    <!-- <apex:inputfield value="{!insUpdData.Contacts__c}" id="Contacts__c" required="false"/> -->
                    <!-- Add By Li Jun for PIPL 20220308 Start -->
@@ -709,6 +722,7 @@
                    <apex:inputHidden id="Telephone_Encrypted__c"        value="{!insUpdData.Telephone_Encrypted__c}"/>
                    <apex:inputHidden id="ZipCode_Encrypted__c"          value="{!insUpdData.ZipCode_Encrypted__c}"/>
                    <apex:inputHidden id="Detailed_Address_Encrypted__c" value="{!insUpdData.Detailed_Address_Encrypted__c}"/>
                    <apex:inputHidden id="CustomerRecordType"            value="{!accRecordTypeId}"/>
                </apex:pageblocksection>

                <div style="text-align: center;">

 force-app/main/default/pages/ViewConsumApplyEquipmentSetDetailDecrypt.page

@@ -2,7 +2,7 @@
  @description       : 
  @author            : ChangeMeIn@UserSettingsUnder.SFDoc
  @group             : 
  @last modified on  : 03-17-2022
  @last modified on  : 03-18-2022
  @last modified by  : ChangeMeIn@UserSettingsUnder.SFDoc
-->
<apex:page standardController="Consum_Apply_Equipment_Set_Detail__c" extensions="NewConsumApplyEquipSetDetailController" id="page">
@@ -22,7 +22,7 @@
                    AWSService.query(staticResources.queryUrl, '{!AWSDataId}', queryBack, staticResources.token);
                }
                var queryBack = function queryBack(data) {
                    document.querySelector("[id='page:form:pageBlock:pageBlockSection:j_id1:0:j_id2']").innerHTML = data.object.trialUser;
                    document.querySelector("[id='page:form:pageBlock:pageBlockSection:j_id2:0:j_id3']").innerHTML = data.object.trialUser;
                };
                sfdcPage.appendToOnloadQueue(function () {
                    console.log('sfdcPage.appendToOnloadQueue');

 force-app/main/default/pages/ViewInquiryFormDecryptInfo.page

@@ -33,7 +33,13 @@
                        if(ele){
                            ele.title = '';
                            if(data.object.hasOwnProperty(f)){
                                ele.innerHTML = data.object[f];
                                if (f == 'email') {
                                    let eml = document.querySelector("[data-id='Email__c']");
                                    eml.href = 'mailto:'+data.object[f];
                                    eml.text = data.object[f];
                                }else{
                                    ele.innerHTML = data.object[f];
                                }
                            }
                            else{
                                console.log(f + 'is not in data.object');

 force-app/main/default/pages/ViewInspectionReportDecryptInfo.page

@@ -1,4 +1,5 @@
<apex:page standardController="Inspection_Report__c" extensions="NewAndEditInspectionReportController" id="page">
    <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
    <apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }"/>
    <apex:form id="form">
        <apex:pageblock id="pageBlock">

 force-app/main/default/pages/ViewTenderinformationDecryptInfo.page

@@ -1,4 +1,5 @@
<apex:page standardController="Tender_information__c" extensions="NewAndEditTenderinformationController" id="page">
    <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
    <apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }"/>
    <script src="../../soap/ajax/53.0/connection.js" type="text/javascript"></script>
    <apex:form id="form">