From 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期三, 23 八月 2023 14:54:59 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/lwc/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.js | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/lwc/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.js b/force-app/main/default/lwc/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.js
index 17f0cf5..036c28b 100644
--- a/force-app/main/default/lwc/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.js
+++ b/force-app/main/default/lwc/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.js
@@ -18,7 +18,7 @@
console.log(currentPageReference);
if (currentPageReference) {
- const urlValue = currentPageReference.state.recordId;
+ let urlValue = currentPageReference.state.recordId;
if (urlValue) {
let str = `${urlValue}`;
console.log("str");
@@ -47,11 +47,11 @@
return;
}
// 鍐宠鐘舵�� Approved_Status__c
- if (result.opdIFApproved == true && result.opdApprovedNo != '' && result.opdStatusProcessState.indexOf(result.opdApprovedStatus)!= -1 && result.opdApprovedStatus != '鑽夌' ){
+ if (result.opdIFApproved == true && result.opdApprovedNo != '' && result.opdStatusProcessState.indexOf(result.opdApprovedStatus)!== -1 && result.opdApprovedStatus != '鑽夌' ){
this.showToast('宸茬敵璇峰喅瑁佷絾鍐宠鐘舵�佷笉绗﹀悎鏉′欢','warning');
return;
}
- var HaveValue = "{!OPDPlan__c.Rental_Apply2__c}";
+ // var HaveValue = "{!OPDPlan__c.Rental_Apply2__c}";
// 澶囧搧鍊熷嚭鐢宠1 Rental_Apply2__c ; OPD璁″垝鏉ユ簮 OPDType__c
if (result.opdRentalApply2 != '' && result.opdType != '瀛︿細') {
this.showToast('涓�涓狾PD璁″垝鍙彲鍏宠仈鍒涘缓涓�涓鍝佺敵璇峰崟','warning');
@@ -85,10 +85,10 @@
let getCampaignRecodeType = result.opdCampaignTypeId.slice(0,15)
console.log("-------opdCampaignRecodeTypeId---2222---------",getCampaignRecodeType,campaignRecodeType);
// 鑱岀 Job_Category__c
- if (campaignRecodeType !== getCampaignRecodeType && res.userJobCategory == '閿�鍞湇鍔�' ) {
+ if (campaignRecodeType != getCampaignRecodeType && res.userJobCategory == '閿�鍞湇鍔�' ) {
this.showToast('FSE涓嶈兘鐢宠璇ュ浼氱被鍨嬪鍝�','warning');
return;
- } else if ((res.userJobCategory == '閿�鍞湇鍔�' || res.userJobCategory == '鏀彺') && campaignRecodeType !== getCampaignRecodeType && result.opdInternalinchargeprovince.indexOf(ups) == -1) {
+ } else if ((res.userJobCategory == '閿�鍞湇鍔�' || res.userJobCategory == '鏀彺') && campaignRecodeType != getCampaignRecodeType && result.opdInternalinchargeprovince.indexOf(ups) == -1) {
this.showToast("涓嶧SE鎵�鍦ㄧ渷涓�鑷达紝鎵嶅彲浣跨敤澶囧搧",'warning');
return;
} else if (result.opdCampaignStatus == '宸茬粨鏉�') {
@@ -110,16 +110,18 @@
// 鍘烵PD璁″垝(鍐嶇敵璇�) OriginalOpdPlan__c 鍘烵PD璁″垝(琛ュ厖鐢宠) OriginalOpdPlanApplication__c
if (result.opdOriginalOpdPlan == '') {
if (result.opdOriginalOpdPlanApplication == '') {
+ console.log("---------瀛︿細-5555--------",result.opdCampaignId);
if (result.opdType == '瀛︿細' && result.opdCampaignId != '') {
+ console.log("---------瀛︿細---------",result.opdCampaignId);
// var purposeStr = '&00N10000003Msk0=浜у搧璇曠敤' +
// '&00N10000003Msk5=瀛︿細灞曚細' +
// '&CF00N10000003Mp2q_lkid={!URLENCODE(OPDPlan__c.CampaignId__c)}' +
// '&CF00N10000003Mp2q={!URLENCODE(OPDPlan__c.CampaignName__c)}';
- const defaultValues = encodeDefaultFieldValues({
+ let defaultValues = encodeDefaultFieldValues({
// OPDPlan__c:this.recordId,
Demo_purpose1__c:'浜у搧璇曠敤',
demo_purpose2__c:'瀛︿細灞曚細',
- Campaign__c:result.opdCampaign,
+ Campaign__c:result.opdCampaignId,
Account__c:result.opdAccountLaboratory,
Strategic_dept__c:result.opdOCMcategoryId,
Hospital__c:result.opdHospitalId,
@@ -133,6 +135,7 @@
Approved_State_Create__c:result.ApprovedStatus,
ApprovedNo_Create__c:result.opdApprovedNo
});
+ console.log("---------瀛︿細---defaultValues------",defaultValues);
this.navigateEvents(defaultValues);
} else if (result.opdOpportunityId != '') {
// 璺熻繘璇环ID1
@@ -141,7 +144,7 @@
// '&CF00N10000003O3VB_lkid={!OPDPlan__c.Related_Opportunity1_IDId__c}' +
// '&CF00N10000003O3VB={!HTMLENCODE(OPDPlan__c.Related_Opportunity1_Name__c)}';
console.log("--------defaultValues------")
- const defaultValues = encodeDefaultFieldValues({
+ let defaultValues = encodeDefaultFieldValues({
// OPDPlan__c:this.recordId,
Demo_purpose1__c:'浜у搧璇曠敤',
demo_purpose2__c:'璇曠敤锛堟湁璇环锛�',
@@ -168,7 +171,7 @@
// var purposeStr = '&00N10000003Msk0=浜у搧璇曠敤' +
// '&00N10000003Msk5=璇曠敤锛堟棤璇环锛�' +
// '&00N100000098amW={!OPDPlan__c.NoOpp_Reason__c}';
- const defaultValues = encodeDefaultFieldValues({
+ let defaultValues = encodeDefaultFieldValues({
// OPDPlan__c:this.recordId,
Demo_purpose1__c:'浜у搧璇曠敤',
demo_purpose2__c:'璇曠敤锛堟湁璇环锛�',
@@ -206,7 +209,7 @@
// window.open('/a0t/e?retURL=%2F{!OPDPlan__c.Id}' + purposeStr + urlStr );
} else {
- const defaultValues = encodeDefaultFieldValues({
+ let defaultValues = encodeDefaultFieldValues({
// OPDPlan__c:this.recordId,
Cancel_Reason__c:'',
Loaner_cancel_reason__c:'',
@@ -230,7 +233,7 @@
}
}else {
console.log("-------UserInfo_Owner---00000--else-------");
- const defaultValues = encodeDefaultFieldValues({
+ let defaultValues = encodeDefaultFieldValues({
// OPDPlan__c:this.recordId,
Cancel_Reason__c:'',
Loaner_cancel_reason__c:'',
@@ -265,7 +268,7 @@
}
showToast(message, type) {
- const evt = new ShowToastEvent({
+ let evt = new ShowToastEvent({
// title: 'Error',
message: message,
variant: type
@@ -285,6 +288,6 @@
state:{
defaultFieldValues: defaultValues
}
- })
+ });
}
}
\ No newline at end of file
--
Gitblit v1.9.1