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/NewConsumApplyEquipmentSetDetail.page | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page b/force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page
index 2d64dd0..c0a088f 100644
--- a/force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page
+++ b/force-app/main/default/pages/NewConsumApplyEquipmentSetDetail.page
@@ -3,7 +3,7 @@
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<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;
@@ -50,7 +50,8 @@
//Query Required Parameter
var queryBack = function queryBack(data) {
console.log('data = ' + data);
- document.querySelector("[data-id='Trial_User__c']").value = data.object.trialUser;
+ if(document.querySelector("[data-id='Trial_User__c']"))
+ document.querySelector("[data-id='Trial_User__c']").value = data.object.trialUser;
unblockUI();
};
@@ -170,7 +171,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 == '') {
@@ -324,7 +327,7 @@
QueryConsumApplyFromAWS();
};
//document.querySelector("[data-id='OwnerId']").classList.add("disabledbutton");
-
+
document.getElementById('topButtonRow').style = '';
聽 聽 聽 聽 聽 聽 聽document.getElementById('bottomButtonRow').style = '';
//zhj 2022/04/11 start
--
Gitblit v1.9.1