From a9baff8a4508c1850e650f68831d857b953eace4 Mon Sep 17 00:00:00 2001
From: GWY <guweiyi@prec-tech.com>
Date: 星期一, 16 五月 2022 16:59:25 +0800
Subject: [PATCH] 合同批准后拆分，打印pdf带出套装
---
force-app/main/default/pages/NewAndEditOrder.page | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/pages/NewAndEditOrder.page b/force-app/main/default/pages/NewAndEditOrder.page
index 014cdb0..672905c 100644
--- a/force-app/main/default/pages/NewAndEditOrder.page
+++ b/force-app/main/default/pages/NewAndEditOrder.page
@@ -233,9 +233,9 @@
v = ele.value;
}
- if(v && v != "000000000000000"){
+ //if(v && v != "000000000000000"){
result[field_api_name] = v;
- }
+ //}
}
} else if (ele.type == 'checkbox') {
@@ -322,7 +322,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 == ''){
@@ -752,13 +754,14 @@
var EndUserLkid = '000000000000000';
if(document.querySelector("[data-id='EndUser__c']")){
EndUserLkid = document.getElementById(document.querySelector("[data-id='EndUser__c']").id + '_lkid').value;
- if(EndUserLkid!='000000000000000'){
- QuerySobjectFromAWS(EndUserLkid);
- }
}
if (!{!isNewMode}) {
blockme();
- QuerySobjectFromAWS();
+ if(EndUserLkid!='000000000000000'){
+ QuerySobjectFromAWS(EndUserLkid);
+ }else{
+ QuerySobjectFromAWS();
+ }
}
//瑙ｅ瘑鏈�缁堢敤鎴�.
--
Gitblit v1.9.1