From b823c7f3569cf9368e2245846e918f78f32e903a Mon Sep 17 00:00:00 2001
From: GWY <guweiyiscp096@foxmail.com>
Date: 星期五, 15 四月 2022 11:38:47 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlympusSSBG
---
force-app/main/default/pages/NewAndEditQuotes.page | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditQuotes.page b/force-app/main/default/pages/NewAndEditQuotes.page
index 0115141..9466289 100644
--- a/force-app/main/default/pages/NewAndEditQuotes.page
+++ b/force-app/main/default/pages/NewAndEditQuotes.page
@@ -1,10 +1,3 @@
-<!--
- @description :
- @author : ChangeMeIn@UserSettingsUnder.SFDoc
- @group :
- @last modified on : 03-04-2022
- @last modified by : ChangeMeIn@UserSettingsUnder.SFDoc
--->
<apex:page standardController="Quotes__c" extensions="NewAndEditQuotesController" id="page">
<apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
<script src="../../soap/ajax/53.0/connection.js" type="text/javascript"></script>
@@ -183,7 +176,7 @@
}
let phone = document.querySelector(textPhone);
- if(phone && !/^1[3|5|8|7][0-9]\d{4,8}$/.test(phone.value)){
+ if(false && phone && !/^1[3|5|8|7][0-9]\d{4,8}$/.test(phone.value)){
error_msg += ';鐢佃瘽鍙风爜閿欒';
}
@@ -204,7 +197,7 @@
function getSobjectInformation() {
//api_id_map
-//let nodelist = document.getElementsByClassName(config.ApiPrefix);
+ //let nodelist = document.getElementsByClassName(config.ApiPrefix);
let result = {}
for (let index in api_id_map) {
let ele = document.getElementById(api_id_map[index]);
@@ -336,7 +329,7 @@
// Check Required Field
let checkRequiredFieldMsgResult = checkRequiredFieldMsg(sobjJson);
if (checkRequiredFieldMsgResult) {
- alertErrorMessage('requiredErrorMsg' + checkRequiredFieldMsgResult);
+ alertErrorMessage('{!$Label.Input_Required_Field_Msg}' + checkRequiredFieldMsgResult);
return
}
// //3. Prepare the payload for New PI API To AWS - To Do
@@ -364,7 +357,7 @@
//鏇挎崲vlookup
var newSearchContactWindow = null;
- var closeField = '';
+ // var closeField = '';
function replaceSearchContactLookup() {
if (!{!isNewMode}) {
@@ -403,7 +396,7 @@
//鑷畾涔塴ookup鏌ヨ
function searchContact(contactNodeId,field){
- closeField = field;
+ // closeField = field;
let accountValue = "";
if (document.querySelector("[data-id='AccountId']")) {
let accountNodeId = document.querySelector("[data-id='AccountId']").id + '_lkid';
@@ -430,9 +423,9 @@
let contactInfoStr = document.getElementById('page:form:contactId').value;
console.log('closePopup:'+contactInfoStr);
let contactInfo = JSON.parse(contactInfoStr);
- let contactNodeId = document.querySelector("[data-id="+closeField+"]").id + '_lkid';
+ let contactNodeId = document.querySelector("[data-id='CONTACT_NAME__c']").id + '_lkid';
document.getElementById(contactNodeId).value = contactInfo.ContactId;
- document.querySelector("[data-id="+closeField+"]").value = contactInfo.Name;
+ document.querySelector("[data-id='CONTACT_NAME__c']").value = contactInfo.Name;
}
</script>
--
Gitblit v1.9.1