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/NewRentalApply.page | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/pages/NewRentalApply.page b/force-app/main/default/pages/NewRentalApply.page
index 0b4e2f5..df81066 100644
--- a/force-app/main/default/pages/NewRentalApply.page
+++ b/force-app/main/default/pages/NewRentalApply.page
@@ -3,7 +3,7 @@
<apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
- <script src="../../soap/ajax/53.0/connection.js" type="text/javascript"></script>
+ <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<style>
.disabledbutton {
pointer-events: none;
@@ -286,7 +286,9 @@
function checkRequiredFieldMsg(formData) {
let blankRequiredFields = '';
for (i = 0; i < requiredFieldAPIList.length; i++) {
- if (formData[requiredFieldAPIList[i]]) {
+ if (formData[requiredFieldAPIList[i]] && !VLookUpFields.has(requiredFieldAPIList[i])) {
+ continue;
+ }else if(VLookUpFields.has(requiredFieldAPIList[i]) && formData[requiredFieldAPIList[i]] != '000000000000000'){
continue;
} else {
if (blankRequiredFields == '') {
@@ -528,7 +530,7 @@
console.log(onlyReadFields);
for(let i=0;i<onlyReadFields.length;i++){
if(document.querySelector('[data-id='+onlyReadFields[i]+']')){
- document.querySelector('[data-id='+onlyReadFields[i]+']').parentNode.remove();
+ document.querySelector('[data-id='+onlyReadFields[i]+']').parentNode.remove();
}
}
--
Gitblit v1.9.1