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/NewAndEditInspectionReport.page |   25 ++++++++++++++-----------
 1 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/force-app/main/default/pages/NewAndEditInspectionReport.page b/force-app/main/default/pages/NewAndEditInspectionReport.page
index aa0f3cd..9a3335c 100644
--- a/force-app/main/default/pages/NewAndEditInspectionReport.page
+++ b/force-app/main/default/pages/NewAndEditInspectionReport.page
@@ -63,6 +63,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) {
@@ -160,18 +163,18 @@
 
         function validateFieldValueFormate() {
             let error_msg = '';
-            let textEmail = "[data-id='Email']";
-            let textPhone = "[data-id='Phone']";
-            //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 textEmail = "[data-id='Email']";
+            // let textPhone = "[data-id='Phone']";
+            // //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);
 
-            if(phone && !/^1[3|5|8|7][0-9]\d{4,8}$/.test(phone.value)){
-                error_msg += ';鐢佃瘽鍙风爜閿欒';
-            }
+            // if(phone && !/^1[3|5|8|7][0-9]\d{4,8}$/.test(phone.value)){
+            //     error_msg += ';鐢佃瘽鍙风爜閿欒';
+            // }
 
             for(let e of document.getElementsByTagName('select')){
                 for(let op of e.options){

--
Gitblit v1.9.1