From 6a471bc62a8567abd74dcef733fcddf9911b6a16 Mon Sep 17 00:00:00 2001
From: denny chen <chenbangcai@prec-tech.com>
Date: 星期三, 29 三月 2023 15:47:48 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/staticresources/NewQuoteIraiJS.js | 88 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 81 insertions(+), 7 deletions(-)
diff --git a/force-app/main/default/staticresources/NewQuoteIraiJS.js b/force-app/main/default/staticresources/NewQuoteIraiJS.js
index bfa9a0f..694cf9c 100644
--- a/force-app/main/default/staticresources/NewQuoteIraiJS.js
+++ b/force-app/main/default/staticresources/NewQuoteIraiJS.js
@@ -94,6 +94,8 @@
function reSet(){
}
function calonLoad(){
+ debugger
+ calPriceAll.call();
EstimationListPrice.call();
// CHAN-BJQ4VZ 绮剧悽鎶�鏈� 2019/12/10 Start
EstimationListPrice2.call();
@@ -103,6 +105,7 @@
quoteTotalPrice.call();
setOCMAmount.call();
checkProductStatusValidPeriod();
+ // checkQuoteIrai_Status(true);
}
function number_format() {
for(var i=0; i<QuoteEntryMaxLine; i++){
@@ -130,8 +133,17 @@
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;
+ debugger
+ //DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start
+ var x,y,z,c,d,e,CanNotCancelledGurantee,cancelMultiyearInsurance;
+ // var x,y,z,c,d,e;
+ //DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy end
x = j$(escapeVfId('Page:mainForm:block:lists:' + i + ':Quantity')).value();
y = j$(escapeVfId('Page:mainForm:block:lists:' + i + ':UnitPrice')).value();
c = j$(escapeVfId('Page:mainForm:block:lists:' + i + ':Cost')).value();
@@ -143,6 +155,7 @@
c = localParseFloat( c);
d = localParseFloat( d);
e = localParseFloat( e);
+
j$(escapeVfId('Page:mainForm:block:lists:' + i + ':Quantity')).val(x);
j$(escapeVfId('Page:mainForm:block:lists:' + i + ':UnitPrice')).val(toNumComma(y));
@@ -161,9 +174,19 @@
j$(escapeVfId('Page:mainForm:block:lists:' + i + ':ListPriceTotalText')).text(toNumComma(z));
j$(escapeVfId('Page:mainForm:block:lists:' + i + ':ListPriceTotal')).val(toNum(z));
- z = x * e;
+ //DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start
+ // z = x * e;
+ CanNotCancelledGurantee = j$(escapeVfId("Page:mainForm:block:lists:"+ i +":CanNotCancelledGurantee__c")).value();
+ cancelMultiyearInsurance = j$(escapeVfId("Page:mainForm:block:cancelMultiyearInsurance")).value();
+ if(CanNotCancelledGurantee =='false' && cancelMultiyearInsurance == '涓嶈'){
+ z = 0.00;
+ }else{
+ z = x * e;
+ }
+ //DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy end
j$(escapeVfId('Page:mainForm:block:lists:' + i + ':NoDiscountTotalText')).text(toNumComma(z));
j$(escapeVfId('Page:mainForm:block:lists:' + i + ':NoDiscountTotal')).val(toNum(z));
+
// CHAN-BHNBX6 NoDiscount灏忚 2019/11/20 END
EstimationListPrice.call();
calUnitPriceTotal.call();
@@ -175,7 +198,12 @@
}
function calPriceAll(){
- var x,y,z,c,d,e;
+ debugger
+ //DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start
+ var x,y,z,c,d,e,CanNotCancelledGurantee,cancelMultiyearInsurance;
+ cancelMultiyearInsurance = j$(escapeVfId("Page:mainForm:block:cancelMultiyearInsurance")).value();
+ // var x,y,z,c,d,e;
+ //DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy end
for(var i=0; i<QuoteEntryMaxLine; i++){
x = j$(escapeVfId('Page:mainForm:block:lists:' + i + ':Quantity')).value();
x = localParseInt( x);
@@ -198,7 +226,16 @@
j$(escapeVfId('Page:mainForm:block:lists:' + i + ':ListPriceTotalText')).text(toNumComma(z));
j$(escapeVfId('Page:mainForm:block:lists:' + i + ':ListPriceTotal')).val(toNum(z));
- z = x * e;
+ //DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy start
+ // z = x * e;
+ CanNotCancelledGurantee = j$(escapeVfId("Page:mainForm:block:lists:"+ i +":CanNotCancelledGurantee__c")).value();
+
+ if(CanNotCancelledGurantee =='false' && cancelMultiyearInsurance == '涓嶈'){
+ z = 0.00;
+ }else{
+ z = x * e;
+ }
+ //DB202212304166 銆愮揣鎬�-鎶ヤ环濮旀墭涓庤喘涔版剰鍚戙�戣灏嗘渶鍚庢搷浣滅殑鎶ヤ环濮旀墭鐘舵�佹斁鍒拌喘涔版剰鍚戜腑 fy end
j$(escapeVfId('Page:mainForm:block:lists:' + i + ':NoDiscountTotalText')).text(toNumComma(z));
j$(escapeVfId('Page:mainForm:block:lists:' + i + ':NoDiscountTotal')).val(toNum(z));
// CHAN-BHNBX6 NoDiscount灏忚 2019/11/20 END
@@ -1027,6 +1064,7 @@
}
}
function save2btn() {
+ debugger
checkchangedAfterPrint();
var changedAfterPrint = j$(escapeVfId('Page:mainForm:changedAfterPrint')).value();
if (changedAfterPrint == 'true') {
@@ -1037,9 +1075,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 +1477,25 @@
function excelImportGateway(str) {
blockme();
excelImport(str);
+}
+// 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;
+// }
+function cancelMultiyearInsurancechange(){
+ debugger;
+ calPriceAll.call();
}
\ No newline at end of file
--
Gitblit v1.9.1