From ab5a982874f88556b72e02177fa88dedc2d56fe8 Mon Sep 17 00:00:00 2001
From: chenjingwu <chenjingwu@prec-tech.com>
Date: 星期五, 24 五月 2024 16:06:03 +0800
Subject: [PATCH] 1
---
force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js | 103 ++++++++++++++-------------------------------------
1 files changed, 28 insertions(+), 75 deletions(-)
diff --git a/force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js b/force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js
index bac488e..e81cef7 100644
--- a/force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js
+++ b/force-app/main/default/lwc/lexNewQuoteEntry/lexNexQuoteEntryUtil.js
@@ -13,7 +13,6 @@
export var ListPriceTotalExp;
export var unitPriceTotalExp;
export var errorflg;
-export var errorflgw;
export var StrExp;
export var IsQuoteTrialExp;
export var alertExp = '';
@@ -200,26 +199,10 @@
class:{
fieldName:'Nameclass'
},
- alignment: 'center'
},
hideDefaultActions: true,
initialWidth: 300
},
- // chenjingwu 3+2澶氬勾淇濅慨 20240318 start
- {
- label: '寤朵繚骞撮檺',
- fieldName: 'Learning_Community',
- type: 'picklistColumn',
- editable: true,
- typeAttributes: {
- placeholder:'--鏃�--',
- options:{fieldName: 'Learning_CommunityOptions'},
- value: { fieldName: 'Learning_Community' }
- },
- hideDefaultActions: true,
- initialWidth: 300
- },
- // chenjingwu 3+2澶氬勾淇濅慨 20240318 end
],
sortInterfaces: false,
@@ -679,7 +662,6 @@
maxLineNo += 1;
// var newvalueList = [];
selectvlue.forEach(selectv=>{
- console.log('123');
debugger
alertExp = '';
// var newvalue = {...{},...selectv};
@@ -756,8 +738,7 @@
}
}
function SetProductId(lineno,selectv){
- console.log(selectv);
- //fy DB202312538864 2024.02.02 start
+ //fy DB202312538864 2024.02.02 start
// var Product2 = {};
// var PricebookEntry = {Product2:Product2};
// var pageObject = {};
@@ -793,22 +774,13 @@
var Intra_Trade_Gurantee_USD = selectv.Product2.Intra_Trade_Foreign_RMB__c;
var Intra_Trade_Service_USD = selectv.Product2.NoDiscount_Foreign__c;
var Maintenance_Price_Year_USD = selectv.Product2.Repair_Contract_USD__c;
-
- //fy DB202312538864 2024.02.02 start
- // addobj.PricebookEntry.Product2.StorageStatus__c = StorageStatus__c;
- addobj.pageObject.PricebookEntry.Product2.StorageStatus__c = StorageStatus__c;
- addobj.pageObject.PricebookEntry.Id = PricebookEntryId;
- addobj.pageObject.PricebookEntry.Product2Id = Product2Id;
- addobj.pageObject.Asset_Model_No__c = Asset_Model_No__c;
- addobj.pageObject.PricebookEntry.Product2.LastbuyProductFLG__c = selectv.Product2.LastbuyProductFLG__c;
- addobj.pageObject.PricebookEntry.Product2.whetherOldCode_PrePro__c = selectv.Product2.whetherOldCode_PrePro__c;
- //fy DB202312538864 2024.02.02 end
- // chenijngwu 20240319 start
+ // chenijngwu 20240319 SP涓绘満 start
addobj.pageObject.PricebookEntry.Product2.ProductCategory__c = selectv.Product2.ProductCategory__c;
if(addobj.pageObject.PricebookEntry.Product2.ProductCategory__c == 'SP涓绘満'){
addobj.SPAssistantFlag = true;
}
- // chenijngwu 20240319 end
+ // chenijngwu 20240319 SP涓绘満 end
+ addobj.PricebookEntry.Product2.StorageStatus__c = StorageStatus__c;
addobj.StorageStatus = StorageStatus__c;
addobj.lineNo = parseInt(lineno);
addobj.Asset_Model = Asset_Model_No__c;
@@ -1093,38 +1065,18 @@
debugger
console.warn(JSON.stringify(quoteLineItem));
quoteLineItem.forEach(quotltiem=>{
- // chenjingwu 3+2 start
- // quotltiem.Learning_CommunityOptions = [
- // { label: '--鏃�--', value: '' },
- // { label: '涓绘満', value: '涓绘満' },
- // { label: '闀滃瓙', value: '闀滃瓙' },
- // { label: '娲楁秷鏈�', value: '娲楁秷鏈�' },
- // { label: '灏忛暅绉�', value: '灏忛暅绉�' },
- // { label: '鑳介噺', value: '鑳介噺' },
- // { label: '鍏夋簮', value: '鍏夋簮' },
- // { label: '鍏朵粬', value: '鍏朵粬' }
- // ];
- // chenjingwu 3+2 end
- //fy DB202312538864 2024.02.02 start
- if(quotltiem.PricebookEntry === undefined){
- quotltiem.PricebookEntry = {Product2:{}};
- }else{
- if(quotltiem.PricebookEntry.Product2 === undefined){
- quotltiem.PricebookEntry.Product2 = {};
- }
- }
- if(quotltiem.lastbuyProductFLGc !== undefined && quotltiem.lastbuyProductFLGc !== null){
- quotltiem.PricebookEntry.Product2.LastbuyProductFLG__c = quotltiem.lastbuyProductFLGc;
- }
// chenjingwu 20240411 start
+ if(quotltiem.PricebookEntry === undefined){
+ quotltiem.PricebookEntry = {Product2:{}};
+ }else{
+ if(quotltiem.PricebookEntry.Product2 === undefined){
+ quotltiem.PricebookEntry.Product2 = {};
+ }
+ }
if(quotltiem.ProductCategory !== undefined && quotltiem.ProductCategory !== null){
quotltiem.PricebookEntry.Product2.ProductCategory__c = quotltiem.ProductCategory;
}
- // chenjingwu 20240411 end
- if(quotltiem.whetherOldCode_PreProc !== undefined && quotltiem.whetherOldCode_PreProc !== null){
- quotltiem.PricebookEntry.Product2.whetherOldCode_PrePro__c = quotltiem.whetherOldCode_PreProc;
- }
- //fy DB202312538864 2024.02.02 end
+ // chenjingwu 20240411 end
quotltiem.Quantity__c = quotltiem.pageObject.Quantity__c;
quotltiem.UnitPrice_Page__c = quotltiem.pageObject.UnitPrice_Page__c;
// quotltiem.UnitPrice_Page__c = toNumComma(quotltiem.UnitPrice_Page__c);
@@ -1868,9 +1820,12 @@
jzDataToBeproduct.forEach(jzdtbt=>{
// 淇濅慨
var multiYearWarranty = true;
- if (jzdtbt.multiYearWarranty__c) {
- multiYearWarranty = jzdtbt.multiYearWarranty__c;
- }
+ //fy 3+2椤圭洰鍙戠幇鐨勯棶棰�0425 satrt
+ // if (jzdtbt.multiYearWarranty__c) {
+ if (jzdtbt.multiYearWarranty__c !== undefined) {
+ //fy 3+2椤圭洰鍙戠幇鐨勯棶棰�0425 end
+ multiYearWarranty = jzdtbt.multiYearWarranty__c;
+ }
// 淇濅慨绫诲瀷
var warrantyType = jzdtbt.warrantyType__c;
// 浜у搧淇濅慨绫诲瀷
@@ -1908,6 +1863,7 @@
}
export function PrintCustomerNameoptionsvlue(options_hp,selection_hp,quo,options_hpflg,accs){
if (JSON.stringify(accs) != "{}" && JSON.stringify(accs) != "[]") {
+ debugger
if (accs[0].Name) {
var options_hpvalue = {};
options_hpvalue.label = accs[0].Name;
@@ -2172,16 +2128,13 @@
var fag = false;
data.forEach(item=>{
var key = Number(item.lineNo);
- var value = {Quantity__c:'',UnitPrice_Page__c:'',Learning_Community:''}
+ var value = {Quantity__c:'',UnitPrice_Page__c:''}
if(item.Quantity__c != undefined){
value.Quantity__c = item.Quantity__c;
fag = true;
}
if(item.UnitPrice_Page__c != undefined){
value.UnitPrice_Page__c = item.UnitPrice_Page__c;
- }
- if(item.Learning_Community != undefined){
- value.Learning_Community = item.Learning_Community;
}
dataMap.set(key,value);
});
@@ -2195,9 +2148,6 @@
if(datavaue.UnitPrice_Page__c){
// jzdtbt.UnitPrice_Page__c = toNumComma(datavaue.UnitPrice_Page__c);
jzdtbt.UnitPrice_Page__c = datavaue.UnitPrice_Page__c;
- }
- if(datavaue.Learning_Community){
- jzdtbt.Learning_Community = datavaue.Learning_Community;
}
x = localParseInt(jzdtbt.Quantity__c);
y = localParseFloat(jzdtbt.UnitPrice_Page__c);
@@ -2258,10 +2208,6 @@
errorflg = true;
alertExp = Setmap.get('errormessage');
}else{
- if(Setmap.has('warn')){
- errorflgw = true;
- alertExp = Setmap.get('warn');
- }
if(Setmap.has('quoId')){
quoId = Setmap.get('quoId');
}
@@ -2602,7 +2548,9 @@
}
export function checkch(jzDataToBeproduct){
var activities = [];
+ // sp涓绘満 cjw start
var flag = false;
+ // sp涓绘満 cjw start
jzDataToBeproduct.forEach(jzdtbt=>{
var lineId = jzdtbt.pageObject.PricebookEntryId;
if (lineId) {
@@ -2617,17 +2565,22 @@
//DB202312560765 you 鍚︽湁EndoRapid璧勮川妫�鏌� start
item.IFEndoRapidFlag = jzdtbt.IFEndoRapidFlag;
//DB202312560765 you 鍚︽湁EndoRapid璧勮川妫�鏌� end
- if(jzdtbt.PricebookEntry.Product2.ProductCategory__c == 'SP涓绘満'){
+ // sp涓绘満 cjw start
+ var qwe = jzdtbt.PricebookEntry ? jzdtbt.PricebookEntry.Product2.ProductCategory__c : jzdtbt.pageObject.PricebookEntry.Product2.ProductCategory__c;
+ if(qwe == 'SP涓绘満'){
item.SPAssistantFlag = true;
flag = true;
}
+ // sp涓绘満 cjw start
activities.push(item);
}
});
+ // sp涓绘満 cjw start
var maps = new Map();
maps.set('activities',activities);
maps.set('flag',flag);
return maps;
+ // sp涓绘満 cjw end
}
export function Agent1comput(quo,Saleslet,oppInfo){
var z = quo.Estimation_List_Price__c;
--
Gitblit v1.9.1