From 1f296034a85c447df33cf4e09ed111eb3f42daf9 Mon Sep 17 00:00:00 2001
From: Liu Cheng <liucheng@prec-tech.com>
Date: 星期五, 10 六月 2022 15:05:00 +0800
Subject: [PATCH] DLIU-CES8B9 【FY23系统课题10】-紧急-已借用自然日、借出状态（明细）字段逻辑调整
---
force-app/main/default/pages/NewAndEditASEActivity.page | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditASEActivity.page b/force-app/main/default/pages/NewAndEditASEActivity.page
index 1e1208d..059eeb8 100644
--- a/force-app/main/default/pages/NewAndEditASEActivity.page
+++ b/force-app/main/default/pages/NewAndEditASEActivity.page
@@ -1,6 +1,6 @@
<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>
+ <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
@@ -336,7 +336,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 == ''){
--
Gitblit v1.9.1