From cdff37596ef14a95a3e557b0d978f50140410308 Mon Sep 17 00:00:00 2001
From: 涂煌豪 <tuhuanghao@prec-tech.com>
Date: 星期二, 10 五月 2022 16:17:59 +0800
Subject: [PATCH] 【委托】URF限次修理合同的最高价格修改
---
force-app/main/default/pages/NewAndEditInquiryForm.page | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditInquiryForm.page b/force-app/main/default/pages/NewAndEditInquiryForm.page
index e0d29ad..35d6eed 100644
--- a/force-app/main/default/pages/NewAndEditInquiryForm.page
+++ b/force-app/main/default/pages/NewAndEditInquiryForm.page
@@ -1,6 +1,6 @@
<apex:page standardController="Inquiry_form__c" extensions="NewAndEditInquiryFormController" id="page">
<apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
- <script src="../../soap/ajax/53.0/connection.js" type="text/javascript"></script>
+ <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
@@ -133,7 +133,7 @@
function ProcessPI(sobjJson, payloadForNewPI) {
blockme();
if ({!isNewMode} || {!isCloneMode}) {
- NewPIToAWS(sobjJson, payloadForNewPI)
+ NewPIToAWS(sobjJson, payloadForNewPI)
}else {
UpdatePIToAWS(sobjJson, payloadForNewPI)
}
@@ -169,7 +169,7 @@
}
function IsFormElement(tag_name){
- return ['input','select','textarea'].indexOf(tag_name)>-1;
+ return ['input','select','textarea','div'].indexOf(tag_name)>-1;
}
function getPIPayload(sobjJson) {
@@ -229,6 +229,9 @@
console.log(ele.id.indexOf('lkwgt'));
if (ele.id.indexOf('lkwgt') == -1) {
let vlookUpNodeId = ele.id + '_lkid';
+ if (tag_name == 'div') {
+ vlookUpNodeId = ele.id.substring(0,ele.id.length-4) + '_lkid';
+ }
let vlook_ele = document.getElementById(vlookUpNodeId);
let v = '';
if(vlook_ele){
@@ -323,7 +326,9 @@
function checkRequiredFieldMsg(formData) {
let blankRequiredFields = '';
for(i = 0;i<requiredFieldAPIList.length;i++){
- if(formData[requiredFieldAPIList[i]]){
+ if(formData[requiredFieldAPIList[i]] && (VLookUpFields.indexOf(requiredFieldAPIList[i]) == -1)){
+ continue;
+ }else if((VLookUpFields.indexOf(requiredFieldAPIList[i]) != -1) && formData[requiredFieldAPIList[i]] != '000000000000000'){
continue;
}else{
if(blankRequiredFields == ''){
@@ -670,7 +675,7 @@
jQuery('a[data-id="OwnerId"]').remove();
//Updated by Li Jun 20220322 Start
- /*
+ /*
jQuery(".lookupInput").on("mouseenter","img[generate]",function(e){
this.className = "closeIconOn";
@@ -684,10 +689,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 = '';
}
}
});*/
@@ -758,9 +763,9 @@
}
}else {
- clearVlookup('Department_Class__c');
+ clearVlookup('Department_Class__c');
clearVlookup('Hospital__c');
- }
+ }
},
{ escape: true }
);
--
Gitblit v1.9.1