From 928399eceec50e3d37ea08669a12789a9410a9d2 Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 22 十一月 2022 16:51:16 +0800
Subject: [PATCH] 111
---
force-app/main/default/staticresources/NewQuoteIraiJS.js | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/staticresources/NewQuoteIraiJS.js b/force-app/main/default/staticresources/NewQuoteIraiJS.js
index bfa9a0f..78c5613 100644
--- a/force-app/main/default/staticresources/NewQuoteIraiJS.js
+++ b/force-app/main/default/staticresources/NewQuoteIraiJS.js
@@ -103,6 +103,7 @@
quoteTotalPrice.call();
setOCMAmount.call();
checkProductStatusValidPeriod();
+ // checkQuoteIrai_Status(true);
}
function number_format() {
for(var i=0; i<QuoteEntryMaxLine; i++){
@@ -130,6 +131,11 @@
j$(escapeVfId( 'ListPriceTotal')).val(ListPriceTotal);
j$(escapeVfId( 'UnitPriceTotal')).val(unitPriceTotal);
}
+// function ObsapUsersChange(){
+// var ObsapUsersId = j$(escapeVfId('Page:mainForm:block:j_id45:ObsapUsersId')).value();
+// debugger
+// j$(escapeVfId('Page:mainForm:block:IraiUser')).val(ObsapUsersId);
+// }
function calPrice(i){
var x,y,z,c,d,e;
x = j$(escapeVfId('Page:mainForm:block:lists:' + i + ':Quantity')).value();
@@ -1027,6 +1033,7 @@
}
}
function save2btn() {
+ debugger
checkchangedAfterPrint();
var changedAfterPrint = j$(escapeVfId('Page:mainForm:changedAfterPrint')).value();
if (changedAfterPrint == 'true') {
@@ -1037,9 +1044,24 @@
unblockUI();
}
} else {
- var username = j$(escapeVfId("Page:mainForm:block:IraiUser")).val();
- var userid = j$(escapeVfId("Page:mainForm:block:IraiUser_lkid")).val();
- if (userid != null && userid != '000000000000000' && userid.length > 0) {
+ // var username = j$(escapeVfId("Page:mainForm:block:IraiUser")).val();
+ debugger
+ var username1 = j$(escapeVfId("Page:mainForm:block:j_id43:IraiUser")).val();
+ var userid = j$(escapeVfId("Page:mainForm:block:j_id43:IraiUser_lkid")).val();
+ var username2 = j$(escapeVfId("Page:mainForm:block:j_id46:IraiUser")).val();
+ if(username1!=undefined){
+ username=username1;
+ }else{
+ username=username2
+ }
+ if (userid != null&&userid != '000000000000000' && userid.length > 0) {
+ if (confirm(Confirm_saveBtn)) {
+ Save.call();
+ return true;
+ } else {
+ unblockUI();
+ }
+ } else if(username2){
if (confirm(Confirm_saveBtn)) {
Save.call();
return true;
@@ -1424,4 +1446,21 @@
function excelImportGateway(str) {
blockme();
excelImport(str);
-}
\ No newline at end of file
+}
+// function checkQuoteIrai_Status(flag) {
+// debugger
+// var QuoteIrai_Statusvalue = j$(escapeVfId('Page:mainForm:block:j_id32')).value();
+// var Statusflg=true;
+// if(flag){
+// if(QuoteIrai_Statusvalue == '鑽夋涓�'){
+// Statusflg = false;
+// }
+// }
+// if(Statusflg){
+// j$(escapeVfId('Page:mainForm:block:QuoteIraiBtn')).attr('disabled',false);
+// j$(escapeVfId('Page:mainForm:block:j_id85')).attr('disabled',false);
+// j$(escapeVfId('Page:mainForm:block:j_id87')).attr('disabled',false);
+// }
+
+// return true;
+// }
\ No newline at end of file
--
Gitblit v1.9.1