From fc8a8cea62e5d248834482a1ade9db6ab0758bf2 Mon Sep 17 00:00:00 2001
From: Li Jun <buli@deloitte.com.cn>
Date: 星期日, 24 四月 2022 18:55:04 +0800
Subject: [PATCH] 20220424FixIssue

---
 force-app/main/default/pages/NewAndEditASEActivity.page |   32 +++++++++++++++++++-------------
 1 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/force-app/main/default/pages/NewAndEditASEActivity.page b/force-app/main/default/pages/NewAndEditASEActivity.page
index fca017e..fff1309 100644
--- a/force-app/main/default/pages/NewAndEditASEActivity.page
+++ b/force-app/main/default/pages/NewAndEditASEActivity.page
@@ -69,6 +69,9 @@
                 } else {
                     payloadJson.AWS_Data_Id__c = '{!AWSDataId}';
                 }
+                if('{!rtTypeId}'){
+                    payloadJson.RecordTypeId = '{!rtTypeId}';//Add by zhj for Record Type Issue 20220421
+                }
                 return payloadJson;
             },
             queryBack:function (data) {
@@ -180,25 +183,25 @@
         function validateFieldValueFormate() {
             let error_msg = '';
             // let textEmail = "[data-id='Email']";
-            let textPhone = "[data-id='CustomerTel__c']";
+            //let textPhone = "[data-id='CustomerTel__c']";
             // //Email
             // let email = document.querySelector(textEmail);
             // if(email && !/^[\w-]{3,12}@[\da-zA-Z]{2,16}\.[a-zA-Z]+$/.test(email.value)){
             //     error_msg += ';閭欢鏍煎紡閿欒';
             // }
-            let phone = document.querySelector(textPhone);
+            // let phone = document.querySelector(textPhone);
 
-            if(phone ){
-                if(phone.value){
-                    if(!/^1[3|5|8|7][0-9]\d{4,8}$/.test(phone.value)){
-                        error_msg += ';鐢佃瘽鍙风爜閿欒';
-                    }
-                }else{
-                    if(phone.previousSibling && phone.previousSibling.className.indexOf('requiredBlock')>-1){
-                        error_msg += ';鐢佃瘽鍙风爜閿欒';
-                    }
-                }
-            }
+            // if(phone ){
+            //     if(phone.value){
+            //         if(!/^1[3|5|8|7][0-9]\d{4,8}$/.test(phone.value)){
+            //             error_msg += ';鐢佃瘽鍙风爜閿欒';
+            //         }
+            //     }else{
+            //         if(phone.previousSibling && phone.previousSibling.className.indexOf('requiredBlock')>-1){
+            //             error_msg += ';鐢佃瘽鍙风爜閿欒';
+            //         }
+            //     }
+            // }
 
             let es = document.getElementsByTagName('select')
             for(let ei in es){
@@ -263,6 +266,9 @@
                     result[field_api_name] = ele.value;
                 }
             }
+            if(document.getElementById(api_id_map['Purpose_Type__c'])){
+                result['Purpose_Type__c'] = document.getElementById(api_id_map['Purpose_Type__c']).value!='_\x01_'?document.getElementById(api_id_map['Purpose_Type__c']).value:'';
+            }
             return result;
         }
         function QuerySobjectFromAWS() {

--
Gitblit v1.9.1