From 196df4d4bf1941546d349cadbf343655578ec280 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期三, 13 九月 2023 15:05:56 +0800
Subject: [PATCH] sit期间修改
---
force-app/main/default/pages/LostEditPage1.page | 4
force-app/main/default/lwc/lexCancelReport/lexCancelReport.js | 5
force-app/main/default/lwc/lexSampleOrderListDNReport/lexSampleOrderListDNReport.js-meta.xml | 11
force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.js-meta.xml | 11
force-app/main/default/classes/OpportunityLightingButtonController.cls | 16
force-app/main/default/lwc/lexSampleInventoryReport/lexSampleInventoryReport.html | 3
force-app/main/default/lwc/lexEditLost/lexEditLost.js | 69 +
force-app/main/default/lwc/lexEditLost/lexEditLost.js-meta.xml | 11
force-app/main/default/classes/lexAgencyHospitalLinkController.cls-meta.xml | 5
force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js | 7
force-app/main/default/classes/lexSolutionProjectRequirementsController.cls | 2
force-app/main/default/pages/InventoryIframe.page | 5
force-app/main/default/pages/NewQuoteEntry.page | 70
force-app/main/default/lwc/lexSampleInventoryReport/lexSampleInventoryReport.js-meta.xml | 11
force-app/main/default/staticresources/lwcCSS.resource-meta.xml | 6
force-app/main/default/lwc/lexNewSolutionProgramma/lexNewSolutionProgramma.js | 15
force-app/main/default/lwc/lexSampleOrderListDNReport/lexSampleOrderListDNReport.html | 3
force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.js | 102 +
force-app/main/default/lwc/lexOLYwinBid/lexOLYwinBid.js | 7
force-app/main/default/lwc/lexUpdateToOpp/lexUpdateToOpp.js | 7
force-app/main/default/lwc/lexQuotationRequest/lexQuotationRequest.js | 17
force-app/main/default/lwc/lexVOCFinish/lexVOCFinish.js | 7
force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js | 7
force-app/main/default/staticresources/lwcCSS.css | 12
force-app/main/default/aura/taskManage/taskManage.cmp | 23
force-app/main/default/lwc/lexBeforeOPDPDFBtnSIS/lexBeforeOPDPDFBtnSIS.js | 7
force-app/main/default/lwc/lexEditLost/lexEditLost.html | 13
force-app/main/default/classes/Solution_ProgrammeTrigger.cls | 9
force-app/main/default/lwc/lexNewSolutionClosingAttachment/lexNewSolutionClosingAttachment.js | 13
force-app/main/default/lwc/lexInventoryReport/lexInventoryReport.html | 3
force-app/main/default/lwc/lexOPDReportConsum/lexOPDReportConsum.js | 7
force-app/main/default/classes/PCLLostReportController.cls | 1196 +++++++++++----------
force-app/main/default/classes/lexAgencyHospitalLinkController.cls | 11
force-app/main/default/lwc/lexSubmitSolutionSchemeForApproval/lexSubmitSolutionSchemeForApproval.js | 34
force-app/main/default/lwc/lexVOCConfirm/lexVOCConfirm.js | 7
force-app/main/default/lwc/lexInventoryReport/lexInventoryReport.js | 45
force-app/main/default/lwc/lexOpporSplite/lexOpporSplite.js | 51
force-app/main/default/lwc/lexEditCancelReport/__tests__/lexEditCancelReport.test.js | 25
force-app/main/default/lwc/lexOpporSplite/lexOpporSplite.html | 4
force-app/main/default/lwc/lexSampleOrderListDNReport/__tests__/lexSampleOrderListDNReport.test.js | 25
force-app/main/default/lwc/lexNewOpportunityAgency/lexNewOpportunityAgency.js | 5
force-app/main/default/lwc/lexSampleInventoryReport/lexSampleInventoryReport.js | 45
force-app/main/default/lwc/lexEditCancelReport/lexEditCancelReport.js-meta.xml | 11
force-app/main/default/lwc/lexCopyWithAsset/lexCopyWithAsset.js | 47
force-app/main/default/lwc/lexCreateAgencyContact/lexCreateAgencyContact.html | 3
force-app/main/default/lwc/lexEditCancelReport/lexEditCancelReport.html | 5
force-app/main/default/lwc/lexInventoryReport/lexInventoryReport.js-meta.xml | 11
force-app/main/default/lwc/lexEditCancelReport/lexEditCancelReport.js | 48
force-app/main/default/lwc/lexInventoryReport/__tests__/lexInventoryReport.test.js | 25
force-app/main/default/lwc/lexSampleInventoryReport/__tests__/lexSampleInventoryReport.test.js | 25
force-app/main/default/classes/taskManageController.cls | 33
force-app/main/default/lwc/lexCancelSubmitReport/lexCancelSubmitReport.js | 7
force-app/main/default/lwc/lexCreateAgencyContact/lexCreateAgencyContact.js | 42
force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.html | 5
force-app/main/default/aura/taskManage/taskManageHelper.js | 182 ++
force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.js | 23
force-app/main/default/lwc/lexSampleOrderListReport/lexSampleOrderListReport.html | 3
force-app/main/default/pages/AssetMaintainIframe.page | 2
force-app/main/default/lwc/lexPredictedDateChange/lexPredictedDateChange.js | 23
force-app/main/default/lwc/lexSubmitSolutionForApproval/lexSubmitSolutionForApproval.js | 8
force-app/main/default/pages/LostViewPage1.page-meta.xml | 2
force-app/main/default/lwc/lexCreateAgencyContact/__tests__/lexCreateAgencyContact.test.js | 25
force-app/main/default/lwc/lexApplyAgainLwc/lexApplyAgainLwc.js | 11
force-app/main/default/pages/PCLLostReportPage.page | 220 +++
force-app/main/default/lwc/lexSampleOrderListReport/lexSampleOrderListReport.js | 45
force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.css | 10
force-app/main/default/lwc/lexSIStoOPD/lexSIStoOPD.js | 7
force-app/main/default/pages/LostViewPage1.page | 2
force-app/main/default/lwc/lexCreateAgencyContact/lexCreateAgencyContact.js-meta.xml | 11
force-app/main/default/lwc/lexSampleOrderListReport/__tests__/lexSampleOrderListReport.test.js | 25
force-app/main/default/classes/lexLostCancelReportController.cls | 83 +
force-app/main/default/lwc/lexDispatchOCSMQARA/lexDispatchOCSMQARA.js | 7
force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js | 7
force-app/main/default/pages/InventoryReport.page | 2
force-app/main/default/lwc/lexOPDReport/lexOPDReport.js | 5
force-app/main/default/lwc/lexRequestDB/lexRequestDB.js | 15
force-app/main/default/lwc/lexSampleOrderListDNReport/lexSampleOrderListDNReport.js | 45
force-app/main/default/classes/lexAccountController.cls | 17
force-app/main/default/pages/InventoryResultRecord.page | 104 +
force-app/main/default/lwc/lexNewOpportunityFile/lexNewOpportunityFile.js | 7
force-app/main/default/aura/taskManage/taskManageController.js | 3
force-app/main/default/lwc/lexChangeContractType/lexChangeContractType.js | 7
force-app/main/default/lwc/lexNewOnLineSurvey/lexNewOnLineSurvey.js | 3
force-app/main/default/lwc/lexStockApply/lexStockApply.js | 10
force-app/main/default/classes/lexLostCancelReportController.cls-meta.xml | 5
force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js | 11
force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html | 7
force-app/main/default/classes/lexSolutionProgrammeController.cls | 9
force-app/main/default/lwc/lexLoseBid/lexLoseBid.js | 8
force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js | 7
force-app/main/default/classes/lexPCLLostReportLwcController.cls | 7
force-app/main/default/pages/LostEditPage1.page-meta.xml | 2
force-app/main/default/lwc/lexSampleOrderListReport/lexSampleOrderListReport.js-meta.xml | 11
93 files changed, 2,277 insertions(+), 902 deletions(-)
diff --git a/force-app/main/default/aura/taskManage/taskManage.cmp b/force-app/main/default/aura/taskManage/taskManage.cmp
index cec895a..48e9e6e 100644
--- a/force-app/main/default/aura/taskManage/taskManage.cmp
+++ b/force-app/main/default/aura/taskManage/taskManage.cmp
@@ -94,6 +94,7 @@
<aura:attribute name="isSelectOtherCancel" type="boolean" default="false"/>
<aura:attribute name="isSelectOtherDelay" type="boolean" default="false"/>
<!--2021-11-11 mzy 浠诲姟绠＄悊鏀瑰杽 end-->
+ <aura:attribute name="estimatedFinishDate" type="Date" />
<aura:handler name="init" value="{! this }" action="{! c.init }"/>
<div>
@@ -369,6 +370,12 @@
class="buttonColor slds-m-right_small" />
<h2 class="slds-text-heading_small ">{!v.errorMessage}</h2>
</div>
+ <div class="slds-notify__close">
+ <button class="slds-button slds-button_icon slds-button_icon-inverse" title="Close" onclick="{! c.closeMessage }">
+ <lightning:icon alternativeText="close" iconName="utility:close" size="small" />
+ <span class="slds-assistive-text">Close</span>
+ </button>
+ </div>
</div>
</div>
</div>
@@ -410,6 +417,15 @@
</aura:if>
</div>
</aura:if>
+
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start -->
+ <aura:if isTrue="{!(v.tempdata.taskType == '鐩樼偣妫�鏌ヨ鍒�' || v.tempdata.taskType == '娓╂箍搴︽鏌ヨ鍒�')}">
+ <div class="slds-modal__content slds-p-around_medium" id="modal-content-id-1" style ="min-Height: 100px;max-width: 600px;">
+ <lightning:input type="date" label="棰勮瀹屾垚鏃堕棿" name="estimatedFinishDate" value="{! v.estimatedFinishDate }" required="true" placeholder="璇烽�夋嫨" variant="label-inline" />
+ </div>
+ </aura:if>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End -->
+
<!--###### MODAL BOX FOOTER Part Start ######-->
<footer class="slds-modal__footer" style= "max-width: 600px;">
@@ -540,7 +556,7 @@
</p>
</div> -->
<div class="slds-modal__content slds-p-around_medium" id="modal-content-id-1" style ="min-Height: 250px;max-width: 600px;">
- <p class="slds-p-horizontal_small">
+ <p class="slds-p-horizontal_small">
<aura:if isTrue="{!v.tempisFSE == false}">
<lightning:recordEditForm objectApiName="task__c" recordTypeId = "{!v.tempTask.RecordTypeId}">
<lightning:inputField fieldName="delayReasonSelect__c" required="true" onchange="{!c.handleChangeDelay}"/>
@@ -555,6 +571,11 @@
<div style="padding-top: 5px;padding-left: 12px;color:#6B6D70;">寤舵湡鐞嗙敱(鍏朵粬)</div>
<lightning:input name="delayReason" value="{! v.delayReasonOther }" placeholder="璇疯緭鍏ュ欢鏈熺悊鐢�(鍏朵粬)"/>
</aura:if>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start -->
+ <aura:if isTrue="{!(v.tempdata.taskType == '鐩樼偣妫�鏌ヨ鍒�' || v.tempdata.taskType == '娓╂箍搴︽鏌ヨ鍒�')}">
+ <lightning:input type="date" label="寤舵湡鑷虫椂闂�" name="estimatedFinishDate" value="{! v.estimatedFinishDate }" required="true" placeholder="璇烽�夋嫨" variant="label-inline" />
+ </aura:if>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End -->
</p>
</div>
<footer class="slds-modal__footer" style ="max-width: 600px;">
diff --git a/force-app/main/default/aura/taskManage/taskManageController.js b/force-app/main/default/aura/taskManage/taskManageController.js
index 49bd3fe..d52def8 100644
--- a/force-app/main/default/aura/taskManage/taskManageController.js
+++ b/force-app/main/default/aura/taskManage/taskManageController.js
@@ -177,5 +177,8 @@
helper.checkEnquiry(cmp,tempData.id);
}
//2021-10-25 yjk 鍙栨秷鍘熷洜涓哄け鍗曪紝鏌ョ湅璇环鎶ュ憡鎸夐挳 end
+ ,closeMessage : function(cmp,event,helper){
+ $A.util.addClass(cmp.find('errorDiv'), 'slds-hide');
+ }
});
\ No newline at end of file
diff --git a/force-app/main/default/aura/taskManage/taskManageHelper.js b/force-app/main/default/aura/taskManage/taskManageHelper.js
index ce5ac00..f9d344b 100644
--- a/force-app/main/default/aura/taskManage/taskManageHelper.js
+++ b/force-app/main/default/aura/taskManage/taskManageHelper.js
@@ -64,13 +64,14 @@
{
label: "鍒涘缓鏃ユ湡",
fieldName: "taskCreateddate",
- type: "date-local",
- typeAttributes:{
- weekday: "long",
- year: "numeric",
- month: "long",
- day: "2-digit"
- },
+ type: "text",
+ // type: "date-local",
+ // typeAttributes:{
+ // weekday: "long",
+ // year: "numeric",
+ // month: "long",
+ // day: "2-digit"
+ // },
sortable: true ,
wrapText: true,
},
@@ -143,7 +144,7 @@
label: '鍚堝苟',
name: 'Merge',
title: '鍚堝苟',
- disabled: { fieldName: 'confirmButtonisDisabled'},
+ disabled: { fieldName: 'mergeConfirmButtonisDisabled'},
value: 'Merge'
},
initialWidth: 76,
@@ -195,13 +196,14 @@
{
label: "鍒涘缓鏃ユ湡",
fieldName: "taskCreateddate",
- type: "date-local",
- typeAttributes:{
- weekday: "long",
- year: "numeric",
- month: "long",
- day: "2-digit"
- },
+ type: "text",
+ // type: "date-local",
+ // typeAttributes:{
+ // weekday: "long",
+ // year: "numeric",
+ // month: "long",
+ // day: "2-digit"
+ // },
sortable: true
},
{
@@ -289,13 +291,14 @@
{
label: "鍒涘缓鏃ユ湡",
fieldName: "taskCreateddate",
- type: "date-local",
- typeAttributes:{
- weekday: "long",
- year: "numeric",
- month: "long",
- day: "2-digit"
- },
+ type: "text",
+ // type: "date-local",
+ // typeAttributes:{
+ // weekday: "long",
+ // year: "numeric",
+ // month: "long",
+ // day: "2-digit"
+ // },
sortable: true ,
wrapText: true,
},
@@ -368,7 +371,7 @@
label: '鍚堝苟',
name: 'Merge',
title: '鍚堝苟',
- disabled: { fieldName: 'confirmButtonisDisabled'},
+ disabled: { fieldName: 'mergeConfirmButtonisDisabled'},
value: 'Merge'
},
initialWidth: 76,
@@ -445,13 +448,14 @@
{
label: "鍒涘缓鏃ユ湡",
fieldName: "taskCreateddate",
- type: "date-local",
- typeAttributes:{
- weekday: "long",
- year: "numeric",
- month: "long",
- day: "2-digit"
- },
+ type: "text",
+ // type: "date-local",
+ // typeAttributes:{
+ // weekday: "long",
+ // year: "numeric",
+ // month: "long",
+ // day: "2-digit"
+ // },
sortable: true ,
wrapText: true,
},
@@ -524,7 +528,7 @@
label: '鍚堝苟',
name: 'Merge',
title: '鍚堝苟',
- disabled: { fieldName: 'confirmButtonisDisabled'},
+ disabled: { fieldName: 'mergeConfirmButtonisDisabled'},
value: 'Merge'
},
initialWidth: 76,
@@ -620,6 +624,23 @@
var state = response.getState();
if (state === "SUCCESS") {
var res = response.getReturnValue();
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ for(var rowIndex = 0 ;rowIndex<res.myTasks.length;rowIndex++){
+ if (res.myTasks[rowIndex].taskType == '鐩樼偣妫�鏌ヨ鍒�' || res.myTasks[rowIndex].taskType == '娓╂箍搴︽鏌ヨ鍒�') {
+ res.myTasks[rowIndex]['cancelButtonisDisabled'] = true ;
+ res.myTasks[rowIndex]['assignButtonisDisabled_Owner'] = true ;
+ res.myTasks[rowIndex]['mergeConfirmButtonisDisabled'] = true ;
+ }
+ };
+
+ for(var rowIndex = 0 ;rowIndex<res.subTasks.length;rowIndex++){
+ if (res.subTasks[rowIndex].taskType == '鐩樼偣妫�鏌ヨ鍒�' || res.subTasks[rowIndex].taskType == '娓╂箍搴︽鏌ヨ鍒�') {
+ res.subTasks[rowIndex]['cancelButtonisDisabled'] = true ;
+ res.subTasks[rowIndex]['assignButtonisDisabled_Owner'] = true ;
+ res.subTasks[rowIndex]['mergeConfirmButtonisDisabled'] = true ;
+ }
+ };
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
cmp.set('v.data',res.myTasks);
cmp.set('v.data2',res.subTasks);
cmp.set('v.dataCopy',res.myTasks);
@@ -738,6 +759,7 @@
//鍚庡彴鏂规硶鐨勫洖璋冨嚱鏁�
},
//20210105 CHAN-BWX3YU you end
+
// 鎺掑簭閫昏緫璁惧畾
sortBy: function(field, reverse, primer) {
var key = primer ? function(x) {
@@ -798,8 +820,17 @@
if (state === "SUCCESS") {
var res = response.getReturnValue();
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ for(var rowIndex = 0 ;rowIndex<res.myTasks.length;rowIndex++){
+ if (res.myTasks[rowIndex].taskType == '鐩樼偣妫�鏌ヨ鍒�' || res.myTasks[rowIndex].taskType == '娓╂箍搴︽鏌ヨ鍒�') {
+ res.myTasks[rowIndex]['cancelButtonisDisabled'] = true ;
+ res.myTasks[rowIndex]['assignButtonisDisabled_Owner'] = true ;
+ res.myTasks[rowIndex]['mergeConfirmButtonisDisabled'] = true ;
+ }
+ };
cmp.set('v.data',res.myTasks);
cmp.set('v.dataCopy',res.myTasks);
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
}
this.hideSpinner(cmp);
});
@@ -985,6 +1016,7 @@
Accept:function (cmp, row, action) {
cmp.set('v.ActivityDate',null);
cmp.set('v.feedbackPlanDate',null);
+ cmp.set('v.estimatedFinishDate', '');
//闄や簡璁板綍绫诲瀷涓哄叾浠�,涓斾换鍔″尯鍒嗕负涓婄骇鍒嗛厤浠诲姟鏃�,鍏朵粬閮借烦杞簨浠堕〉闈�
if('鍏朵粬'!=row.taskType){
cmp.set("v.IsEventDefault", true);
@@ -1066,6 +1098,26 @@
}
//check end
//2021-10-19 mzy 浠诲姟绠＄悊鏀瑰杽 end
+
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ // var estimatedFinishDate = cmp.get("v.estimatedFinishDate");
+ var estimatedFinishDate = new Date(cmp.get("v.estimatedFinishDate"));
+ if (row.taskType == '鐩樼偣妫�鏌ヨ鍒�' || row.taskType == '娓╂箍搴︽鏌ヨ鍒�') {
+ var estimatedFinishDate = cmp.get("v.estimatedFinishDate");
+
+ if (!estimatedFinishDate) {
+ alert('璇疯緭鍏ラ璁″畬鎴愭椂闂达紒');
+ return;
+ }
+
+ var latestFinishDate = row.latestFinishDate;
+ if (estimatedFinishDate > latestFinishDate) {
+ alert('棰勮瀹屾垚鏃堕棿涓嶈兘瓒呰繃鏈�鏅氬畬鎴愭棩('+latestFinishDate+')');
+ return;
+ }
+ }
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
+
var action = cmp.get("c.confirmOrDelay");
action.setParams({
"taskID" : row.id,
@@ -1073,12 +1125,18 @@
"delayReason" : '',
"IsGeneratePlan":IsGeneratePlan, //2021-10-20 mzy 浠诲姟绠＄悊鏀瑰杽
"ActivityDate" : activityDate, //2021-10-20 mzy 浠诲姟绠＄悊鏀瑰杽
- "feedbackPlanDate" : feedbackPlanDate
+ "feedbackPlanDate" : feedbackPlanDate,
+ "estimatedFinishDate" : estimatedFinishDate,
+ "delayReasonOther" : ''
});
//2021-10-20 mzy 浠诲姟绠＄悊鏀瑰杽 start
//闇�瑕佺敓鎴愯鍒掓墠浼氳烦杞埌浜嬩欢椤甸潰,灏嗕换鍔d甯﹀埌浜嬩欢椤甸潰
- if(IsGeneratePlan==true){
- window.open('/apex/SimpleEventRegister?taskId=' + row.id,'_blank');
+ if(IsGeneratePlan==true){
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ if (row.taskType != '鐩樼偣妫�鏌ヨ鍒�' && row.taskType != '娓╂箍搴︽鏌ヨ鍒�') {
+ window.open('/apex/SimpleEventRegister?taskId=' + row.id,'_blank');
+ }
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
}
//2021-10-20 mzy 浠诲姟绠＄悊鏀瑰杽 end
this.showSpinner(cmp);
@@ -1093,6 +1151,7 @@
rows[rowIndex]['taskStatus'] = '02 鎺ュ彈' ;
rows[rowIndex]['cancelButtonisDisabled'] = true ;
rows[rowIndex]['confirmButtonisDisabled'] = true ;
+ rows[rowIndex]['mergeConfirmButtonisDisabled'] = true ;
rows[rowIndex]['delayButtonisDisabled'] = true ;
rows[rowIndex]['assignButtonisDisabled_Owner'] = true ; //2021-10-20 mzy 浠诲姟绠＄悊鏀瑰杽
cmp.set('v.data', rows);
@@ -1137,6 +1196,7 @@
cmp.set('v.tempisFSE',row.isFSE);
cmp.set('v.delayReason', '');
cmp.set('v.delayReasonOther', '');
+ cmp.set('v.estimatedFinishDate', '');
cmp.set('v.delayIsOpen', true);
},
//纭鍙栨秷
@@ -1171,6 +1231,7 @@
rows[rowIndex]['taskStatus'] = '04 鍙栨秷' ;
rows[rowIndex]['cancelButtonisDisabled'] = true ;
rows[rowIndex]['confirmButtonisDisabled'] = true ;
+ rows[rowIndex]['mergeConfirmButtonisDisabled'] = true ;
rows[rowIndex]['delayButtonisDisabled'] = true ;
rows[rowIndex]['assignButtonisDisabled_Owner'] = true ; //2021-10-20 mzy 浠诲姟绠＄悊鏀瑰杽
cmp.set('v.data', rows);
@@ -1205,14 +1266,33 @@
if(delayReason == '鍏朵粬' && !delayReasonOther){
alert('寤舵湡鐞嗙敱(閫夐」)涓哄叾浠栨椂璇疯緭鍏ュ欢鏈熺悊鐢憋紙鍏朵粬锛夛紒');
return;
-
}
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ // var estimatedFinishDate = cmp.get("v.estimatedFinishDate");
+ var estimatedFinishDate = new Date(cmp.get("v.estimatedFinishDate"));
+ if (tempdata.taskType == '鐩樼偣妫�鏌ヨ鍒�' || tempdata.taskType == '娓╂箍搴︽鏌ヨ鍒�') {
+ var estimatedFinishDate = cmp.get("v.estimatedFinishDate");
+
+ if (!estimatedFinishDate) {
+ alert('璇疯緭鍏ュ欢鏈熻嚦鏃堕棿锛�');
+ return;
+ }
+
+ var createdAfter3Month = tempdata.createdAfter3Month;
+ if (estimatedFinishDate > createdAfter3Month) {
+ alert('寤舵湡鑷虫椂闂翠笉鑳借秴杩�('+createdAfter3Month+')');
+ return;
+ }
+ }
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
+
var action = cmp.get("c.confirmOrDelay");
action.setParams({
"taskID" : tempdata.id,
"isDelay" : true,
"delayReason" : delayReason,
"delayReasonOther" : delayReasonOther,
+ "estimatedFinishDate" : estimatedFinishDate,
});
this.showSpinner(cmp);
action.setCallback(this, function(response) {
@@ -1226,6 +1306,7 @@
rows[rowIndex]['taskStatus'] = '05 寤舵湡' ;
rows[rowIndex]['cancelButtonisDisabled'] = true ;
rows[rowIndex]['confirmButtonisDisabled'] = true ;
+ rows[rowIndex]['mergeConfirmButtonisDisabled'] = true ;
rows[rowIndex]['delayButtonisDisabled'] = true ;
rows[rowIndex]['assignButtonisDisabled_Owner'] = true ; //2021-11-11 mzy 浠诲姟绠＄悊鏀瑰杽
cmp.set('v.data', rows);
@@ -1245,9 +1326,11 @@
});
$A.enqueueAction(action);
-
- window.open('/apex/SimpleEventRegister?isDelay=true&taskId=' + tempdata.id ,'_blank');
-
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ if (tempdata.taskType != '鐩樼偣妫�鏌ヨ鍒�' && tempdata.taskType != '娓╂箍搴︽鏌ヨ鍒�') {
+ window.open('/apex/SimpleEventRegister?isDelay=true&taskId=' + tempdata.id ,'_blank');
+ }
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
},
// 纭閲嶆柊鍒嗛厤
ConfirmAssign: function(cmp, event) {
@@ -1321,6 +1404,7 @@
rows[rowIndex]['taskAssigneeName'] = res.assigneeName ;
rows[rowIndex]['cancelButtonisDisabled'] = true ;
rows[rowIndex]['confirmButtonisDisabled'] = true ;
+ rows[rowIndex]['mergeConfirmButtonisDisabled'] = true ;
rows[rowIndex]['delayButtonisDisabled'] = true ;
rows[rowIndex]['assignButtonisDisabled_Owner'] = true ;
cmp.set('v.data', rows);
@@ -1350,20 +1434,20 @@
//寮瑰嚭 閿欒鎻愮ず
showErrorToast : function(cmp) {
$A.util.removeClass(cmp.find('errorDiv'), 'slds-hide');
- window.setTimeout($A.getCallback(function() {
- $A.util.addClass(cmp.find('errorDiv'), 'slds-hide');
- }),
- 5000
- );
+ // window.setTimeout($A.getCallback(function() {
+ // $A.util.addClass(cmp.find('errorDiv'), 'slds-hide');
+ // }),
+ // 5000
+ // );
},
//寮瑰嚭 閿欒鎻愮ず 鏂囧瓧杈冨锛屾樉绀烘寔缁�10绉� - 2021-11-12 yjk
showErrorToastLongTime : function(cmp) {
$A.util.removeClass(cmp.find('errorDiv'), 'slds-hide');
- window.setTimeout($A.getCallback(function() {
- $A.util.addClass(cmp.find('errorDiv'), 'slds-hide');
- }),
- 10000
- );
+ // window.setTimeout($A.getCallback(function() {
+ // $A.util.addClass(cmp.find('errorDiv'), 'slds-hide');
+ // }),
+ // 10000
+ // );
},
// function automatic called by aura:waiting event
showSpinner: function(cmp) {
@@ -1379,7 +1463,7 @@
},
//wangweipeng 鑾峰彇url鐨勫弬鏁� 2021/09/27 start
getURLParameterValue: function() {
- var querystring = location.search.substr(1);
+ var querystring = window.location.search.substr(1);
var paramValue = {};
querystring.split("&").forEach(function(part) {
var param = part.split("=");
diff --git a/force-app/main/default/classes/OpportunityLightingButtonController.cls b/force-app/main/default/classes/OpportunityLightingButtonController.cls
index aef53cc..ebb24f6 100644
--- a/force-app/main/default/classes/OpportunityLightingButtonController.cls
+++ b/force-app/main/default/classes/OpportunityLightingButtonController.cls
@@ -2,9 +2,17 @@
* @Description:
* @version:
* @Author: chen jing wu
+ * @Date: 2023-09-09 13:27:58
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-09-12 17:40:11
+ */
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
* @Date: 2023-04-12 11:16:07
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-09-08 16:57:51
+ * @LastEditTime: 2023-09-08 16:58:57
*/
public with sharing class OpportunityLightingButtonController {
@AuraEnabled
@@ -22,6 +30,12 @@
}
return res;
}
+
+ @AuraEnabled
+ public static Id queryForProfileId(){
+
+ return UserInfo.getProfileId();
+ }
@AuraEnabled
public static InitData initForPredictedDateChangeButton(String recordId){
InitData res = new InitData();
diff --git a/force-app/main/default/classes/PCLLostReportController.cls b/force-app/main/default/classes/PCLLostReportController.cls
index bebafa5..bfe5c1d 100644
--- a/force-app/main/default/classes/PCLLostReportController.cls
+++ b/force-app/main/default/classes/PCLLostReportController.cls
@@ -19,645 +19,713 @@
public integer topNum {get; set;}
public integer secondNum {get; set;}
// add tcm 20211122 end
-
-
+
+ public Decimal InclusionUltrasound {get; set;} //20230506 lt DB202304618804 鍖呭惈瓒呭０ add
+
+
// 绔炰簤瀵规墜瀵圭収鍏崇郴琛紝key鏄搧鐗屽悕瀛楋紝value鏄疘D
public map<string,id> CompetitionMap;
public PCLLostReportController(ApexPages.StandardController controller) {
- this();
+ this();
}
public PCLLostReportController(){
- oppId =
- ApexPages.currentPage().getParameters().get('oppId') == null ? ''
- : ApexPages.currentPage().getParameters().get('oppId');
- lostReportId =
- ApexPages.currentPage().getParameters().get('Id') == null ? ''
- : ApexPages.currentPage().getParameters().get('Id');
- pageStatus =
- ApexPages.currentPage().getParameters().get('pageStatus') == null ? ''
- : ApexPages.currentPage().getParameters().get('pageStatus');
- lostType =
- ApexPages.currentPage().getParameters().get('lostType') == null ? ''
- : ApexPages.currentPage().getParameters().get('lostType');
- submitFlag = ApexPages.currentPage().getParameters().get('submitFlag') == null ? ''
- : ApexPages.currentPage().getParameters().get('submitFlag');
-
+ oppId =
+ ApexPages.currentPage().getParameters().get('oppId') == null ? ''
+ : ApexPages.currentPage().getParameters().get('oppId');
+ lostReportId =
+ ApexPages.currentPage().getParameters().get('Id') == null ? ''
+ : ApexPages.currentPage().getParameters().get('Id');
+ pageStatus =
+ ApexPages.currentPage().getParameters().get('pageStatus') == null ? ''
+ : ApexPages.currentPage().getParameters().get('pageStatus');
+ lostType =
+ ApexPages.currentPage().getParameters().get('lostType') == null ? ''
+ : ApexPages.currentPage().getParameters().get('lostType');
+ submitFlag = ApexPages.currentPage().getParameters().get('submitFlag') == null ? ''
+ : ApexPages.currentPage().getParameters().get('submitFlag');
+
}
// 鍒濆鍖�
public void init(){
- if(string.isblank(pageStatus)) {
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '椤甸潰鍑洪敊锛岃鍒锋柊鍚庨噸璇曪紒'));
- // 杩欓噷闇�瑕佹姤閿欐病鏈変紶鍙傛暟
- return;
+ if(string.isblank(pageStatus)) {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '椤甸潰鍑洪敊锛岃鍒锋柊鍚庨噸璇曪紒'));
+ // 杩欓噷闇�瑕佹姤閿欐病鏈変紶鍙傛暟
+ return;
+ }
+ else if(pageStatus.equals('Create')) {
+ if(string.isBlank(oppId)) {
+ // 杩欓噷鎶ラ敊鍒涘缓鏃跺�欏繀椤绘湁璇环
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鍒涘缓澶卞崟鎶ュ憡鏃讹紝璇烽噸璇环椤甸潰鍒涘缓'));
+ return;
}
- else if(pageStatus.equals('Create')) {
- if(string.isBlank(oppId)) {
- // 杩欓噷鎶ラ敊鍒涘缓鏃跺�欏繀椤绘湁璇环
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鍒涘缓澶卞崟鎶ュ憡鏃讹紝璇烽噸璇环椤甸潰鍒涘缓'));
- return;
- }
- list<opportunity> opplist =
- [select id,Name,
- Sales_assistant_ID__c,
- Sales_manager_departmentID__c,Sales_owner_buchangID__c
- from opportunity
- where id =: oppId
- limit 1];
- if( opplist.size() == 0) {
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鎮ㄦ病鏈夎浠风殑鏌ョ湅鏉冮檺锛屾棤娉曞垱寤哄け鍗曟姤鍛婏紒'));
- pageStatus = null;
- return;
- }
- Schema.DescribeSObjectResult s = Lost_cancel_report__c.sObjectType.getDescribe();
- if( !s.isCreateable()) {
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鎮ㄤ笉鑳藉垱寤哄け鍗�/閮ㄥ垎澶卞崟鎶ュ憡锛�'));
- return;
- }
- Lost_cancel_report__c tempLostReport =
- new Lost_cancel_report__c(LostType__c= lostType,
- Opportunity__c = oppId,
- Sales_assistant__c = opplist[0].Sales_assistant_ID__c,
- Manager_sales__c = opplist[0].Sales_manager_departmentID__c,
- Buchang_sales__c = opplist[0].Sales_owner_buchangID__c,
- Submit_Day__c = date.today(),
- Report_Status__c = '鑽夋');
- LostReport = new LostReport(tempLostReport);
- brandCount = 1;
+ list<opportunity> opplist =
+ [select id,Name,
+ Sales_assistant_ID__c,
+ Sales_manager_departmentID__c,Sales_owner_buchangID__c
+ from opportunity
+ where id =: oppId
+ limit 1];
+ if( opplist.size() == 0) {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鎮ㄦ病鏈夎浠风殑鏌ョ湅鏉冮檺锛屾棤娉曞垱寤哄け鍗曟姤鍛婏紒'));
+ pageStatus = null;
+ return;
}
- else if(pageStatus.equals('View') || pageStatus.equals('Edit')) {
- system.debug('edit1');
- if(string.isBlank(lostReportId)) {
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鎮ㄦ病鏈夋煡鐪嬭繖涓け鍗�/閮ㄥ垎澶卞崟鎶ュ憡鐨勬潈闄愶紒'));
- pageStatus = null;
- return;
- }
- system.debug('edit2');
- list<Lost_cancel_report__c> lostReportList =
- [select id,of_lost_system_processor__c,
- Lost_reason_main__c,
- Lost_Reason_Sub__c,Lost_By_Company__c,
- LostTotalAmount__c,LostType__c,
- Report_Status__c,Sales_assistant__c,
- Opportunity__c, Opportunity__r.Sales_assistant_ID__c,
- Opportunity__r.Sales_manager_departmentID__c,
- Manager_sales__c,recordtypeid,recordtype.DeveloperName
- from Lost_cancel_report__c
- where id =: lostReportId limit 1];
-
- if(lostReportList.size() == 0) {
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鎮ㄦ病鏈夋煡鐪嬭繖涓け鍗�/閮ㄥ垎澶卞崟鎶ュ憡鐨勬潈闄愶紒'));
- pageStatus = null;
- return;
- }
- lostReportList[0].Sales_assistant__c =
- lostReportList[0].Opportunity__r.Sales_assistant_ID__c;
- lostReportList[0].Manager_sales__c =
- lostReportList[0].Opportunity__r.Sales_manager_departmentID__c;
- if(lostReportList[0].recordtype.DeveloperName.equals('PCL_Lost_report')) {
- lostReportList[0].LostType__c ='澶卞崟';
-
- }else if(lostReportList[0].recordtype.DeveloperName.equals('PCL_PartLost_report')) {
- lostReportList[0].LostType__c ='閮ㄥ垎澶卞崟';
- }
- // 鏉冮檺锛屽鏋滃綋鍓嶇姸鎬佷笉鏄崏妗堜腑锛岄偅涔堥渶瑕佽烦杞埌鍙椤甸潰
- if(!'鑽夋'.equals(lostReportList[0].Report_Status__c) && userinfo.getProfileId() != (ID) '00e10000000Y3o5AAC') {
- pageStatus = 'View';
- }
- oppId = lostReportList[0].Opportunity__c;
- system.debug('edit3');
- list<PCLLostBrand__c> selectlostBrandList =
- [
- select id, LostPrice__c, Lost_By_Company__c,
- Lost_reason_main__c,Lost_Reason_Sub__c,Name,Agency__c, AgencyMannual__c,
- // ProductCategory__c,ProductClass__c,
- Lost_cancel_report__c,Lost_By_Company_Mannual__c,
- ( select id,PCLLostBrand__c,LostProduct__c,
- LostProductMannual__c, //SWAG-C6P9PX lt 20210913 add
- ProductCategory__c,ProductClass__c, //add tcm 20211123
- Quantity__c,Name, LostBrandName__c
- from PCLLostBrand__c.PCLLostBrandProduct__r)
- from PCLLostBrand__c
- where Lost_cancel_report__c =: lostReportId
- ];
- if(selectlostBrandList.size() == 0 ) {
- LostReport = new LostReport(lostReportList[0]);
- brandCount = 1;
- }else{
- system.debug('edit4:'+selectlostBrandList[0]);
- brandCount = 0;
- list<LostBrand> LostBrandList = new list<LostBrand>();
- for(PCLLostBrand__c templostBrand : selectlostBrandList) {
- list<PCLLostProducts> tempProductList = new list<PCLLostProducts>();
- integer productCount = 0;
- system.debug('check products:'+ (templostBrand.PCLLostBrandProduct__r != null) + '|' + (templostBrand.PCLLostBrandProduct__r.size() > 0));
- if (templostBrand.PCLLostBrandProduct__r != null && templostBrand.PCLLostBrandProduct__r.size() > 0) {
- for( PCLLostProduct__c tempProduct: templostBrand.PCLLostBrandProduct__r) {
-
- tempProductList.add(new PCLLostProducts(productCount,tempProduct));
- productCount++;
- }
- } else {
- PCLLostProducts newProduct = new PCLLostProducts();
- if ('鍏朵粬'.equals(templostBrand.Lost_By_Company__c) &&
- templostBrand.Lost_By_Company_Mannual__c != null &&
- !''.equals(templostBrand.Lost_By_Company_Mannual__c)) {
- newProduct.LostProductss.LostBrandName__c = templostBrand.Lost_By_Company_Mannual__c;
- } else {
- newProduct.LostProductss.LostBrandName__c = templostBrand.Lost_By_Company__c;
- }
- system.debug('aaa4+++'+templostBrand.Lost_By_Company_Mannual__c);
- tempProductList.add(newProduct);
- productCount++;
- }
- LostBrandList.add( new LostBrand(brandCount,tempProductList, templostBrand));
- brandCount++;
+ Schema.DescribeSObjectResult s = Lost_cancel_report__c.sObjectType.getDescribe();
+ if( !s.isCreateable()) {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鎮ㄤ笉鑳藉垱寤哄け鍗�/閮ㄥ垎澶卞崟鎶ュ憡锛�'));
+ return;
+ }
+ Lost_cancel_report__c tempLostReport =
+ new Lost_cancel_report__c(LostType__c= lostType,
+ Opportunity__c = oppId,
+ Sales_assistant__c = opplist[0].Sales_assistant_ID__c,
+ Manager_sales__c = opplist[0].Sales_manager_departmentID__c,
+ Buchang_sales__c = opplist[0].Sales_owner_buchangID__c,
+ Submit_Day__c = date.today(),
+ Report_Status__c = '鑽夋');
+ LostReport = new LostReport(tempLostReport);
+ brandCount = 1;
+ }
+ else if(pageStatus.equals('View') || pageStatus.equals('Edit')) {
+ system.debug('edit1');
+ if(string.isBlank(lostReportId)) {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鎮ㄦ病鏈夋煡鐪嬭繖涓け鍗�/閮ㄥ垎澶卞崟鎶ュ憡鐨勬潈闄愶紒'));
+ pageStatus = null;
+ return;
+ }
+ system.debug('edit2');
+ list<Lost_cancel_report__c> lostReportList =
+ [select id,of_lost_system_processor__c,
+ Lost_reason_main__c,
+ Lost_Reason_Sub__c,Lost_By_Company__c,
+ LostTotalAmount__c,LostType__c,
+ TotalAmountLost__c, //20230215 lt DB202302247719
+ InclusionUltrasound__c, //20230506 lt DB202304618804 鍖呭惈瓒呭０
+ ModifyAfterApproval__c,Approved_Day__c,//20230814 lt DB202308068183 澶卞崟鎶ュ憡瀹℃壒鑺傜偣澧炲姞鍔╃悊瀹℃壒鑺傜偣 add
+ Report_Status__c,Sales_assistant__c,
+ Opportunity__c, Opportunity__r.Sales_assistant_ID__c,
+ Opportunity__r.Sales_manager_departmentID__c,
+ Manager_sales__c,recordtypeid,recordtype.DeveloperName
+ from Lost_cancel_report__c
+ where id =: lostReportId limit 1];
+
+ if(lostReportList.size() == 0) {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鎮ㄦ病鏈夋煡鐪嬭繖涓け鍗�/閮ㄥ垎澶卞崟鎶ュ憡鐨勬潈闄愶紒'));
+ pageStatus = null;
+ return;
+ }
+
+ InclusionUltrasound = lostReportList[0].InclusionUltrasound__c; //20230506 lt DB202304618804 鍖呭惈瓒呭０
+
+ lostReportList[0].Sales_assistant__c =
+ lostReportList[0].Opportunity__r.Sales_assistant_ID__c;
+ lostReportList[0].Manager_sales__c =
+ lostReportList[0].Opportunity__r.Sales_manager_departmentID__c;
+ if(lostReportList[0].recordtype.DeveloperName.equals('PCL_Lost_report')) {
+ lostReportList[0].LostType__c ='澶卞崟';
+
+ }else if(lostReportList[0].recordtype.DeveloperName.equals('PCL_PartLost_report')) {
+ lostReportList[0].LostType__c ='閮ㄥ垎澶卞崟';
+ }
+ // 鏉冮檺锛屽鏋滃綋鍓嶇姸鎬佷笉鏄崏妗堜腑锛岄偅涔堥渶瑕佽烦杞埌鍙椤甸潰
+ // 20230814 lt DB202308068183 澶卞崟鎶ュ憡瀹℃壒鑺傜偣澧炲姞鍔╃悊瀹℃壒鑺傜偣 strat 鏀筰f鏉′欢
+ //鍘燂細!'鑽夋'.equals(lostReportList[0].Report_Status__c) && userinfo.getProfileId() != (ID) '00e10000000Y3o5AAC'
+ if(
+ !('鑽夋'.equals(lostReportList[0].Report_Status__c)
+ || userinfo.getProfileId() == (ID) '00e10000000Y3o5AAC'
+ ||('鎵瑰噯'.equals(lostReportList[0].Report_Status__c) &&
+ System.Label.PCLReportProfileId.contains(userinfo.getProfileId()))
+ )
+ ) {
+ // 20230814 lt DB202308068183 澶卞崟鎶ュ憡瀹℃壒鑺傜偣澧炲姞鍔╃悊瀹℃壒鑺傜偣 end 鏀筰f鏉′欢
+ pageStatus = 'View';
+ }
+ oppId = lostReportList[0].Opportunity__c;
+ system.debug('edit3');
+ list<PCLLostBrand__c> selectlostBrandList =
+ [
+ select id, LostPrice__c, Lost_By_Company__c,
+ LostPrices_ThousandY__c, //20230215 lt DB202302247719
+ Lost_reason_main__c,Lost_Reason_Sub__c,Name,Agency__c, AgencyMannual__c,
+ // ProductCategory__c,ProductClass__c,
+ Lost_cancel_report__c,Lost_By_Company_Mannual__c,
+ ( select id,PCLLostBrand__c,LostProduct__c,
+ LostProductMannual__c, //SWAG-C6P9PX lt 20210913 add
+ ProductCategory__c,ProductClass__c, //add tcm 20211123
+ Quantity__c,Name, LostBrandName__c
+ from PCLLostBrand__c.PCLLostBrandProduct__r)
+ from PCLLostBrand__c
+ where Lost_cancel_report__c =: lostReportId
+ ];
+ if(selectlostBrandList.size() == 0 ) {
+ LostReport = new LostReport(lostReportList[0]);
+ brandCount = 1;
+ }else{
+ system.debug('edit4:'+selectlostBrandList[0]);
+ brandCount = 0;
+ list<LostBrand> LostBrandList = new list<LostBrand>();
+ for(PCLLostBrand__c templostBrand : selectlostBrandList) {
+ list<PCLLostProducts> tempProductList = new list<PCLLostProducts>();
+ integer productCount = 0;
+ system.debug('check products:'+ (templostBrand.PCLLostBrandProduct__r != null) + '|' + (templostBrand.PCLLostBrandProduct__r.size() > 0));
+ if (templostBrand.PCLLostBrandProduct__r != null && templostBrand.PCLLostBrandProduct__r.size() > 0) {
+ for( PCLLostProduct__c tempProduct: templostBrand.PCLLostBrandProduct__r) {
+ tempProductList.add(new PCLLostProducts(productCount,tempProduct));
+ productCount++;
+ }
+ } else {
+ PCLLostProducts newProduct = new PCLLostProducts();
+ if ('鍏朵粬'.equals(templostBrand.Lost_By_Company__c) &&
+ templostBrand.Lost_By_Company_Mannual__c != null &&
+ !''.equals(templostBrand.Lost_By_Company_Mannual__c)) {
+ newProduct.LostProductss.LostBrandName__c = templostBrand.Lost_By_Company_Mannual__c;
+ } else {
+ newProduct.LostProductss.LostBrandName__c = templostBrand.Lost_By_Company__c;
}
-
- LostReport = new LostReport(lostReportList[0],LostBrandList);
- system.debug('LostReport.LostBrands:'+LostReport.LostBrands);
+ system.debug('aaa4+++'+templostBrand.Lost_By_Company_Mannual__c);
+ tempProductList.add(newProduct);
+ productCount++;
}
+ LostBrandList.add( new LostBrand(brandCount,tempProductList, templostBrand));
+ brandCount++;
+ }
+
+ LostReport = new LostReport(lostReportList[0],LostBrandList);
+ system.debug('LostReport.LostBrands:'+LostReport.LostBrands);
}
- brandNo = 0;
- // 璇诲彇绔炰簤瀵规墜鍝佺墝
- // BrandmapSet();
- if(string.isNotEmpty(submitFlag)) {
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.CONFIRM,
- '鎻愪氦鎴愬姛锛�'));
-
- }
+ }
+ brandNo = 0;
+ // 璇诲彇绔炰簤瀵规墜鍝佺墝
+ // BrandmapSet();
+ if(string.isNotEmpty(submitFlag)) {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.CONFIRM,
+ '鎻愪氦鎴愬姛锛�'));
+
+ }
}
// 缂栬緫 鍙湁绯荤粺绠＄悊鍛樻垨鑰呰崏妗堜腑鍙互缂栬緫
public PageReference edit2(){
- if( userinfo.getProfileId() == (ID) '00e10000000Y3o5AAC' ||
- '鑽夋'.equals(LostReport.LostReport.Report_Status__c)
- ) {
- pageStatus = 'Edit';
- init();
- }
- else{
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鍙湁鍦ㄨ崏妗堜腑鎵嶈兘杩涜缂栬緫锛�'));
- }
- return null;
+ //20230814 lt DB202308068183 澶卞崟鎶ュ憡瀹℃壒鑺傜偣澧炲姞鍔╃悊瀹℃壒鑺傜偣 start
+ if( userinfo.getProfileId() == (ID) '00e10000000Y3o5AAC' ||
+ '鑽夋'.equals(LostReport.LostReport.Report_Status__c) ||
+ ('鎵瑰噯'.equals(LostReport.LostReport.Report_Status__c) &&
+ System.Label.PCLReportProfileId.contains(userinfo.getProfileId())
+ )
+ ) {
+ //20230814 lt DB202308068183 澶卞崟鎶ュ憡瀹℃壒鑺傜偣澧炲姞鍔╃悊瀹℃壒鑺傜偣 end
+ pageStatus = 'Edit';
+ init();
+ }
+ else{
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鍙湁鍦ㄨ崏妗堜腑鎵嶈兘杩涜缂栬緫锛�'));
+ }
+ return null;
}
// 璁剧疆鍝佺墝
public void setBrand(){
- list<LostBrand> LostBrandlist = LostReport.LostBrands;
- LostBrand tempBrand = LostBrandlist.get(setBrandNo);
- string brandName = tempBrand.lostBrand.Lost_By_Company__c;
- // fy SWAG-CCC6F6 start
- if(!'鍏朵粬'.equals(tempBrand.lostBrand.Lost_By_Company_Mannual__c)){
- tempBrand.lostBrand.Lost_By_Company_Mannual__c = null;
- }
- system.debug('aaa5+++'+tempBrand.lostBrand.Lost_By_Company_Mannual__c);
- // fy SWAG-CCC6F6 end
- // ID compID = CompetitionMap.get(brandName);
- for(PCLLostProducts tempLostProduct : tempBrand.LostProducts ) {
- // test
- // tempLostProduct.LostProductss.Competitor__c = compID;
- tempLostProduct.LostProductss.LostBrandName__c = brandName;
- tempLostProduct.LostProductss.LostProduct__c = null;
- tempLostProduct.LostProductss.LostProductMannual__c = null;
- tempLostProduct.LostProductss.Quantity__c = null;
- tempLostProduct.LostProductss.ProductClass__c = null;
- tempLostProduct.LostProductss.ProductCategory__c = null;
- tempLostProduct.bool=false;
- }
+ list<LostBrand> LostBrandlist = LostReport.LostBrands;
+ LostBrand tempBrand = LostBrandlist.get(setBrandNo);
+ string brandName = tempBrand.lostBrand.Lost_By_Company__c;
+ // fy SWAG-CCC6F6 start
+ if(!'鍏朵粬'.equals(tempBrand.lostBrand.Lost_By_Company_Mannual__c)){
+ tempBrand.lostBrand.Lost_By_Company_Mannual__c = null;
+ }
+ system.debug('aaa5+++'+tempBrand.lostBrand.Lost_By_Company_Mannual__c);
+ // fy SWAG-CCC6F6 end
+ // ID compID = CompetitionMap.get(brandName);
+ for(PCLLostProducts tempLostProduct : tempBrand.LostProducts ) {
+ // test
+ // tempLostProduct.LostProductss.Competitor__c = compID;
+ tempLostProduct.LostProductss.LostBrandName__c = brandName;
+ tempLostProduct.LostProductss.LostProduct__c = null;
+ tempLostProduct.LostProductss.LostProductMannual__c = null;
+ tempLostProduct.LostProductss.Quantity__c = null;
+ tempLostProduct.LostProductss.ProductClass__c = null;
+ tempLostProduct.LostProductss.ProductCategory__c = null;
+ tempLostProduct.bool=false;
+ }
}
// 璁剧疆鍝佺墝
public void setbrandmannual(){
- list<LostBrand> LostBrandlist = LostReport.LostBrands;
- LostBrand tempBrand = LostBrandlist.get(setBrandNo);
- string brandName = tempBrand.lostBrand.Lost_By_Company__c;
- String brandNameMannual = tempBrand.lostBrand.Lost_By_Company_Mannual__c;
- // ID compID = CompetitionMap.get(brandName);
- for(PCLLostProducts tempLostProduct : tempBrand.LostProducts ) {
- // test
- // tempLostProduct.LostProductss.Competitor__c = compID;
- system.debug('aaaa3++'+brandNameMannual);
- if ('鍏朵粬'.equals(brandName) && brandNameMannual != null && !''.equals(brandNameMannual)) {
- tempLostProduct.LostProductss.LostBrandName__c = brandNameMannual;
- // tempLostProduct.LostProductss.LostProduct__c = null;
- // tempLostProduct.LostProductss.LostProductMannual__c = null;
- // tempLostProduct.LostProductss.Quantity__c = null;
- // tempLostProduct.LostProductss.ProductClass__c = null;
- // tempLostProduct.LostProductss.ProductCategory__c = null;
- // tempLostProduct.bool=false;
- }
+ list<LostBrand> LostBrandlist = LostReport.LostBrands;
+ LostBrand tempBrand = LostBrandlist.get(setBrandNo);
+ string brandName = tempBrand.lostBrand.Lost_By_Company__c;
+ String brandNameMannual = tempBrand.lostBrand.Lost_By_Company_Mannual__c;
+ // ID compID = CompetitionMap.get(brandName);
+ for(PCLLostProducts tempLostProduct : tempBrand.LostProducts ) {
+ // test
+ // tempLostProduct.LostProductss.Competitor__c = compID;
+ system.debug('aaaa3++'+brandNameMannual);
+ if ('鍏朵粬'.equals(brandName) && brandNameMannual != null && !''.equals(brandNameMannual)) {
+ tempLostProduct.LostProductss.LostBrandName__c = brandNameMannual;
+ // tempLostProduct.LostProductss.LostProduct__c = null;
+ // tempLostProduct.LostProductss.LostProductMannual__c = null;
+ // tempLostProduct.LostProductss.Quantity__c = null;
+ // tempLostProduct.LostProductss.ProductClass__c = null;
+ // tempLostProduct.LostProductss.ProductCategory__c = null;
+ // tempLostProduct.bool=false;
}
+ }
}
// 淇濆瓨
public PageReference save(){
-
- if(!DataCheck()) {
- return null;
- }
- if(!dataEntry()) {
- return null;
- }
-
- brandCount = LostReport.LostBrands.size();
- pageStatus = 'View';
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.CONFIRM, '淇濆瓨鎴愬姛锛�'));
-
+
+ if(!DataCheck()) {
return null;
+ }
+ if(!dataEntry()) {
+ return null;
+ }
+
+ brandCount = LostReport.LostBrands.size();
+ pageStatus = 'View';
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.CONFIRM, '淇濆瓨鎴愬姛锛�'));
+
+ return null;
}
//璇诲彇骞舵瀯寤虹珵浜夊鎵嬪搧鐗�
// public void BrandmapSet(){
- // CompetitionMap = new map<string, id>();
- // list <Competition_Company__c> competitionList
- // = [select id,name from Competition_Company__c];
- // for(Competition_Company__c tempComp : competitionList ) {
- // CompetitionMap.put(tempComp.name, tempComp.id);
- // }
-
+ // CompetitionMap = new map<string, id>();
+ // list <Competition_Company__c> competitionList
+ // = [select id,name from Competition_Company__c];
+ // for(Competition_Company__c tempComp : competitionList ) {
+ // CompetitionMap.put(tempComp.name, tempComp.id);
+ // }
+
// }
// 鏁版嵁妫�鏌�
public boolean DataCheck(){
- boolean dataCheck = true;
- if(string.isBlank(LostReport.LostReport.LostType__c))
- {
- LostReport.LostReport.LostType__c.addError('蹇呴』濉啓澶卞崟绫诲瀷锛�');
+ boolean dataCheck = true;
+ if(string.isBlank(LostReport.LostReport.LostType__c))
+ {
+ LostReport.LostReport.LostType__c.addError('蹇呴』濉啓澶卞崟绫诲瀷锛�');
+ dataCheck = false;
+ }
+ for(LostBrand tempLostBrand : LostReport.LostBrands ) {
+ system.debug('aaaa1++'+tempLostBrand.lostBrand.Lost_By_Company_Mannual__c);
+ if(string.isblank(tempLostBrand.lostBrand.Lost_By_Company__c)) {
+ tempLostBrand.lostBrand.Lost_By_Company__c.addError('璇峰～鍐欏け鍗曞搧鐗岋紒');
+ dataCheck = false;
+ }// fy SWAG-CCC6F6 start
+ else if('鍏朵粬'.equals(tempLostBrand.lostBrand.Lost_By_Company__c)&&string.isblank(tempLostBrand.lostBrand.Lost_By_Company_Mannual__c)){
+ tempLostBrand.lostBrand.Lost_By_Company_Mannual__c.addError('璇峰～鍐欏け鍗曞搧鐗岋紙鎵嬪姩锛夛紒');
+ dataCheck = false;
+ }// fy SWAG-CCC6F6 end
+ system.debug('aaaa2++'+tempLostBrand.lostBrand.Lost_By_Company_Mannual__c);
+ if(tempLostBrand.lostBrand.LostPrice__c == null) {
+ tempLostBrand.lostBrand.LostPrice__c.addError('澶卞崟閲戦蹇呭～锛�');
+ dataCheck = false;
+ }
+ if(string.isblank(tempLostBrand.lostBrand.Lost_reason_main__c )) {
+ tempLostBrand.lostBrand.Lost_reason_main__c.addError('澶卞崟鐞嗙敱(涓�)蹇呭～锛�');
+ dataCheck = false;
+ }
+ if(string.isblank(tempLostBrand.lostBrand.Agency__c )) {
+ tempLostBrand.lostBrand.Agency__c.addError('涓爣缁忛攢鍟嗗繀濉紒');
+ dataCheck = false;
+ }
+ // 妫�鏌ユ槸鍚︽湁瓒呰繃1涓湁鏁扮殑浜у搧
+ integer productCount = 0;
+ for( PCLLostProducts temlostProduct : tempLostBrand.LostProducts) {
+ if (temlostProduct.LostProductss.LostProduct__c != null || temlostProduct.LostProductss.LostProductMannual__c != null) {
+ System.debug('澶卞崟鍨嬪彿' + temlostProduct.LostProductss.LostProduct__c);
+ System.debug('澶卞崟鍨嬪彿鎵嬪姩' + temlostProduct.LostProductss.LostProductMannual__c);
+ productCount ++;
+ }
+ // update tcm 20211123 start
+ if((temlostProduct.LostProductss.LostProduct__c!=null || temlostProduct.LostProductss.LostProductMannual__c!=null)&&(temlostProduct.LostProductss.Quantity__c==null || temlostProduct.LostProductss.Quantity__c ==0)) {
+ temlostProduct.LostProductss.Quantity__c.addError('璇峰～鍐欏け鍗曟暟閲忥紒');
dataCheck = false;
+ }
+ if((temlostProduct.LostProductss.LostProduct__c!=null || temlostProduct.LostProductss.LostProductMannual__c!=null)&&temlostProduct.LostProductss.ProductCategory__c==null) {
+ if (temlostProduct.LostProductss.ProductClass__c==null) {
+ temlostProduct.LostProductss.ProductClass__c.addError('澶卞崟浜у搧绫诲埆蹇呭～锛�');
+ temlostProduct.LostProductss.ProductCategory__c.addError('澶卞崟浜у搧蹇呭～锛�');
+ }else {
+ temlostProduct.LostProductss.ProductCategory__c.addError('澶卞崟浜у搧蹇呭～锛�');
+ }
+ dataCheck = false;
+ }
+ // 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 start
+ if ((temlostProduct.LostProductss.LostProduct__c==null && temlostProduct.LostProductss.LostProductMannual__c==null)&&(temlostProduct.LostProductss.ProductCategory__c!=null||temlostProduct.LostProductss.Quantity__c!=null)) {
+ if(tempLostBrand.lostBrand.Lost_By_Company__c != '鍏朵粬'){
+ temlostProduct.LostProductss.LostProduct__c.addError('澶卞崟瀵规墜鍨嬪彿鎴栧け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛夊繀濉紒');
+ } else{
+ temlostProduct.LostProductss.LostProductMannual__c.addError('澶卞崟瀵规墜鍨嬪彿鎴栧け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛夊繀濉紒');
+ }
+ dataCheck = false;
+ }
+ // 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 end
+ // update tcm 20211123 end
+ // 20230418 ljh DB202304320022 start
+ String LostBrandNameS = tempLostBrand.lostBrand.Lost_By_Company__c != '鍏朵粬'?tempLostBrand.lostBrand.Lost_By_Company__c:tempLostBrand.lostBrand.Lost_By_Company_Mannual__c;
+ String LostBrandName = temlostProduct.LostProductss.LostBrandName__c;
+ if(LostBrandNameS != LostBrandName){
+ temlostProduct.LostProductss.LostBrandName__c.addError('澶卞崟鍝佺墝鍚嶄笉涓�鑷达紝璇风‘璁�');
+ dataCheck = false;
+ }
+ // 20230418 ljh DB202304320022 end
+
}
- for(LostBrand tempLostBrand : LostReport.LostBrands ) {
- system.debug('aaaa1++'+tempLostBrand.lostBrand.Lost_By_Company_Mannual__c);
- if(string.isblank(tempLostBrand.lostBrand.Lost_By_Company__c)) {
- tempLostBrand.lostBrand.Lost_By_Company__c.addError('璇峰～鍐欏け鍗曞搧鐗岋紒');
- dataCheck = false;
- }// fy SWAG-CCC6F6 start
- else if('鍏朵粬'.equals(tempLostBrand.lostBrand.Lost_By_Company__c)&&string.isblank(tempLostBrand.lostBrand.Lost_By_Company_Mannual__c)){
- tempLostBrand.lostBrand.Lost_By_Company_Mannual__c.addError('璇峰～鍐欏け鍗曞搧鐗岋紙鎵嬪姩锛夛紒');
- dataCheck = false;
- }// fy SWAG-CCC6F6 end
- system.debug('aaaa2++'+tempLostBrand.lostBrand.Lost_By_Company_Mannual__c);
- if(tempLostBrand.lostBrand.LostPrice__c == null) {
- tempLostBrand.lostBrand.LostPrice__c.addError('澶卞崟閲戦蹇呭～锛�');
- dataCheck = false;
- }
- if(string.isblank(tempLostBrand.lostBrand.Lost_reason_main__c )) {
- tempLostBrand.lostBrand.Lost_reason_main__c.addError('澶卞崟鐞嗙敱(涓�)蹇呭～锛�');
- dataCheck = false;
- }
- if(string.isblank(tempLostBrand.lostBrand.Agency__c )) {
- tempLostBrand.lostBrand.Agency__c.addError('涓爣缁忛攢鍟嗗繀濉紒');
- dataCheck = false;
- }
- // 妫�鏌ユ槸鍚︽湁瓒呰繃1涓湁鏁扮殑浜у搧
- integer productCount = 0;
- for( PCLLostProducts temlostProduct : tempLostBrand.LostProducts) {
- if (temlostProduct.LostProductss.LostProduct__c != null || temlostProduct.LostProductss.LostProductMannual__c != null) {
- System.debug('澶卞崟鍨嬪彿' + temlostProduct.LostProductss.LostProduct__c);
- System.debug('澶卞崟鍨嬪彿鎵嬪姩' + temlostProduct.LostProductss.LostProductMannual__c);
- productCount ++;
- }
- // update tcm 20211123 start
- if((temlostProduct.LostProductss.LostProduct__c!=null || temlostProduct.LostProductss.LostProductMannual__c!=null)&&(temlostProduct.LostProductss.Quantity__c==null || temlostProduct.LostProductss.Quantity__c ==0)) {
- temlostProduct.LostProductss.Quantity__c.addError('璇峰～鍐欏け鍗曟暟閲忥紒');
- dataCheck = false;
- }
- if((temlostProduct.LostProductss.LostProduct__c!=null || temlostProduct.LostProductss.LostProductMannual__c!=null)&&temlostProduct.LostProductss.ProductCategory__c==null) {
- if (temlostProduct.LostProductss.ProductClass__c==null) {
- temlostProduct.LostProductss.ProductClass__c.addError('澶卞崟浜у搧绫诲埆蹇呭～锛�');
- temlostProduct.LostProductss.ProductCategory__c.addError('澶卞崟浜у搧蹇呭～锛�');
- }else {
- temlostProduct.LostProductss.ProductCategory__c.addError('澶卞崟浜у搧蹇呭～锛�');
- }
- dataCheck = false;
- }
- // 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 start
- if ((temlostProduct.LostProductss.LostProduct__c==null && temlostProduct.LostProductss.LostProductMannual__c==null)&&(temlostProduct.LostProductss.ProductCategory__c!=null||temlostProduct.LostProductss.Quantity__c!=null)) {
- if(tempLostBrand.lostBrand.Lost_By_Company__c != '鍏朵粬'){
- temlostProduct.LostProductss.LostProduct__c.addError('澶卞崟瀵规墜鍨嬪彿鎴栧け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛夊繀濉紒');
- } else{
- temlostProduct.LostProductss.LostProductMannual__c.addError('澶卞崟瀵规墜鍨嬪彿鎴栧け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛夊繀濉紒');
- }
- dataCheck = false;
- }
- // 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 end
- // update tcm 20211123 end
- }
- // 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 start
- if (productCount == 0 && tempLostBrand.LostProducts != null && tempLostBrand.LostProducts.size() > 0) {
- if(tempLostBrand.lostBrand.Lost_By_Company__c != '鍏朵粬'){
- tempLostBrand.LostProducts[0].LostProductss.LostProduct__c.addError('鑷冲皯褰曞叆1鏉″け鍗曞鎵嬪瀷鍙蜂俊鎭紒');
- }else{
- tempLostBrand.LostProducts[0].LostProductss.LostProductMannual__c.addError('鑷冲皯褰曞叆1鏉″け鍗曞鎵嬪瀷鍙蜂俊鎭紒');
- }
- dataCheck = false;
- }
- // 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 end
+ // 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 start
+ if (productCount == 0 && tempLostBrand.LostProducts != null && tempLostBrand.LostProducts.size() > 0) {
+ if(tempLostBrand.lostBrand.Lost_By_Company__c != '鍏朵粬'){
+ tempLostBrand.LostProducts[0].LostProductss.LostProduct__c.addError('鑷冲皯褰曞叆1鏉″け鍗曞鎵嬪瀷鍙蜂俊鎭紒');
+ }else{
+ tempLostBrand.LostProducts[0].LostProductss.LostProductMannual__c.addError('鑷冲皯褰曞叆1鏉″け鍗曞鎵嬪瀷鍙蜂俊鎭紒');
+ }
+ dataCheck = false;
}
-
- return dataCheck;
+ // 褰撳け鍗曞搧鐗屽悕涓哄叾浠栨椂,鎶ラ敊瀛楁涓哄け鍗曞鎵嬪瀷鍙凤紙鎵嬪姩锛� thh 2022-01-17 end
+ }
+
+ return dataCheck;
}
public list<LostBrand> brandcopy(){
- list<LostBrand> tempbrands = new list<LostBrand>();
- for(LostBrand tempbrand: LostReport.LostBrands) {
- LostBrand LostBrand =
- new LostBrand(tempbrand.lineNo,tempbrand.LostProducts );
- LostBrand.lostBrand = tempbrand.lostBrand.clone();
- LostBrand.lostBrand.id = tempbrand.lostBrand.id;
- tempbrands.add(LostBrand);
- }
- return tempbrands;
+ list<LostBrand> tempbrands = new list<LostBrand>();
+ for(LostBrand tempbrand: LostReport.LostBrands) {
+ LostBrand LostBrand =
+ new LostBrand(tempbrand.lineNo,tempbrand.LostProducts );
+ LostBrand.lostBrand = tempbrand.lostBrand.clone();
+ LostBrand.lostBrand.id = tempbrand.lostBrand.id;
+ tempbrands.add(LostBrand);
+ }
+ return tempbrands;
}
// 鏁版嵁褰曞叆
public boolean dataEntry(){
- system.debug('save---start:');
- Savepoint sp = Database.setSavepoint();
- Lost_cancel_report__c templostReport = LostReport.lostReport.clone();
- templostReport.id = LostReport.lostReport.id;
- list<LostBrand> tempBrands = brandcopy();
- try{
- // 寰呭畬鎴愶紝杩欓噷闇�瑕佹妸绗竴涓搧鐗岀殑淇℃伅璧嬪�煎埌杩欎釜澶卞崟鎶ュ憡涓婂幓锛岃繕鏈夐渶瑕佹妸鍚勪釜鍝佺墝閲戦姹囨�诲姞璧锋潵锛�
- //system.debug('LostReport.LostBrands:'+LostReport.LostBrands);
- // 璁剧疆璁板綍绫诲瀷
- LostReport.lostReport.recordTypeID = LostReport.lostReport.LostType__c== '澶卞崟'?Schema.SObjectType.Lost_cancel_report__c.getRecordTypeInfosByDeveloperName().get('PCL_Lost_report').getRecordTypeId() : Schema.SObjectType.Lost_cancel_report__c.getRecordTypeInfosByDeveloperName().get('PCL_PartLost_report').getRecordTypeId();
- LostReport.lostReport.LostTotalAmount__c = 0;
- LostReport.lostReport.of_lost_system_processor__c = 0;
- LostReport.lostReport.Lost_reason_main__c = null;
- LostReport.lostReport.Lost_Reason_Sub__c = null;
- LostReport.lostReport.Lost_By_Company__c = null;
- for(LostBrand tempLostBrand : LostReport.LostBrands) {
- if(string.isNotBlank(tempLostBrand.lostBrand.Lost_By_Company__c)) {
- LostReport.lostReport.LostTotalAmount__c += tempLostBrand.lostBrand.LostPrice__c;
- LostReport.lostReport.Lost_reason_main__c =
- LostReport.lostReport.Lost_reason_main__c == null
- ? tempLostBrand.lostBrand.Lost_reason_main__c
- : LostReport.lostReport.Lost_reason_main__c;
- LostReport.lostReport.Lost_Reason_Sub__c =
- LostReport.lostReport.Lost_Reason_Sub__c == null
- ? tempLostBrand.lostBrand.Lost_Reason_Sub__c
- : LostReport.lostReport.Lost_Reason_Sub__c;
- LostReport.lostReport.Lost_By_Company__c =
- LostReport.lostReport.Lost_By_Company__c == null
- ? tempLostBrand.lostBrand.Lost_By_Company__c
- : LostReport.lostReport.Lost_By_Company__c;
-
- for( PCLLostProducts tempLostProduct : tempLostBrand.LostProducts) {
- if(tempLostProduct.LostProductss.Quantity__c !=null && tempLostProduct.LostProductss.Quantity__c >0) {
- LostReport.lostReport.of_lost_system_processor__c += tempLostProduct.LostProductss.Quantity__c;
- }
- }
- }
- }
- upsert LostReport.lostReport;
- // 闇�瑕佹彃鍏ユ洿鏂扮殑澶卞崟鍝佺墝
- map<integer,PCLLostBrand__c> upsertLostBrandMap = new map<integer,PCLLostBrand__c>();
- // 闇�瑕佸垹鎺夌殑澶卞崟鍝佺墝
- map<integer,PCLLostBrand__c> deleteLostBrandMap = new map<integer,PCLLostBrand__c>();
- // 闇�瑕佹彃鍏ユ洿鏂扮殑澶卞崟鍨嬪彿锛宬ey鏄搧鐗岀紪鍙�+鍨嬪彿缂栧彿锛寁alue鏄渶瑕佹洿鏂扮殑澶卞崟鍨嬪彿
- map<string,PCLLostProduct__c> upsertLostProductMap = new map<string,PCLLostProduct__c>();
- // 闇�瑕佸垹鎺夌殑澶卞崟鍝佺墝
- list<PCLLostProduct__c> deleteLostProductList = new list<PCLLostProduct__c>();
- for(LostBrand tempLostBrand : LostReport.LostBrands ) {
- // 濡傛灉鏈夊け鍗曞搧鐗岋紝閭ｄ箞灏辫鎻掑叆鏇存柊锛�
- system.debug('tempLostBrand.lostBrand.Lost_By_Company__c:'+tempLostBrand.lostBrand.Lost_By_Company__c);
- if(string.isNotBlank(tempLostBrand.lostBrand.Lost_By_Company__c)) {
- upsertLostBrandMap.put(tempLostBrand.lineNo,tempLostBrand.lostBrand);
- tempLostBrand.lostBrand.Lost_cancel_report__c = LostReport.lostReport.id;
- tempLostBrand.lostBrand.Name = tempLostBrand.lostBrand.Lost_By_Company__c;
- integer tempNo = 0;
- for( PCLLostProducts tempLostProduct : tempLostBrand.LostProducts) {
- system.debug('Name:'+ tempLostProduct.LostProductss.Name );
- if(tempLostProduct.LostProductss.Quantity__c !=null && tempLostProduct.LostProductss.Quantity__c >0) {
- tempLostProduct.LostProductss.Name = tempLostBrand.lostBrand.Name + tempLostProduct.LostProductss.Quantity__c;
- upsertLostProductMap.put(tempLostBrand.lineNo +':'+ tempNo,tempLostProduct.LostProductss);
- }else if(string.isNotBlank(tempLostProduct.LostProductss.id)) {
- deleteLostProductList.add(tempLostProduct.LostProductss);
- }
- tempNo++;
- }
- }
- // 濡傛灉娌℃湁鍝佺墝锛屼絾鏄湁id锛� 杩欐牱鏁版嵁闇�瑕佸垹闄�
- else if(string.isNotBlank(tempLostBrand.lostBrand.id)) {
- deleteLostBrandMap.put(tempLostBrand.lineNo,tempLostBrand.lostBrand);
- // 杩欓噷鍙兘闇�瑕佷篃鍒ゆ柇涓�涓嬪け鍗曞瀷鍙锋湁娌℃湁闇�瑕佸垹鎺�
- }
- }
- if(upsertLostBrandMap.size()>0) {
- upsert upsertLostBrandMap.values();
- }
- for( string productNo :upsertLostProductMap.keyset()) {
- PCLLostProduct__c tempLostProduct = upsertLostProductMap.get(productNo);
- integer brandNo = integer.valueof(productNo.split(':')[0]);
- tempLostProduct.PCLLostBrand__c = upsertLostBrandMap.get(brandNo).id;
- }
- if(upsertLostProductMap.size()>0) {
- upsert upsertLostProductMap.values();
- }
- if(deleteLostBrandMap.size()>0) {
- delete deleteLostBrandMap.values();
- for(PCLLostBrand__c pcl: deleteLostBrandMap.values()) {
- pcl.id = null;
- }
- }
- if(deleteLostProductList.size()>0) {
- delete deleteLostProductList;
- for(PCLLostProduct__c pclp: deleteLostProductList) {
- pclp.id = null;
- }
- }
- if(deleteBrandIDSet.size() > 0) {
- list<id> tempdeleteIDlist = new list<id>();
- tempdeleteIDlist.addall(deleteBrandIDSet);
- database.delete(tempdeleteIDlist);
-
- }
-
- for(integer brandNumber =0; brandNumber< LostReport.LostBrands.size(); brandNumber++) {
-
- LostBrand tempLostBrand = LostReport.LostBrands.get(brandNumber);
- if(tempLostBrand.lostBrand.Id == null) {
- LostReport.LostBrands.remove(brandNumber);
- brandNumber--;
- continue;
- }
- for(integer productNumber = 0; productNumber< tempLostBrand.LostProducts.size(); productNumber++) {
- PCLLostProducts tempLostProduct = tempLostBrand.LostProducts.get(productNumber);
- if(tempLostProduct.LostProductss.Id == null) {
- tempLostBrand.LostProducts.remove(productNumber);
- productNumber--;
- continue;
- }
- }
- }
- lostReportId = LostReport.lostReport.id;
- system.debug('save---end:');
- }catch (Exception ex) {
- Database.rollback(sp);
- LostReport.lostReport = templostReport;
- LostReport.LostBrands = tempBrands;
- // 杩欓噷闇�瑕佸啓涓�浜涙姤閿欎俊鎭�
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error,ex.getMessage()));
- return false;
+ system.debug('save---start:');
+ Savepoint sp = Database.setSavepoint();
+ Lost_cancel_report__c templostReport = LostReport.lostReport.clone();
+ templostReport.id = LostReport.lostReport.id;
+ list<LostBrand> tempBrands = brandcopy();
+ try{
+ // 寰呭畬鎴愶紝杩欓噷闇�瑕佹妸绗竴涓搧鐗岀殑淇℃伅璧嬪�煎埌杩欎釜澶卞崟鎶ュ憡涓婂幓锛岃繕鏈夐渶瑕佹妸鍚勪釜鍝佺墝閲戦姹囨�诲姞璧锋潵锛�
+ //system.debug('LostReport.LostBrands:'+LostReport.LostBrands);
+ // 璁剧疆璁板綍绫诲瀷
+ LostReport.lostReport.recordTypeID = LostReport.lostReport.LostType__c== '澶卞崟'?Schema.SObjectType.Lost_cancel_report__c.getRecordTypeInfosByDeveloperName().get('PCL_Lost_report').getRecordTypeId() : Schema.SObjectType.Lost_cancel_report__c.getRecordTypeInfosByDeveloperName().get('PCL_PartLost_report').getRecordTypeId();
+ LostReport.lostReport.LostTotalAmount__c = 0;
+ LostReport.lostReport.TotalAmountLost__c = 0; //20230215 lt DB202302247719
+ LostReport.lostReport.of_lost_system_processor__c = 0;
+ LostReport.lostReport.Lost_reason_main__c = null;
+ LostReport.lostReport.Lost_Reason_Sub__c = null;
+ LostReport.lostReport.Lost_By_Company__c = null;
+ //20230814 lt DB202308068183 澶卞崟鎶ュ憡瀹℃壒鑺傜偣澧炲姞鍔╃悊瀹℃壒鑺傜偣 start
+ //鎵瑰噯鏃ヤ笉涓虹┖鏃剁粰淇敼鍚庡啀鎵瑰噯璧嬪��
+ if(LostReport.lostReport.Approved_Day__c != null){
+ LostReport.lostReport.ModifyAfterApproval__c = true;
}
- return true;
+ //20230814 lt DB202308068183 澶卞崟鎶ュ憡瀹℃壒鑺傜偣澧炲姞鍔╃悊瀹℃壒鑺傜偣 end
+ for(LostBrand tempLostBrand : LostReport.LostBrands) {
+ if(string.isNotBlank(tempLostBrand.lostBrand.Lost_By_Company__c)) {
+ LostReport.lostReport.LostTotalAmount__c += tempLostBrand.lostBrand.LostPrice__c;
+ //20230215 lt DB202302247719 start
+ Decimal med = tempLostBrand.lostBrand.LostPrice__c/1.13/1000;
+ Decimal med1 = med.setScale(2);
+ // System.debug('---lt123涓嶅惈绋庢暟鍊�(浜哄伐)Decimal---'+med);
+ // System.debug('---lt123涓嶅惈绋庢暟鍊�(浜哄伐)Decimal涓や綅灏忔暟---'+med1);
+ LostReport.lostReport.TotalAmountLost__c += med1;
+ //LostReport.lostReport.TotalAmountLost__c += tempLostBrand.lostBrand.LostPrices_ThousandY__c; //20230215 lt DB202302247719
+ // LostReport.lostReport.TotalAmountLost__c += tempLostBrand.lostBrand.LostPrice__c/1.13/1000; //20230215 lt DB202302247719
+ //20230215 lt DB202302247719 en
+
+ LostReport.lostReport.Lost_reason_main__c =
+ LostReport.lostReport.Lost_reason_main__c == null
+ ? tempLostBrand.lostBrand.Lost_reason_main__c
+ : LostReport.lostReport.Lost_reason_main__c;
+ LostReport.lostReport.Lost_Reason_Sub__c =
+ LostReport.lostReport.Lost_Reason_Sub__c == null
+ ? tempLostBrand.lostBrand.Lost_Reason_Sub__c
+ : LostReport.lostReport.Lost_Reason_Sub__c;
+ LostReport.lostReport.Lost_By_Company__c =
+ LostReport.lostReport.Lost_By_Company__c == null
+ ? tempLostBrand.lostBrand.Lost_By_Company__c
+ : LostReport.lostReport.Lost_By_Company__c;
+
+ for( PCLLostProducts tempLostProduct : tempLostBrand.LostProducts) {
+ if(tempLostProduct.LostProductss.Quantity__c !=null && tempLostProduct.LostProductss.Quantity__c >0) {
+ LostReport.lostReport.of_lost_system_processor__c += tempLostProduct.LostProductss.Quantity__c;
+ }
+ }
+ }
+ }
+ upsert LostReport.lostReport;
+ // 闇�瑕佹彃鍏ユ洿鏂扮殑澶卞崟鍝佺墝
+ map<integer,PCLLostBrand__c> upsertLostBrandMap = new map<integer,PCLLostBrand__c>();
+ // 闇�瑕佸垹鎺夌殑澶卞崟鍝佺墝
+ map<integer,PCLLostBrand__c> deleteLostBrandMap = new map<integer,PCLLostBrand__c>();
+ // 闇�瑕佹彃鍏ユ洿鏂扮殑澶卞崟鍨嬪彿锛宬ey鏄搧鐗岀紪鍙�+鍨嬪彿缂栧彿锛寁alue鏄渶瑕佹洿鏂扮殑澶卞崟鍨嬪彿
+ map<string,PCLLostProduct__c> upsertLostProductMap = new map<string,PCLLostProduct__c>();
+ // 闇�瑕佸垹鎺夌殑澶卞崟鍝佺墝
+ list<PCLLostProduct__c> deleteLostProductList = new list<PCLLostProduct__c>();
+ for(LostBrand tempLostBrand : LostReport.LostBrands ) {
+ // 濡傛灉鏈夊け鍗曞搧鐗岋紝閭ｄ箞灏辫鎻掑叆鏇存柊锛�
+ system.debug('tempLostBrand.lostBrand.Lost_By_Company__c:'+tempLostBrand.lostBrand.Lost_By_Company__c);
+ if(string.isNotBlank(tempLostBrand.lostBrand.Lost_By_Company__c)) {
+ upsertLostBrandMap.put(tempLostBrand.lineNo,tempLostBrand.lostBrand);
+ tempLostBrand.lostBrand.Lost_cancel_report__c = LostReport.lostReport.id;
+ tempLostBrand.lostBrand.Name = tempLostBrand.lostBrand.Lost_By_Company__c;
+ integer tempNo = 0;
+ for( PCLLostProducts tempLostProduct : tempLostBrand.LostProducts) {
+ system.debug('Name:'+ tempLostProduct.LostProductss.Name );
+ if(tempLostProduct.LostProductss.Quantity__c !=null && tempLostProduct.LostProductss.Quantity__c >0) {
+ tempLostProduct.LostProductss.Name = tempLostBrand.lostBrand.Name + tempLostProduct.LostProductss.Quantity__c;
+ upsertLostProductMap.put(tempLostBrand.lineNo +':'+ tempNo,tempLostProduct.LostProductss);
+ }else if(string.isNotBlank(tempLostProduct.LostProductss.id)) {
+ deleteLostProductList.add(tempLostProduct.LostProductss);
+ }
+ tempNo++;
+ }
+ }
+ // 濡傛灉娌℃湁鍝佺墝锛屼絾鏄湁id锛� 杩欐牱鏁版嵁闇�瑕佸垹闄�
+ else if(string.isNotBlank(tempLostBrand.lostBrand.id)) {
+ deleteLostBrandMap.put(tempLostBrand.lineNo,tempLostBrand.lostBrand);
+ // 杩欓噷鍙兘闇�瑕佷篃鍒ゆ柇涓�涓嬪け鍗曞瀷鍙锋湁娌℃湁闇�瑕佸垹鎺�
+ }
+ }
+ if(upsertLostBrandMap.size()>0) {
+ upsert upsertLostBrandMap.values();
+ }
+ for( string productNo :upsertLostProductMap.keyset()) {
+ PCLLostProduct__c tempLostProduct = upsertLostProductMap.get(productNo);
+ integer brandNo = integer.valueof(productNo.split(':')[0]);
+ tempLostProduct.PCLLostBrand__c = upsertLostBrandMap.get(brandNo).id;
+ }
+ if(upsertLostProductMap.size()>0) {
+ upsert upsertLostProductMap.values();
+ }
+ if(deleteLostBrandMap.size()>0) {
+ delete deleteLostBrandMap.values();
+ for(PCLLostBrand__c pcl: deleteLostBrandMap.values()) {
+ pcl.id = null;
+ }
+ }
+ if(deleteLostProductList.size()>0) {
+ delete deleteLostProductList;
+ for(PCLLostProduct__c pclp: deleteLostProductList) {
+ pclp.id = null;
+ }
+ }
+ if(deleteBrandIDSet.size() > 0) {
+ list<id> tempdeleteIDlist = new list<id>();
+ tempdeleteIDlist.addall(deleteBrandIDSet);
+ database.delete(tempdeleteIDlist);
+
+ }
+
+ for(integer brandNumber =0; brandNumber< LostReport.LostBrands.size(); brandNumber++) {
+
+ LostBrand tempLostBrand = LostReport.LostBrands.get(brandNumber);
+ if(tempLostBrand.lostBrand.Id == null) {
+ LostReport.LostBrands.remove(brandNumber);
+ brandNumber--;
+ continue;
+ }
+ for(integer productNumber = 0; productNumber< tempLostBrand.LostProducts.size(); productNumber++) {
+ PCLLostProducts tempLostProduct = tempLostBrand.LostProducts.get(productNumber);
+ if(tempLostProduct.LostProductss.Id == null) {
+ tempLostBrand.LostProducts.remove(productNumber);
+ productNumber--;
+ continue;
+ }
+ }
+ }
+ lostReportId = LostReport.lostReport.id;
+ system.debug('save---end:');
+ }catch (Exception ex) {
+ Database.rollback(sp);
+ LostReport.lostReport = templostReport;
+ LostReport.LostBrands = tempBrands;
+ // 杩欓噷闇�瑕佸啓涓�浜涙姤閿欎俊鎭�
+ System.debug('---lt123---'+ex.getLineNumber());
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error,ex.getMessage()));
+ return false;
+ }
+ return true;
}
-
+
// 鍙栨秷
public PageReference cancel(){
- PageReference page = new PageReference('/'+oppId);
- page.setRedirect(true);
- return page;
+ PageReference page = new PageReference('/'+oppId);
+ page.setRedirect(true);
+ return page;
}
// 鎻愪氦
public PageReference submit(){
- if(!'鑽夋'.equals(LostReport.LostReport.Report_Status__c) ) {
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鍙湁鍦ㄨ崏妗堜腑鎵嶈兘鎻愪氦鐢宠锛�'));
- return null;
- }
+ //20230814 lt DB202308068183 澶卞崟鎶ュ憡瀹℃壒鑺傜偣澧炲姞鍔╃悊瀹℃壒鑺傜偣 update
+ //&& LostReport.LostReport.ModifyAfterApproval__c == false
+ if(!'鑽夋'.equals(LostReport.LostReport.Report_Status__c) && LostReport.LostReport.ModifyAfterApproval__c == false) {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '鍙湁鍦ㄨ崏妗堜腑鎵嶈兘鎻愪氦鐢宠锛�'));
+ return null;
+ }
- Savepoint sp = Database.setSavepoint();
- try{
- LostReport.lostReport.Report_Status__c = '鎻愪氦';
- update LostReport.lostReport;
- Approval.ProcessSubmitRequest psr = new Approval.ProcessSubmitRequest();
- psr.setObjectId(lostReportId);
- Approval.ProcessResult submitResult = Approval.process(psr);
- PageReference page = new PageReference('/apex/PCLLostReportPage');
- page.getParameters().put('Id', lostReportId);
- page.getParameters().put('pageStatus', 'View');
- page.getParameters().put('submitFlag', '1');
-
- page.setRedirect(true);
- return page;
- }catch(exception ex) {
- Database.rollback(sp);
- ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error,ex.getMessage()));
- return null;
- }
+ // 20230629 wkx DB202306242764 start
+ //20230814 lt DB202308068183 澶卞崟鎶ュ憡瀹℃壒鑺傜偣澧炲姞鍔╃悊瀹℃壒鑺傜偣 add lcrlist1
+ //DB202308068183 add (涓嶇瓑浜庡綋鍓嶅け鍗曟姤鍛婏紝鎵瑰噯鍚庡啀淇敼鐢�)
+ list<Lost_cancel_report__c> lcrlist1=[select id,Opportunity__c from Lost_cancel_report__c where Opportunity__c=:oppid and id!=:lostReportId limit 1];
+ list<opportunity> opplist1=[select id,cnt_lost_cancel_report__c,cnt_lost_cancel_draft__c from Opportunity where id=:oppid limit 1];
+ if (opplist1[0].cnt_lost_cancel_report__c - opplist1[0].cnt_lost_cancel_draft__c > 0 && lcrlist1.size() > 0) {
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '宸插瓨鍦� 璇环澶卞崟/鍙栨秷 鎶ュ憡锛�'));
+ return null;
+ }
+ // 20230629 wkx DB202306242764 end
+
+ Savepoint sp = Database.setSavepoint();
+ try{
+ LostReport.lostReport.Report_Status__c = '鎻愪氦';
+ update LostReport.lostReport;
+ //20230814 lt DB202308068183 澶卞崟鎶ュ憡瀹℃壒鑺傜偣澧炲姞鍔╃悊瀹℃壒鑺傜偣 start 娉ㄩ噴
+ //DB202308068183 杩� 杩涚▼鐢熸垚鍣�
+ // Approval.ProcessSubmitRequest psr = new Approval.ProcessSubmitRequest();
+ // psr.setObjectId(lostReportId);
+ // Approval.ProcessResult submitResult = Approval.process(psr);
+ //20230814 lt DB202308068183 澶卞崟鎶ュ憡瀹℃壒鑺傜偣澧炲姞鍔╃悊瀹℃壒鑺傜偣 end 娉ㄩ噴
+ PageReference page = new PageReference('/apex/PCLLostReportPage');
+ page.getParameters().put('Id', lostReportId);
+ page.getParameters().put('pageStatus', 'View');
+ page.getParameters().put('submitFlag', '1');
+
+ page.setRedirect(true);
+ return page;
+ }catch(exception ex) {
+ Database.rollback(sp);
+ ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error,ex.getMessage()));
+ return null;
+ }
}
// 娣诲姞鍝佺墝
public PageReference addBrand(){
- LostReport.LostBrands.add(new LostBrand(LostReport.LostBrands.size()));
- brandCount = LostReport.LostBrands.size();
- return null;
+ LostReport.LostBrands.add(new LostBrand(LostReport.LostBrands.size()));
+ brandCount = LostReport.LostBrands.size();
+ return null;
}
// 鍒犻櫎鍝佺墝 杩欎釜鏈夊弬鏁癰randNo锛屾墠鐭ラ亾鏄垹闄ら偅涓搧鐗�
public PageReference Remove(){
- system.debug('RemoveBrandNo:'+RemoveBrandNo);
- list<LostBrand> tempLostBrands = new List<lostBrand>();
- Integer i = 0;
- for(integer j = 0; j< LostReport.LostBrands.size(); j++ ) {
- LostBrand templostBrand = LostReport.LostBrands.get(j);
- if(j != RemoveBrandNo) {
- templostBrand.lineNo = i;
- tempLostBrands.add(templostBrand);
- i++;
- }else if(!string.isBlank(templostBrand.lostBrand.id)) {
- deleteBrandIDSet.add(templostBrand.lostBrand.id);
- }
+ system.debug('RemoveBrandNo:'+RemoveBrandNo);
+ list<LostBrand> tempLostBrands = new List<lostBrand>();
+ Integer i = 0;
+ for(integer j = 0; j< LostReport.LostBrands.size(); j++ ) {
+ LostBrand templostBrand = LostReport.LostBrands.get(j);
+ if(j != RemoveBrandNo) {
+ templostBrand.lineNo = i;
+ tempLostBrands.add(templostBrand);
+ i++;
+ }else if(!string.isBlank(templostBrand.lostBrand.id)) {
+ deleteBrandIDSet.add(templostBrand.lostBrand.id);
}
-
- LostReport.LostBrands = tempLostBrands;
-
- brandCount = LostReport.LostBrands.size();
- return null;
+ }
+
+ LostReport.LostBrands = tempLostBrands;
+
+ brandCount = LostReport.LostBrands.size();
+ return null;
}
// 娣诲姞鍨嬪彿锛� 杩欎釜鏈夊弬鏁癰randNo锛屾墠鐭ラ亾鏄坊鍔犲埌閭ｄ釜鍝佺墝
// update tcm 20211125 娣诲姞鍨嬪彿鏃惰嚜鍔ㄥ甫鍑哄搧鐗� start
public PageReference addProduct(){
- system.debug('brandNo:'+brandNo);
- LostBrand tempLostBrand = LostReport.LostBrands.get(brandNo);
- // PCLLostProduct__c plp = new PCLLostProduct__c(Competitor__c=CompetitionMap.get(LostReport.LostBrands[brandNo].lostBrand.Lost_By_Company__c));
- string brandName = tempLostBrand.lostBrand.Lost_By_Company__c;
- PCLLostProduct__c plp = new PCLLostProduct__c();
- plp.LostBrandName__c = brandName;
- tempLostBrand.LostProducts.add(new PCLLostProducts(tempLostBrand.LostProducts.size(),plp));
- tempLostBrand.ProductSize = tempLostBrand.LostProducts.size();
- return null;
+ system.debug('brandNo:'+brandNo);
+ LostBrand tempLostBrand = LostReport.LostBrands.get(brandNo);
+ // PCLLostProduct__c plp = new PCLLostProduct__c(Competitor__c=CompetitionMap.get(LostReport.LostBrands[brandNo].lostBrand.Lost_By_Company__c));
+ // 20230418 ljh DB202304320022 start
+ // string brandName = tempLostBrand.lostBrand.Lost_By_Company__c;
+ string brandName = tempLostBrand.lostBrand.Lost_By_Company__c != '鍏朵粬'?tempLostBrand.lostBrand.Lost_By_Company__c:tempLostBrand.lostBrand.Lost_By_Company_Mannual__c;
+ // 20230418 ljh DB202304320022 end
+ PCLLostProduct__c plp = new PCLLostProduct__c();
+ plp.LostBrandName__c = brandName;
+ tempLostBrand.LostProducts.add(new PCLLostProducts(tempLostBrand.LostProducts.size(),plp));
+ tempLostBrand.ProductSize = tempLostBrand.LostProducts.size();
+ return null;
}
// update tcm 20211125 娣诲姞鍨嬪彿鏃惰嚜鍔ㄥ甫鍑哄搧鐗� end
// 椤甸潰鐨勬暟鎹粨鏋�
public class LostReport {
- public Lost_cancel_report__c lostReport { get; set; }
- public list<LostBrand> LostBrands { get; set; }
- public LostReport(){
- lostReport = new Lost_cancel_report__c();
- LostBrands = new list<LostBrand> {new LostBrand(0)};
- }
- public LostReport(Lost_cancel_report__c lostReport){
- this.lostReport = lostReport;
- LostBrands = new list<LostBrand> {new LostBrand(0)};
- }
- public LostReport(Lost_cancel_report__c lostReport, list<LostBrand> LostBrands){
- this.lostReport = lostReport;
- this.LostBrands = LostBrands;
- }
+ public Lost_cancel_report__c lostReport { get; set; }
+ public list<LostBrand> LostBrands { get; set; }
+ public LostReport(){
+ lostReport = new Lost_cancel_report__c();
+ LostBrands = new list<LostBrand> {new LostBrand(0)};
+ }
+ public LostReport(Lost_cancel_report__c lostReport){
+ this.lostReport = lostReport;
+ LostBrands = new list<LostBrand> {new LostBrand(0)};
+ }
+ public LostReport(Lost_cancel_report__c lostReport, list<LostBrand> LostBrands){
+ this.lostReport = lostReport;
+ this.LostBrands = LostBrands;
+ }
}
-
+
public class LostBrand {
- public PCLLostBrand__c lostBrand { get; set; }
- public Integer lineNo { get; set; }
- public list<PCLLostProducts> LostProducts { get; set; }
- public Integer ProductSize {get; set;}
- public LostBrand( integer lineNo ){
- lostBrand = new PCLLostBrand__c();
- this.lineNo = lineNo;
- LostProducts = new list<PCLLostProducts> {new PCLLostProducts()};
- ProductSize = 1;
- lostBrand = new PCLLostBrand__c();
- }
- public LostBrand( integer lineNo, list<PCLLostProducts> LostProducts ){
- lostBrand = new PCLLostBrand__c();
- this.lineNo = lineNo;
- this.LostProducts = LostProducts;
- ProductSize = LostProducts.size();
- }
- public LostBrand( integer lineNo, list<PCLLostProducts> LostProducts, PCLLostBrand__c lostBrand){
- this.lostBrand = lostBrand;
- this.lineNo = lineNo;
- this.LostProducts = LostProducts;
- ProductSize = LostProducts.size();
- }
+ public PCLLostBrand__c lostBrand { get; set; }
+ public Integer lineNo { get; set; }
+ public list<PCLLostProducts> LostProducts { get; set; }
+ public Integer ProductSize {get; set;}
+ public LostBrand( integer lineNo ){
+ lostBrand = new PCLLostBrand__c();
+ this.lineNo = lineNo;
+ LostProducts = new list<PCLLostProducts> {new PCLLostProducts()};
+ ProductSize = 1;
+ lostBrand = new PCLLostBrand__c();
+ }
+ public LostBrand( integer lineNo, list<PCLLostProducts> LostProducts ){
+ lostBrand = new PCLLostBrand__c();
+ this.lineNo = lineNo;
+ this.LostProducts = LostProducts;
+ ProductSize = LostProducts.size();
+ }
+ public LostBrand( integer lineNo, list<PCLLostProducts> LostProducts, PCLLostBrand__c lostBrand){
+ this.lostBrand = lostBrand;
+ this.lineNo = lineNo;
+ this.LostProducts = LostProducts;
+ ProductSize = LostProducts.size();
+ }
}
// add tcm 20211119 start
public class PCLLostProducts {
- public Integer lineNo2 { get; set; }
- public PCLLostProduct__c LostProductss { get; set; }
- public Boolean bool { get; set; }
-
- public PCLLostProducts() {
- this.lineNo2 = 0;
- this.LostProductss=new PCLLostProduct__c();
+ public Integer lineNo2 { get; set; }
+ public PCLLostProduct__c LostProductss { get; set; }
+ public Boolean bool { get; set; }
+
+ public PCLLostProducts() {
+ this.lineNo2 = 0;
+ this.LostProductss=new PCLLostProduct__c();
+ }
+
+ public PCLLostProducts(Integer lineNo2) {
+ this.lineNo2 = lineNo2;
+ this.LostProductss=new PCLLostProduct__c();
+ }
+
+ public PCLLostProducts(Integer lineNo2,PCLLostProduct__c LostProductss) {
+ this.lineNo2 = lineNo2;
+ this.LostProductss=LostProductss;
+ if (LostProductss.LostProduct__c != null) {
+ this.bool = true;
}
-
- public PCLLostProducts(Integer lineNo2) {
- this.lineNo2 = lineNo2;
- this.LostProductss=new PCLLostProduct__c();
- }
-
- public PCLLostProducts(Integer lineNo2,PCLLostProduct__c LostProductss) {
- this.lineNo2 = lineNo2;
- this.LostProductss=LostProductss;
- if (LostProductss.LostProduct__c != null) {
- this.bool = true;
- }
- }
+ }
}
// add tcm 20211119 end
-
+
// add tcm 20211118 start
public void search() {
- if (LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.LostProduct__c==null) {
- LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductClass__c=null;
- LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductCategory__c=null;
- LostReport.LostBrands[topNum].LostProducts[secondNum].bool=false;
-
+ if (LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.LostProduct__c==null) {
+ LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductClass__c=null;
+ LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductCategory__c=null;
+ LostReport.LostBrands[topNum].LostProducts[secondNum].bool=false;
+
+ }else {
+ Product2 prd = [select Id,ProductClass__c, ProductCategory__c from Product2 where Id =:LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.LostProduct__c];
+ if (prd.ProductCategory__c!=null) {
+ LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductClass__c=prd.ProductClass__c;
+ LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductCategory__c=prd.ProductCategory__c;
+ LostReport.LostBrands[topNum].LostProducts[secondNum].bool=true;
}else {
- Product2 prd = [select Id,ProductClass__c, ProductCategory__c from Product2 where Id =:LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.LostProduct__c];
- if (prd.ProductCategory__c!=null) {
- LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductClass__c=prd.ProductClass__c;
- LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductCategory__c=prd.ProductCategory__c;
- LostReport.LostBrands[topNum].LostProducts[secondNum].bool=true;
- }else {
- LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductClass__c=null;
- LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductCategory__c=null;
- LostReport.LostBrands[topNum].LostProducts[secondNum].bool=false;
-
- }
+ LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductClass__c=null;
+ LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductCategory__c=null;
+ LostReport.LostBrands[topNum].LostProducts[secondNum].bool=false;
+
}
+ }
}
// add tcm 20211118 end
-}
\ No newline at end of file
+ }
\ No newline at end of file
diff --git a/force-app/main/default/classes/Solution_ProgrammeTrigger.cls b/force-app/main/default/classes/Solution_ProgrammeTrigger.cls
index a890c36..35947b5 100644
--- a/force-app/main/default/classes/Solution_ProgrammeTrigger.cls
+++ b/force-app/main/default/classes/Solution_ProgrammeTrigger.cls
@@ -138,6 +138,7 @@
}
public void updateSolutionProgrammeAndProjectStatus(){
+ system.debug('beforeUpdate');
Map<Id,SolutionProjectRequirements__c> solutionProJectMap = new Map<Id,SolutionProjectRequirements__c>();
List<SolutionProjectRequirements__c> solutionProJectList = [select id,Status__c,First_Proposal_Time__c from SolutionProjectRequirements__c where id = :solProjectId];
for(SolutionProjectRequirements__c solProject : solutionProJectList){
@@ -149,11 +150,12 @@
if(solutionPro.RejectedInvalid__c == true){
solutionPro.addError('璇峰～鍐欏弽棣堢粨鏋滐紝骞舵寜瀹℃壒鎸夐挳');
}
- if(solutionPro.ProcessOfApproval__c == true && (solutionPro.Confirmation_Result__c == null || solutionPro.Confirmation_Result__c == '')){
- solutionPro.addError('鎵瑰噯涔嬪墠蹇呴』濉啓鍙嶉缁撴灉锛�');
- }
+ // if(solutionPro.ProcessOfApproval__c == true && (solutionPro.Confirmation_Result__c == null || solutionPro.Confirmation_Result__c == '')){
+ // solutionPro.addError('鎵瑰噯涔嬪墠蹇呴』濉啓鍙嶉缁撴灉锛�');
+ // }
if(solutionPro.ProcessOfApproval__c == true && solutionPro.Confirmation_Result__c != null && solutionPro.Confirmation_Result__c != ''){
if(solutionPro.Confirmation_Result__c == '01閲囩撼/閮ㄥ垎閲囩撼'){
+ system.debug('01閲囩撼/閮ㄥ垎閲囩撼');
solutionPro.Status__c = '03閲囩撼/閮ㄥ垎閲囩撼';
// solutionPro.Scheme_Type__c = '缁撴';
solutionPro.ProcessOfApproval__c = false;
@@ -163,6 +165,7 @@
}
}
if(solutionPro.Confirmation_Result__c == '02鏈噰绾�'){
+ system.debug('02鏈噰绾�');
solutionPro.Status__c = '04鏈噰绾�';
// solutionPro.Scheme_Type__c = '缁撴';
solutionPro.ProcessOfApproval__c = false;
diff --git a/force-app/main/default/classes/lexAccountController.cls b/force-app/main/default/classes/lexAccountController.cls
index fbf2d82..6ed2e76 100644
--- a/force-app/main/default/classes/lexAccountController.cls
+++ b/force-app/main/default/classes/lexAccountController.cls
@@ -1,5 +1,20 @@
public with sharing class lexAccountController {
@AuraEnabled
+ public static InitData init(String recordId){
+ InitData res = new InitData();
+ try {
+ Account acc = [
+ select
+ Name
+ from Account where Id =: recordId
+ ];
+ res.name = acc.Name;
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ return res;
+ }
+ @AuraEnabled
public static InitData initForNewSolutonProButton(String recordId){
InitData res = new InitData();
try {
@@ -84,5 +99,7 @@
public String recordTypeId;
@AuraEnabled
public String hospitalDepartmentClass;
+ @AuraEnabled
+ public String name;
}
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexAgencyHospitalLinkController.cls b/force-app/main/default/classes/lexAgencyHospitalLinkController.cls
new file mode 100644
index 0000000..f5f0258
--- /dev/null
+++ b/force-app/main/default/classes/lexAgencyHospitalLinkController.cls
@@ -0,0 +1,11 @@
+public with sharing class lexAgencyHospitalLinkController {
+ @AuraEnabled
+ public static string initForCreateAgencyContact(String recordId){
+
+ try {
+
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexAgencyHospitalLinkController.cls-meta.xml b/force-app/main/default/classes/lexAgencyHospitalLinkController.cls-meta.xml
new file mode 100644
index 0000000..642d054
--- /dev/null
+++ b/force-app/main/default/classes/lexAgencyHospitalLinkController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>58.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexLostCancelReportController.cls b/force-app/main/default/classes/lexLostCancelReportController.cls
new file mode 100644
index 0000000..e706a6e
--- /dev/null
+++ b/force-app/main/default/classes/lexLostCancelReportController.cls
@@ -0,0 +1,83 @@
+public with sharing class lexLostCancelReportController {
+ @AuraEnabled
+ public static InitData initSubmitReportButton(String recordId){
+ InitData res = new InitData();
+ try {
+ Lost_Cancel_Report__c report = [
+ select
+ Opportunity__c
+ from Lost_Cancel_Report__c where Id =: recordId
+ ];
+ Opportunity opp = [
+ select
+ Cnt_Lost_cancel_report__c,
+ Cnt_Lost_cancel_Draft__c
+ from Opportunity where Id =: report.Opportunity__c
+ ];
+ res.cntLostCancelDraft = opp.Cnt_Lost_cancel_Draft__c;
+ res.cntLostCancelReport = opp.Cnt_Lost_cancel_report__c;
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ return res;
+ }
+ @AuraEnabled
+ public static InitData initForEditCancelReport(String recordId){
+ InitData res = new InitData();
+ try {
+ Lost_cancel_report__c report = [
+ select Id,
+ RecordTypeId,
+ Opportunity__c,
+ LostType__c ,
+ Report_Status__c from Lost_cancel_report__c where id =: recordId
+ ];
+ res.recordTypeId = report.RecordTypeId;
+ res.lostType = report.LostType__c;
+ res.reportStatus = report.Report_Status__c;
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ return res;
+ }
+ @AuraEnabled
+ public static string updateSubmitReportButton(String recordId){
+ Savepoint sp = Database.setSavepoint();
+ Lost_cancel_report__c report = new Lost_cancel_report__c();
+ try {
+ report.Id = recordId;
+ report.Report_Status__c = '鎻愪氦';
+ update report;
+ // Approval.ProcessSubmitRequest psr = new Approval.ProcessSubmitRequest();
+ // psr.setObjectId(report.Id);
+ // Approval.ProcessResult submitResult = Approval.process(psr);
+ return null;
+ } catch (Exception e) {
+ Database.rollback(sp);
+ if (e.getMessage().contains(',')) {
+ System.debug(LoggingLevel.INFO, '*** e: ' + e);
+ String exc = '' + e.getMessage();
+ Integer left = exc.indexOf(':') + 1;
+ Integer right = exc.lastIndexOf(':');
+ String str = exc.substring(left,right);
+ left = str.indexOf(',') + 1;
+ String newStr = str.substring(left);
+ return newStr;
+ }else {
+ return e.getMessage();
+ }
+ }
+ }
+ class InitData {
+ @AuraEnabled
+ public Decimal cntLostCancelReport;
+ @AuraEnabled
+ public Decimal cntLostCancelDraft;
+ @AuraEnabled
+ public String recordTypeId;
+ @AuraEnabled
+ public String lostType;
+ @AuraEnabled
+ public String reportStatus;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexLostCancelReportController.cls-meta.xml b/force-app/main/default/classes/lexLostCancelReportController.cls-meta.xml
new file mode 100644
index 0000000..642d054
--- /dev/null
+++ b/force-app/main/default/classes/lexLostCancelReportController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>58.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexPCLLostReportLwcController.cls b/force-app/main/default/classes/lexPCLLostReportLwcController.cls
index 4225066..58c3650 100644
--- a/force-app/main/default/classes/lexPCLLostReportLwcController.cls
+++ b/force-app/main/default/classes/lexPCLLostReportLwcController.cls
@@ -150,6 +150,7 @@
LostTotalAmount__c,LostType__c,
Report_Status__c,Sales_assistant__c,
InclusionUltrasound__c, //20230506 lt DB202304618804 鍖呭惈瓒呭０
+ ModifyAfterApproval__c,Approved_Day__c,//20230814 lt DB202308068183 澶卞崟鎶ュ憡瀹℃壒鑺傜偣澧炲姞鍔╃悊瀹℃壒鑺傜偣 add
Opportunity__c, Opportunity__r.Sales_assistant_ID__c,
Opportunity__r.Sales_manager_departmentID__c,
Manager_sales__c,recordtypeid,recordtype.DeveloperName
@@ -330,6 +331,10 @@
report.lostReport.Lost_reason_main__c = null;
report.lostReport.Lost_Reason_Sub__c = null;
report.lostReport.Lost_By_Company__c = null;
+ //鎵瑰噯鏃ヤ笉涓虹┖鏃剁粰淇敼鍚庡啀鎵瑰噯璧嬪��
+ if(LostReport.lostReport.Approved_Day__c != null){
+ LostReport.lostReport.ModifyAfterApproval__c = true;
+ }
for(LostBrand tempLostBrand : report.LostBrands) {
if(string.isNotBlank(tempLostBrand.lostBrand.Lost_By_Company__c)) {
report.lostReport.LostTotalAmount__c += tempLostBrand.lostBrand.LostPrice__c;
@@ -484,7 +489,7 @@
public static Map<string,Object> submit(String report1,String reportId){
LostReport report = (LostReport)JSON.deserialize(report1, LostReport.class);
Map<string,string> messages = new Map<string,string>();
- if(!'鑽夋'.equals(report.lostReport.Report_Status__c) ) {
+ if(!'鑽夋'.equals(report.lostReport.Report_Status__c) && LostReport.LostReport.ModifyAfterApproval__c == false) {
messages.put('error', '鍙湁鍦ㄨ崏妗堜腑鎵嶈兘鎻愪氦鐢宠锛�');
return messages;
}
diff --git a/force-app/main/default/classes/lexSolutionProgrammeController.cls b/force-app/main/default/classes/lexSolutionProgrammeController.cls
index f07b46f..b54e189 100644
--- a/force-app/main/default/classes/lexSolutionProgrammeController.cls
+++ b/force-app/main/default/classes/lexSolutionProgrammeController.cls
@@ -36,7 +36,14 @@
update so;
return '';
} catch (Exception e) {
- return e.getMessage();
+ if(e.getMessage().contains(':')){
+ String eMsg = e.getMessage();
+ Integer left = eMsg.indexOf(',')+1;
+ Integer right = eMsg.lastindexOf('銆�')+1;
+ return eMsg.substring(left,right);
+ }else{
+ return e.getMessage();
+ }
}
}
//鎻愪氦瀹℃壒
diff --git a/force-app/main/default/classes/lexSolutionProjectRequirementsController.cls b/force-app/main/default/classes/lexSolutionProjectRequirementsController.cls
index 5372786..bedc618 100644
--- a/force-app/main/default/classes/lexSolutionProjectRequirementsController.cls
+++ b/force-app/main/default/classes/lexSolutionProjectRequirementsController.cls
@@ -19,7 +19,7 @@
res.departmentClassId = so.Department_Class__c;
res.productLeader = so.Product_Leader__c;
res.userId = UserInfo.getUserId();
- res.userName = UserInfo.getUserName();
+ res.userName = [select Name from User where Id =: res.userId].Name;
maps.put('res', res);
} catch (Exception e) {
String message = e.getMessage();
diff --git a/force-app/main/default/classes/taskManageController.cls b/force-app/main/default/classes/taskManageController.cls
index 783fcab..dbfd2e1 100644
--- a/force-app/main/default/classes/taskManageController.cls
+++ b/force-app/main/default/classes/taskManageController.cls
@@ -37,7 +37,7 @@
}
// 纭鎴栬�呭欢鏈�
@AuraEnabled
- public static string confirmOrDelay(boolean isDelay, string delayReason, string delayReasonOther, string taskID,Boolean IsGeneratePlan,Date ActivityDate,Date feedbackPlanDate) {
+ public static string confirmOrDelay(boolean isDelay, string delayReason, string delayReasonOther, string taskID,Boolean IsGeneratePlan,Date ActivityDate,Date feedbackPlanDate,Date estimatedFinishDate) {
//2021-07-30 mzy SWAG-C5DAX8 update start
UserResult u = UserInfo_Owner();
//2021-07-30 mzy SWAG-C5DAX8 update end
@@ -64,6 +64,21 @@
tempTask.feedbackPlanDate__c = feedbackPlanDate;
}
//2021-10-20 mzy 浠诲姟绠＄悊鏀瑰杽 end
+
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ Task__c tempObj = [SELECT Id, taskType__c FROM Task__c WHERE Id =: taskID];
+ if (tempObj.taskType__c == '鐩樼偣妫�鏌ヨ鍒�' || tempObj.taskType__c == '娓╂箍搴︽鏌ヨ鍒�') {
+ if (isDelay) {
+ tempTask.taskStatus__c = '05 寤舵湡';
+ tempTask.delayDate__c = Date.today();
+ tempTask.delayToDate__c = estimatedFinishDate;
+ } else {
+ tempTask.taskStatus__c = '02 鎺ュ彈';
+ tempTask.ConfirmDate__c = Date.today();
+ tempTask.Estimated_Finish_Date__c = estimatedFinishDate;
+ }
+ }
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
update tempTask;
//鎴愬姛杩斿洖鏇存柊鎴愬姛
@@ -371,6 +386,9 @@
//2021-11-25 mzy 浠诲姟绠＄悊鏀瑰杽 start
'HopeCompletionDate__c,'+
//2021-11-25 mzy 浠诲姟绠＄悊鏀瑰杽 end
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ 'Estimated_Finish_Date__c,LatestFinishDate__c,'+
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
'taskStatus__c,taskType__c,Assignment_Date__c from task__c where assignee__c =: userIDList and mergeTaskMain__c = null ' +
//2021-1-4 yjk 澧炲姞浠诲姟鍖哄垎锛屽彧鏌ヨ琚姩鍜屼笂绾у垎閰�
//' and TaskDifferent__c != \'涓诲姩浠诲姟\' ';
@@ -476,7 +494,12 @@
tempTaskWrapper.assignButtonisDisabled = false;
//20210111 CHAN-BWX3YU you start
tempTaskWrapper.assignButtonisDisabled_Owner = false;
-
+
+ //銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ tempTaskWrapper.createdAfter3Month = tempTask.CreateDate__c.addMonths(3);
+ tempTaskWrapper.latestFinishDate = tempTask.LatestFinishDate__c;
+ //銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
+
Date d2 = date.today().addDays(-2);
Date createdate1= date.newinstance(tempTask.CreateDate__c.year(), tempTask.CreateDate__c.month(), tempTask.CreateDate__c.day());
system.debug('鍒嗛厤鏃堕棿'+tempTask.Assignment_Date__c+'==d2=='+d2);
@@ -676,6 +699,12 @@
@AuraEnabled
public Date HopeCompletionDate;
//2021-11-25 浠诲姟绠＄悊鏀瑰杽 mzy
+ //銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ @AuraEnabled
+ public Date createdAfter3Month;
+ @AuraEnabled
+ public Date latestFinishDate;
+ //銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End
}
public class pickerWrapper {
@AuraEnabled
diff --git a/force-app/main/default/lwc/lexApplyAgainLwc/lexApplyAgainLwc.js b/force-app/main/default/lwc/lexApplyAgainLwc/lexApplyAgainLwc.js
index 62370fa..8252f9c 100644
--- a/force-app/main/default/lwc/lexApplyAgainLwc/lexApplyAgainLwc.js
+++ b/force-app/main/default/lwc/lexApplyAgainLwc/lexApplyAgainLwc.js
@@ -1,3 +1,11 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-09-09 13:31:12
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-09-11 14:43:12
+ */
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
@@ -38,7 +46,8 @@
const defaultValues = encodeDefaultFieldValues({
old_Project_No__c: this.recordId,
Department_Class__c: this.departmentClassId,
- Hospital__c: this.hospitalId
+ Hospital__c: this.hospitalId,
+ Name: '*'
});
this[NavigationMixin.Navigate]({
type: 'standard__objectPage',
diff --git a/force-app/main/default/lwc/lexBeforeOPDPDFBtnSIS/lexBeforeOPDPDFBtnSIS.js b/force-app/main/default/lwc/lexBeforeOPDPDFBtnSIS/lexBeforeOPDPDFBtnSIS.js
index db99c83..5bcc76a 100644
--- a/force-app/main/default/lwc/lexBeforeOPDPDFBtnSIS/lexBeforeOPDPDFBtnSIS.js
+++ b/force-app/main/default/lwc/lexBeforeOPDPDFBtnSIS/lexBeforeOPDPDFBtnSIS.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-13 15:55:45
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-04-13 16:04:14
+ * @LastEditTime: 2023-09-11 15:50:12
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -88,9 +88,10 @@
}
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
}
diff --git a/force-app/main/default/lwc/lexCancelReport/lexCancelReport.js b/force-app/main/default/lwc/lexCancelReport/lexCancelReport.js
index 2236a21..7deae00 100644
--- a/force-app/main/default/lwc/lexCancelReport/lexCancelReport.js
+++ b/force-app/main/default/lwc/lexCancelReport/lexCancelReport.js
@@ -67,9 +67,10 @@
}
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
}
diff --git a/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js b/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js
index e4d87c9..b705df0 100644
--- a/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js
+++ b/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-07 09:02:03
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-09 17:42:28
+ * @LastEditTime: 2023-09-11 14:32:05
*/
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -60,9 +60,10 @@
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
}
diff --git a/force-app/main/default/lwc/lexCancelSubmitReport/lexCancelSubmitReport.js b/force-app/main/default/lwc/lexCancelSubmitReport/lexCancelSubmitReport.js
index becb18d..95a9028 100644
--- a/force-app/main/default/lwc/lexCancelSubmitReport/lexCancelSubmitReport.js
+++ b/force-app/main/default/lwc/lexCancelSubmitReport/lexCancelSubmitReport.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-07 09:02:03
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-04-11 11:18:36
+ * @LastEditTime: 2023-09-11 13:53:55
*/
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -59,9 +59,10 @@
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
}
diff --git a/force-app/main/default/lwc/lexChangeContractType/lexChangeContractType.js b/force-app/main/default/lwc/lexChangeContractType/lexChangeContractType.js
index 5216575..8f2be1c 100644
--- a/force-app/main/default/lwc/lexChangeContractType/lexChangeContractType.js
+++ b/force-app/main/default/lwc/lexChangeContractType/lexChangeContractType.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-05-15 13:17:26
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-06-02 10:59:13
+ * @LastEditTime: 2023-09-11 15:53:23
*/
/*
* @Description:
@@ -133,9 +133,10 @@
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
}
diff --git a/force-app/main/default/lwc/lexCopyWithAsset/lexCopyWithAsset.js b/force-app/main/default/lwc/lexCopyWithAsset/lexCopyWithAsset.js
index 91e384a..97ba72f 100644
--- a/force-app/main/default/lwc/lexCopyWithAsset/lexCopyWithAsset.js
+++ b/force-app/main/default/lwc/lexCopyWithAsset/lexCopyWithAsset.js
@@ -4,13 +4,14 @@
* @Author: chen jing wu
* @Date: 2023-04-21 14:32:09
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-06-05 11:09:35
+ * @LastEditTime: 2023-09-12 11:39:47
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import init from '@salesforce/apex/OpportunityLightingButtonController.initForCopyWithAssetButton';
+import initCopy from '@salesforce/apex/OpportunityLightingButtonController.initCopy';
import { NavigationMixin } from 'lightning/navigation';
import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
export default class LexCopyWithAsset extends NavigationMixin(LightningElement) {
@@ -35,9 +36,10 @@
}
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
}
@@ -54,6 +56,7 @@
copyWithAsset(){
if(this.sapSendOK){
this.showToast("璇环宸茬粡WIN锛屼笉鑳借繘琛屾媶鍗�","error");
+ this.dispatchEvent(new CloseActionScreenEvent());
} else {
// window.open(
// "/"
@@ -66,23 +69,29 @@
// + this.isAuthorized
// + "&00N10000008pnmd=1&00N10000002Cb9P=&00N10000002DItz=&00N10000003O9oO=&00N10000003O9o4=&00N10000002CYHy=&00Np00000030gzb=&00Np0000002ajGe=&00Np00000034Qlb");
- const defaultValues = encodeDefaultFieldValues({
- Old_Opportunity_ID__c: this.recordId,
- IsAuthorized__c: this.isAuthorized
- });
- this[NavigationMixin.Navigate]({
- type: 'standard__objectPage',
- attributes: {
- objectApiName: 'Opportunity',
- actionName: 'clone',
- recordId: this.recordId
- },
- state: {
- nooverride: '1',
- defaultFieldValues: defaultValues
- }
+ initCopy({
+ recordId: this.recordId
+ }).then(result=>{
+ var changeData = 'Old_Opportunity_ID__c=' + this.recordId
+ + ',IsAuthorized__c=' + this.isAuthorized
+ + ',SeparateBillMark__c=1'
+ + ',NotesApprovedNo__c='
+ + ',Assistant_Applied_Date__c='
+ + ',Contract_DB_SalesDept_complite_day__c='
+ + ',Closing_Bid_Date__c=';
+ console.log(result);
+ this[NavigationMixin.Navigate]({
+ type: 'standard__objectPage',
+ attributes: {
+ actionName: 'new',
+ objectApiName: 'Opportunity'
+ },
+ state: {
+ defaultFieldValues: result + ',' + changeData
+ }
+ });
+ this.dispatchEvent(new CloseActionScreenEvent());
});
}
- this.dispatchEvent(new CloseActionScreenEvent());
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateAgencyContact/__tests__/lexCreateAgencyContact.test.js b/force-app/main/default/lwc/lexCreateAgencyContact/__tests__/lexCreateAgencyContact.test.js
new file mode 100644
index 0000000..8fe16e9
--- /dev/null
+++ b/force-app/main/default/lwc/lexCreateAgencyContact/__tests__/lexCreateAgencyContact.test.js
@@ -0,0 +1,25 @@
+import { createElement } from 'lwc';
+import LexCreateAgencyContact from 'c/lexCreateAgencyContact';
+
+describe('c-lex-create-agency-contact', () => {
+ afterEach(() => {
+ // The jsdom instance is shared across test cases in a single file so reset the DOM
+ while (document.body.firstChild) {
+ document.body.removeChild(document.body.firstChild);
+ }
+ });
+
+ it('TODO: test case generated by CLI command, please fill in test logic', () => {
+ // Arrange
+ const element = createElement('c-lex-create-agency-contact', {
+ is: LexCreateAgencyContact
+ });
+
+ // Act
+ document.body.appendChild(element);
+
+ // Assert
+ // const div = element.shadowRoot.querySelector('div');
+ expect(1).toBe(1);
+ });
+});
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateAgencyContact/lexCreateAgencyContact.html b/force-app/main/default/lwc/lexCreateAgencyContact/lexCreateAgencyContact.html
new file mode 100644
index 0000000..27e0f69
--- /dev/null
+++ b/force-app/main/default/lwc/lexCreateAgencyContact/lexCreateAgencyContact.html
@@ -0,0 +1,3 @@
+<template>
+
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateAgencyContact/lexCreateAgencyContact.js b/force-app/main/default/lwc/lexCreateAgencyContact/lexCreateAgencyContact.js
new file mode 100644
index 0000000..ab9ae07
--- /dev/null
+++ b/force-app/main/default/lwc/lexCreateAgencyContact/lexCreateAgencyContact.js
@@ -0,0 +1,42 @@
+import { api, wire,LightningElement } from 'lwc';
+import { CurrentPageReference } from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import { NavigationMixin } from 'lightning/navigation';
+import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
+
+export default class LexCreateAgencyContact extends NavigationMixin(LightningElement) {
+ @api recordId;
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ console.log(111);
+ console.log(currentPageReference);
+
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ console.log("str");
+ console.log(str);
+ this.recordId = str;
+ }
+ }
+ }
+ connectedCallback(){
+ const defaultValues = encodeDefaultFieldValues({
+ Agency_Hospital__c: this.recordId
+ });
+
+ this[NavigationMixin.Navigate]({
+ type: 'standard__objectPage',
+ attributes: {
+ objectApiName: 'Agency_Contact__c',
+ actionName: 'new'
+ },
+ state: {
+ // nooverride: '1',
+ defaultFieldValues: defaultValues
+ }
+ });
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateAgencyContact/lexCreateAgencyContact.js-meta.xml b/force-app/main/default/lwc/lexCreateAgencyContact/lexCreateAgencyContact.js-meta.xml
new file mode 100644
index 0000000..3392981
--- /dev/null
+++ b/force-app/main/default/lwc/lexCreateAgencyContact/lexCreateAgencyContact.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>54.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__RecordPage</target>
+ <target>lightning__AppPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexDispatchOCSMQARA/lexDispatchOCSMQARA.js b/force-app/main/default/lwc/lexDispatchOCSMQARA/lexDispatchOCSMQARA.js
index 2076d74..2cb2568 100644
--- a/force-app/main/default/lwc/lexDispatchOCSMQARA/lexDispatchOCSMQARA.js
+++ b/force-app/main/default/lwc/lexDispatchOCSMQARA/lexDispatchOCSMQARA.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-07 09:02:03
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-04-11 11:23:37
+ * @LastEditTime: 2023-09-11 13:53:31
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -42,9 +42,10 @@
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
}
diff --git a/force-app/main/default/lwc/lexEditCancelReport/__tests__/lexEditCancelReport.test.js b/force-app/main/default/lwc/lexEditCancelReport/__tests__/lexEditCancelReport.test.js
new file mode 100644
index 0000000..0aac4b0
--- /dev/null
+++ b/force-app/main/default/lwc/lexEditCancelReport/__tests__/lexEditCancelReport.test.js
@@ -0,0 +1,25 @@
+import { createElement } from 'lwc';
+import LexEditCancelReport from 'c/lexEditCancelReport';
+
+describe('c-lex-edit-cancel-report', () => {
+ afterEach(() => {
+ // The jsdom instance is shared across test cases in a single file so reset the DOM
+ while (document.body.firstChild) {
+ document.body.removeChild(document.body.firstChild);
+ }
+ });
+
+ it('TODO: test case generated by CLI command, please fill in test logic', () => {
+ // Arrange
+ const element = createElement('c-lex-edit-cancel-report', {
+ is: LexEditCancelReport
+ });
+
+ // Act
+ document.body.appendChild(element);
+
+ // Assert
+ // const div = element.shadowRoot.querySelector('div');
+ expect(1).toBe(1);
+ });
+});
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexEditCancelReport/lexEditCancelReport.html b/force-app/main/default/lwc/lexEditCancelReport/lexEditCancelReport.html
new file mode 100644
index 0000000..bf9cadc
--- /dev/null
+++ b/force-app/main/default/lwc/lexEditCancelReport/lexEditCancelReport.html
@@ -0,0 +1,5 @@
+<template>
+ <div class="Holder" if:true={IsLoading}>
+ <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ </div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexEditCancelReport/lexEditCancelReport.js b/force-app/main/default/lwc/lexEditCancelReport/lexEditCancelReport.js
new file mode 100644
index 0000000..eb3468b
--- /dev/null
+++ b/force-app/main/default/lwc/lexEditCancelReport/lexEditCancelReport.js
@@ -0,0 +1,48 @@
+import { LightningElement, track, wire, api } from 'lwc';
+import {CurrentPageReference} from 'lightning/navigation';
+import { CloseActionScreenEvent } from 'lightning/actions';
+import { NavigationMixin } from 'lightning/navigation';
+import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
+import init from '@salesforce/apex/lexLostCancelReportController.initForEditCancelReport';
+
+export default class LexEditCancelReport extends NavigationMixin(LightningElement) {
+ @api recordId;
+ IsLoading = true;
+ recordTypeId;
+ lostType;
+ reportStatus;
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference){
+ console.log("杩涘叆椤甸潰");
+ console.log(currentPageReference);
+ if(currentPageReference){
+ const urvalue=currentPageReference.state.recordId;
+ if(urvalue){
+ let str=`${urvalue}`;
+ console.log('str');
+ console.log(str);
+ this.recordId=str;
+ }
+ }
+ }
+ connectedCallback(){
+ init({
+ recordId: this.recordId
+ }).then(result=>{
+ this.recordTypeId = result.recordTypeId;
+ this.lostType = result.lostType;
+ this.reportStatus = result.reportStatus;
+ this.editCancelReport();
+ });
+
+ }
+ editCancelReport(){
+ this[NavigationMixin.Navigate]({
+ type: 'standard__recordPage',
+ attributes: {
+ recordId: this.recordId,
+ actionName: 'edit'
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexEditCancelReport/lexEditCancelReport.js-meta.xml b/force-app/main/default/lwc/lexEditCancelReport/lexEditCancelReport.js-meta.xml
new file mode 100644
index 0000000..d0616f9
--- /dev/null
+++ b/force-app/main/default/lwc/lexEditCancelReport/lexEditCancelReport.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>51.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__AppPage</target>
+ <target>lightning__RecordPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexEditLost/lexEditLost.html b/force-app/main/default/lwc/lexEditLost/lexEditLost.html
new file mode 100644
index 0000000..83a9f7c
--- /dev/null
+++ b/force-app/main/default/lwc/lexEditLost/lexEditLost.html
@@ -0,0 +1,13 @@
+<!--
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-09-08 16:18:50
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-09-08 16:32:07
+-->
+<template>
+ <div class="lexLoseReportHolder" if:true={IsLoading}>
+ <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ </div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexEditLost/lexEditLost.js b/force-app/main/default/lwc/lexEditLost/lexEditLost.js
new file mode 100644
index 0000000..7b02b96
--- /dev/null
+++ b/force-app/main/default/lwc/lexEditLost/lexEditLost.js
@@ -0,0 +1,69 @@
+import { api, wire,LightningElement } from 'lwc';
+import { CurrentPageReference } from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import { updateRecord } from 'lightning/uiRecordApi';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import init from '@salesforce/apex/OpportunityLightingButtonController.queryForEditLostButton';
+import queryForProfileId from '@salesforce/apex/OpportunityLightingButtonController.queryForProfileId';
+import PCLReportProfileId from '@salesforce/label/c.PCLReportProfileId';
+export default class LexEditLost extends LightningElement {
+ @api recordId;
+ lostlist;
+ AprofileId;
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ console.log(111);
+ console.log(currentPageReference);
+
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ console.log("str");
+ console.log(str);
+ this.recordId = str;
+ }
+ }
+ }
+
+ connectedCallback(){
+ init({
+ recordId: this.recordId
+ }).then(result=>{
+ this.lostlist = result;
+ queryForProfileId().then()
+ this.AprofileId = PCLReportProfileId.includes(this.profileId);
+ this.editLost();
+ });
+ }
+ editLost(){
+ if (this.lostlist.size < 0){
+ alert('璇峰厛鍒涘缓澶卞崟鎶ュ憡');
+ return;
+ }else if(this.lostlist.size > 1){
+ //alert('1');
+ for(var lost of lostlist ){
+ //alert('3');
+ //alert(lost.RecordTypeId);
+ if(lost.RecordTypeId == '01210000000R4hMAAS'){
+ //alert('4');
+ if(lost.Report_Status__c == '鑽夋' || profileId == '00e10000000Y3o5' || (lost.Report_Status__c == '鎵瑰噯' && AprofileId)){
+ //alert('5');
+ window.open("/apex/PCLLostReportPageLwc?pageStatus=Edit&Id="+lost.Id);
+ }else{
+ window.open("/apex/PCLLostReportPageLwc?pageStatus=View&Id="+lost.Id);
+ }
+ }
+ }
+ }
+ else{
+ //alert('2');
+ //var status = lostlist[0].Report_Status__c;
+ if(lostlist[0].Report_Status__c == '鑽夋' || profileId == '00e10000000Y3o5' || (lostlist[0].Report_Status__c == '鎵瑰噯' && AprofileId)){
+ window.open("/apex/PCLLostReportPageLwc?pageStatus=Edit&Id="+lostlist[0].Id);
+ }else{
+ window.open("/apex/PCLLostReportPageLwc?pageStatus=View&Id="+lostlist[0].Id);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexEditLost/lexEditLost.js-meta.xml b/force-app/main/default/lwc/lexEditLost/lexEditLost.js-meta.xml
new file mode 100644
index 0000000..3392981
--- /dev/null
+++ b/force-app/main/default/lwc/lexEditLost/lexEditLost.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>54.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__RecordPage</target>
+ <target>lightning__AppPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexInventoryReport/__tests__/lexInventoryReport.test.js b/force-app/main/default/lwc/lexInventoryReport/__tests__/lexInventoryReport.test.js
new file mode 100644
index 0000000..503c0d9
--- /dev/null
+++ b/force-app/main/default/lwc/lexInventoryReport/__tests__/lexInventoryReport.test.js
@@ -0,0 +1,25 @@
+import { createElement } from 'lwc';
+import LexInventoryReport from 'c/lexInventoryReport';
+
+describe('c-lex-inventory-report', () => {
+ afterEach(() => {
+ // The jsdom instance is shared across test cases in a single file so reset the DOM
+ while (document.body.firstChild) {
+ document.body.removeChild(document.body.firstChild);
+ }
+ });
+
+ it('TODO: test case generated by CLI command, please fill in test logic', () => {
+ // Arrange
+ const element = createElement('c-lex-inventory-report', {
+ is: LexInventoryReport
+ });
+
+ // Act
+ document.body.appendChild(element);
+
+ // Assert
+ // const div = element.shadowRoot.querySelector('div');
+ expect(1).toBe(1);
+ });
+});
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexInventoryReport/lexInventoryReport.html b/force-app/main/default/lwc/lexInventoryReport/lexInventoryReport.html
new file mode 100644
index 0000000..27e0f69
--- /dev/null
+++ b/force-app/main/default/lwc/lexInventoryReport/lexInventoryReport.html
@@ -0,0 +1,3 @@
+<template>
+
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexInventoryReport/lexInventoryReport.js b/force-app/main/default/lwc/lexInventoryReport/lexInventoryReport.js
new file mode 100644
index 0000000..8a32bc7
--- /dev/null
+++ b/force-app/main/default/lwc/lexInventoryReport/lexInventoryReport.js
@@ -0,0 +1,45 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-09-12 16:22:13
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-09-12 16:22:50
+ */
+import { LightningElement,api,wire } from 'lwc';
+import { CloseActionScreenEvent } from "lightning/actions";
+import { CurrentPageReference } from "lightning/navigation";
+import Inventory_Report from "@salesforce/label/c.Inventory_Report";
+import init from '@salesforce/apex/lexAccountController.init';
+
+export default class LexInventoryReport extends LightningElement {
+ @api recordId;
+ name;
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ if (currentPageReference) {
+ this.url = currentPageReference.state.backgroundContext;
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ this.recordId = str;
+ }
+ }
+ }
+
+ connectedCallback() {
+ init({
+ recordId: this.recordId
+ }).then(result=>{
+ this.name = result.name;
+ window.open('/lightning/r/Report/' + Inventory_Report + '/view?fv0=' + this.name);
+ this.closeAction();
+ });
+
+ }
+
+ closeAction() {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexInventoryReport/lexInventoryReport.js-meta.xml b/force-app/main/default/lwc/lexInventoryReport/lexInventoryReport.js-meta.xml
new file mode 100644
index 0000000..3392981
--- /dev/null
+++ b/force-app/main/default/lwc/lexInventoryReport/lexInventoryReport.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>54.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__RecordPage</target>
+ <target>lightning__AppPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexLoseBid/lexLoseBid.js b/force-app/main/default/lwc/lexLoseBid/lexLoseBid.js
index ae2da8e..7818a8f 100644
--- a/force-app/main/default/lwc/lexLoseBid/lexLoseBid.js
+++ b/force-app/main/default/lwc/lexLoseBid/lexLoseBid.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-05-08 14:36:33
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-24 16:24:28
+ * @LastEditTime: 2023-09-11 16:46:08
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -99,11 +99,13 @@
}
});
}
+
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
this.dispatchEvent(new CloseActionScreenEvent());
diff --git a/force-app/main/default/lwc/lexNewOnLineSurvey/lexNewOnLineSurvey.js b/force-app/main/default/lwc/lexNewOnLineSurvey/lexNewOnLineSurvey.js
index c4a2a1c..09ec423 100644
--- a/force-app/main/default/lwc/lexNewOnLineSurvey/lexNewOnLineSurvey.js
+++ b/force-app/main/default/lwc/lexNewOnLineSurvey/lexNewOnLineSurvey.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-06-29 13:45:26
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-07-07 09:12:29
+ * @LastEditTime: 2023-09-10 13:00:26
*/
/*
* @Description:
@@ -39,6 +39,7 @@
value: rt.recordTypeId
}));
} else if (error) {
+ console.log(error);
// 澶勭悊鎿嶄綔澶辫触鐨勯敊璇�
}
}
diff --git a/force-app/main/default/lwc/lexNewOpportunityAgency/lexNewOpportunityAgency.js b/force-app/main/default/lwc/lexNewOpportunityAgency/lexNewOpportunityAgency.js
index 1caae11..115a49c 100644
--- a/force-app/main/default/lwc/lexNewOpportunityAgency/lexNewOpportunityAgency.js
+++ b/force-app/main/default/lwc/lexNewOpportunityAgency/lexNewOpportunityAgency.js
@@ -245,9 +245,10 @@
}
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
}
diff --git a/force-app/main/default/lwc/lexNewOpportunityFile/lexNewOpportunityFile.js b/force-app/main/default/lwc/lexNewOpportunityFile/lexNewOpportunityFile.js
index a67b440..133f5b9 100644
--- a/force-app/main/default/lwc/lexNewOpportunityFile/lexNewOpportunityFile.js
+++ b/force-app/main/default/lwc/lexNewOpportunityFile/lexNewOpportunityFile.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-06-29 16:43:08
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-06-29 17:07:54
+ * @LastEditTime: 2023-09-11 15:35:43
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -34,9 +34,10 @@
}
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
}
diff --git a/force-app/main/default/lwc/lexNewSolutionClosingAttachment/lexNewSolutionClosingAttachment.js b/force-app/main/default/lwc/lexNewSolutionClosingAttachment/lexNewSolutionClosingAttachment.js
index 9198841..5ccdf85 100644
--- a/force-app/main/default/lwc/lexNewSolutionClosingAttachment/lexNewSolutionClosingAttachment.js
+++ b/force-app/main/default/lwc/lexNewSolutionClosingAttachment/lexNewSolutionClosingAttachment.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-08-29 14:42:25
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-08-29 14:42:44
+ * @LastEditTime: 2023-09-11 15:32:14
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -36,11 +36,12 @@
}
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
- message: msg,
- variant: type
- });
- this.dispatchEvent(event);
+ title: ' ',
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
}
connectedCallback(){
init({
diff --git a/force-app/main/default/lwc/lexNewSolutionProgramma/lexNewSolutionProgramma.js b/force-app/main/default/lwc/lexNewSolutionProgramma/lexNewSolutionProgramma.js
index 3eccebc..7759e85 100644
--- a/force-app/main/default/lwc/lexNewSolutionProgramma/lexNewSolutionProgramma.js
+++ b/force-app/main/default/lwc/lexNewSolutionProgramma/lexNewSolutionProgramma.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-06-26 11:10:52
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-07-10 14:11:57
+ * @LastEditTime: 2023-09-11 15:23:16
*/
import { api, wire,LightningElement } from 'lwc';
@@ -41,12 +41,13 @@
}
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
- message: msg,
- variant: type
+ title: ' ',
+ message: msg,
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
- }
+}
connectedCallback(){
init({
recordId: this.recordId
@@ -61,9 +62,7 @@
});
}
newSolutionProgramma(){
- this.profileId = this.m2profileId;
- this.girWindowDirectorApproved = true;
- console.log(this.profileId != this.m2profileId);
+ console.log(this.girWindowDirectorApproved);
if(this.profileId != this.m2profileId){
this.showToast('鍙湁GIR绐楀彛鎵嶈兘鏂板缓鏂规','error');
this.dispatchEvent(new CloseActionScreenEvent());
diff --git a/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js b/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js
index cc24b1c..1cc63ff 100644
--- a/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js
+++ b/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-03-28 15:59:44
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-24 16:09:50
+ * @LastEditTime: 2023-09-11 13:53:14
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -104,9 +104,10 @@
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
}
diff --git a/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js b/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js
index d00ccd3..6f7c895 100644
--- a/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js
+++ b/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-07 09:02:03
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-24 16:16:57
+ * @LastEditTime: 2023-09-11 13:53:04
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -93,9 +93,10 @@
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
}
diff --git a/force-app/main/default/lwc/lexOLYwinBid/lexOLYwinBid.js b/force-app/main/default/lwc/lexOLYwinBid/lexOLYwinBid.js
index 1b17446..402e766 100644
--- a/force-app/main/default/lwc/lexOLYwinBid/lexOLYwinBid.js
+++ b/force-app/main/default/lwc/lexOLYwinBid/lexOLYwinBid.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-13 13:15:52
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-24 16:28:23
+ * @LastEditTime: 2023-09-11 16:53:01
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -101,9 +101,10 @@
}
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
this.dispatchEvent(new CloseActionScreenEvent());
diff --git a/force-app/main/default/lwc/lexOPDReport/lexOPDReport.js b/force-app/main/default/lwc/lexOPDReport/lexOPDReport.js
index 541bfa6..0937ca1 100644
--- a/force-app/main/default/lwc/lexOPDReport/lexOPDReport.js
+++ b/force-app/main/default/lwc/lexOPDReport/lexOPDReport.js
@@ -37,9 +37,10 @@
}
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
this.dispatchEvent(new CloseActionScreenEvent());
diff --git a/force-app/main/default/lwc/lexOPDReportConsum/lexOPDReportConsum.js b/force-app/main/default/lwc/lexOPDReportConsum/lexOPDReportConsum.js
index be545a3..a1c5616 100644
--- a/force-app/main/default/lwc/lexOPDReportConsum/lexOPDReportConsum.js
+++ b/force-app/main/default/lwc/lexOPDReportConsum/lexOPDReportConsum.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-06-09 16:41:45
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-07-06 09:26:09
+ * @LastEditTime: 2023-09-11 13:49:57
*/
import { LightningElement,api, track, wire } from 'lwc';
import {CurrentPageReference} from 'lightning/navigation';
@@ -44,9 +44,10 @@
}
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
this.dispatchEvent(new CloseActionScreenEvent());
diff --git a/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js b/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js
index 3d287d0..cd5cea9 100644
--- a/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js
+++ b/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-07 09:02:03
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-04-11 11:27:14
+ * @LastEditTime: 2023-09-11 13:52:47
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -61,9 +61,10 @@
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
}
diff --git a/force-app/main/default/lwc/lexOpporSplite/lexOpporSplite.html b/force-app/main/default/lwc/lexOpporSplite/lexOpporSplite.html
index 7c1379b..7e59b68 100644
--- a/force-app/main/default/lwc/lexOpporSplite/lexOpporSplite.html
+++ b/force-app/main/default/lwc/lexOpporSplite/lexOpporSplite.html
@@ -1,6 +1,6 @@
<template>
- <div class="lexOpporSpliteHolder" if:true={IsLoading}>
- <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ <div class="opdToSISHolder" if:true={IsLoading}>
+ <lightning-spinner alternative-text="Loading" size="min"></lightning-spinner>
<lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button>
</div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexOpporSplite/lexOpporSplite.js b/force-app/main/default/lwc/lexOpporSplite/lexOpporSplite.js
index 22d1607..37b248f 100644
--- a/force-app/main/default/lwc/lexOpporSplite/lexOpporSplite.js
+++ b/force-app/main/default/lwc/lexOpporSplite/lexOpporSplite.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-23 10:09:31
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-15 11:06:07
+ * @LastEditTime: 2023-09-12 14:14:04
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -12,8 +12,10 @@
import { updateRecord } from 'lightning/uiRecordApi';
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import init from '@salesforce/apex/OpportunityLightingButtonController.initForOpporSpliteButton';
-
-export default class LexOpporSplite extends LightningElement {
+import initCopy from '@salesforce/apex/OpportunityLightingButtonController.initCopy';
+import { NavigationMixin } from 'lightning/navigation';
+import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
+export default class LexOpporSplite extends NavigationMixin(LightningElement) {
@api recordId;
authorizedDBNo;
estimationDecision;
@@ -51,36 +53,47 @@
})
}
opporSplite(){
- this.authorizedDBNo = 'test';
if(this.recordId == '宸茬粓姝�'){
this.showToast("闇�姹傝〃宸茬粓姝紝涓嶈兘鎷嗗崟","error");
+ this.dispatchEvent(new CloseActionScreenEvent());
}else if(this.authorizedDBNo == ''){
this.showToast("娌℃湁鍚堝悓鎺堟潈缂栫爜锛屼笉鑳芥媶鍗�","error");
+ this.dispatchEvent(new CloseActionScreenEvent());
}else if(this.estimationDecision == true){
this.showToast("鎶ヤ环宸茬粡Decided锛屼笉鑳芥媶鍗�","error");
+ this.dispatchEvent(new CloseActionScreenEvent());
}else if(this.siDecideID == ''){
this.showToast("闇�姹傝〃鏈壒鍑嗭紝涓嶈兘鎷嗗崟","error");
+ this.dispatchEvent(new CloseActionScreenEvent());
}else if(this.recordId != '鑽夋涓�' && this.recordId != '宸叉彁浜�' && this.recordId != '宸茬粓姝�'){
- console.log("sss");
- window.open(
- "/"
- + this.recordId
- + "/e?clone=1&retURL=%2F"
- + this.recordId + "&00N10000002Cbwh=*&CF00N10000006qHai="
- + this.name + "&00Np0000001DOwi=***&00Np0000001CxmR="
- + this.opportunityNo + "&CF00N10000006qHai_lkid="
- + this.recordId + "&00N10000006qHav="
- + this.opportunityNo + "&00N10000009Glvn="
- + this.isAuthorized + "&00N10000008pnmd=1&00N10000002DXkZ=&00N10000002DXke=&00N10000002CmTf=&00N10000002Cb9P=&00N10000002DItz=&00N10000003O9oO=&00N10000003O9o4=&00N10000002CYHy=&00Np00000030gzb=&00Np0000002ajGe=&00Np00000034Qlb"
- );
+ initCopy({
+ recordId: this.recordId
+ }).then(result=>{
+ var changeData = 'Opportunity_No__c=*,Old_Opportunity_ID__c=' + this.recordId
+ + ',old_Oppo_No__c=' + this.opportunityNo
+ + ',IsAuthorized__c=' + this.isAuthorized
+ + ',SeparateBillMark__c=1,Estimation_No__c=,Estimation_Name__c=,Estimation_List_Price__c=,NotesApprovedNo__c=,Assistant_Applied_Date__c=,Contract_DB_SalesDept_complite_day__c=,Contract_DB_complite_day__c=,Closing_Bid_Date__c=';
+ this[NavigationMixin.Navigate]({
+ type: 'standard__objectPage',
+ attributes: {
+ actionName: 'new',
+ objectApiName: 'Opportunity'
+ },
+ state: {
+ defaultFieldValues: result + ',' + changeData
+ }
+ });
+ this.dispatchEvent(new CloseActionScreenEvent());
+ });
+
}
- this.dispatchEvent(new CloseActionScreenEvent());
}
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
this.dispatchEvent(new CloseActionScreenEvent());
diff --git a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html
index 0240b7b..0f2ffaa 100644
--- a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html
+++ b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-20 17:16:48
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-09-06 15:43:06
+ * @LastEditTime: 2023-09-13 13:42:39
-->
<template>
<div class="holder" if:true={IsLoading}>
@@ -130,7 +130,10 @@
<lightning-layout-item size="4" padding="horizontal-small">
<lightning-input name={i} value={brand.lostBrand.AgencyMannual__c} type="text" label="涓爣缁忛攢鍟嗭紙鎵嬪姩锛�:" class="searchField" onchange={handleAgencyMannualOutChange}></lightning-input>
</lightning-layout-item>
-
+ <lightning-layout-item size="4" padding="horizontal-small">
+ <lightning-combobox name={i} label="娓犻亾鍏蜂綋鍘熷洜:" value={brand.lostBrand.ChannelSpecificReasons__c} options={reasonOptions}
+ onchange={handleChannelSpecificReasonChange} placeholder="--鏃�--"></lightning-combobox>
+ </lightning-layout-item>
</lightning-layout>
<lightning-layout>
<lightning-layout-item flexibility="auto" padding="around-small">
diff --git a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.js b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.js
index aa15bbc..447299b 100644
--- a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.js
+++ b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-20 15:04:03
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-09-07 14:46:02
+ * @LastEditTime: 2023-09-13 13:45:33
*/
let columns2=[
{ label: '--鏃�--', value: '' },
@@ -47,6 +47,16 @@
{label : "澶卞崟瀵规墜鍨嬪彿(鎵嬪姩)",fieldName : "LostProductMannual__c"},
{label : "澶卞崟浜у搧绫诲埆",fieldName : "ProductClass__c"},
{label : "澶卞崟浜у搧鍖哄垎",fieldName : "ProductCategory__c"}
+];
+const reasonOptions = [
+ { label: '--鏃�--', value: '' },
+ { label: '鐗圭害涓庡鎴峰叧绯讳笉濂�', value: '鐗圭害涓庡鎴峰叧绯讳笉濂�' },
+ { label: '鐗圭害涓庝簩绾у悎浣滈棶棰�', value: '鐗圭害涓庝簩绾у悎浣滈棶棰�' },
+ { label: '鐗圭害瑕嗙洊涓嶈冻', value: '鐗圭害瑕嗙洊涓嶈冻' },
+ { label: '鐗圭害鎺ㄥ箍娲诲姩涓嶅姏', value: '鐗圭害鎺ㄥ箍娲诲姩涓嶅姏' },
+ { label: '浜岀骇閫夋嫨闂', value: '浜岀骇閫夋嫨闂' },
+ { label: '浜岀骇浠锋牸楂�', value: '浜岀骇浠锋牸楂�' },
+ { label: '鍖婚櫌鎸囧畾浜岀骇', value: '鍖婚櫌鎸囧畾浜岀骇' }
];
const RecordTypeOptions = [
{ label: '--鏃�--', value: '' },
@@ -434,9 +444,9 @@
}).then(result=>{
console.log(result);
if(result == '杩涘彛'){
- this.columns2s = columns2;
- }else{
this.columns2s = columns22;
+ }else{
+ this.columns2s = columns2;
}
if(payloadType === 'multi-select'){
@@ -746,11 +756,18 @@
var value = event.target.value;
this.LostReport.lostReport.LostType__c = value;
}
+ handleChannelSpecificReasonChange(event){
+ var value = event.target.value;
+ this.LostReport.lostReport.LostType__c = value;
+ }
handleLostReasonMainChange(event){
var index = event.target.name;
var value = event.target.value;
this.LostReport.LostBrands[index].lostBrand.Lost_reason_main__c = value;
+ if(value == '娓犻亾鍥犵礌'){
+
+ }
}
handleLostReasonSubChange(event){
diff --git a/force-app/main/default/lwc/lexPredictedDateChange/lexPredictedDateChange.js b/force-app/main/default/lwc/lexPredictedDateChange/lexPredictedDateChange.js
index 6172921..f474a6c 100644
--- a/force-app/main/default/lwc/lexPredictedDateChange/lexPredictedDateChange.js
+++ b/force-app/main/default/lwc/lexPredictedDateChange/lexPredictedDateChange.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-12 10:46:24
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-10 13:03:57
+ * @LastEditTime: 2023-09-12 13:35:56
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -35,9 +35,10 @@
}
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
}
@@ -58,14 +59,14 @@
}
predictedDateChange(){
// 20221206 ljh DB202212030068 start
- var DirectLossFLG = this.directLossFLG;
- var CreatedDay = this.createdDay;
- var Day = '2022-12-03';
- if((DirectLossFLG == true || DirectLossFLG == 1 ) && CreatedDay > Day){
- this.showToast("浠庢嫑鏍囬」鐩偣鍑诲け鍗曟柊寤虹殑璇环锛岄娴婳CSM绛剧害鏃�(KPI)鍜岄娴嬪彂璐ф棩涓嶅厑璁镐慨鏀�","error");
- this.dispatchEvent(new CloseActionScreenEvent());
- return;
- }
+ // var DirectLossFLG = this.directLossFLG;
+ // var CreatedDay = this.createdDay;
+ // var Day = '2022-12-03';
+ // if((DirectLossFLG == true || DirectLossFLG == 1 ) && CreatedDay > Day){
+ // this.showToast("浠庢嫑鏍囬」鐩偣鍑诲け鍗曟柊寤虹殑璇环锛岄娴婳CSM绛剧害鏃�(KPI)鍜岄娴嬪彂璐ф棩涓嶅厑璁镐慨鏀�","error");
+ // this.dispatchEvent(new CloseActionScreenEvent());
+ // return;
+ // }
// 20221206 ljh DB202212030068 end
queryForPredictedDateChangeButton({
recordId: this.recordId
diff --git a/force-app/main/default/lwc/lexQuotationRequest/lexQuotationRequest.js b/force-app/main/default/lwc/lexQuotationRequest/lexQuotationRequest.js
index fe10c67..2d54e0e 100644
--- a/force-app/main/default/lwc/lexQuotationRequest/lexQuotationRequest.js
+++ b/force-app/main/default/lwc/lexQuotationRequest/lexQuotationRequest.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-14 11:09:28
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-12 13:17:30
+ * @LastEditTime: 2023-09-11 16:56:06
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -60,13 +60,14 @@
})
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: '',
- message: msg,
- variant: type
- });
- this.dispatchEvent(event);
- }
+ const event = new ShowToastEvent({
+ title: ' ',
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ }
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
}
diff --git a/force-app/main/default/lwc/lexRequestDB/lexRequestDB.js b/force-app/main/default/lwc/lexRequestDB/lexRequestDB.js
index ac5c4e2..f339e18 100644
--- a/force-app/main/default/lwc/lexRequestDB/lexRequestDB.js
+++ b/force-app/main/default/lwc/lexRequestDB/lexRequestDB.js
@@ -123,13 +123,14 @@
this.dispatchEvent(new CloseActionScreenEvent());
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: '',
- message: msg,
- variant: type
- });
- this.dispatchEvent(event);
- }
+ const event = new ShowToastEvent({
+ title: ' ',
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ }
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
}
diff --git a/force-app/main/default/lwc/lexSIStoOPD/lexSIStoOPD.js b/force-app/main/default/lwc/lexSIStoOPD/lexSIStoOPD.js
index a44bcae..58432a2 100644
--- a/force-app/main/default/lwc/lexSIStoOPD/lexSIStoOPD.js
+++ b/force-app/main/default/lwc/lexSIStoOPD/lexSIStoOPD.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-07 09:02:03
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-04-12 10:15:28
+ * @LastEditTime: 2023-09-11 13:52:37
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -58,9 +58,10 @@
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
}
diff --git a/force-app/main/default/lwc/lexSampleInventoryReport/__tests__/lexSampleInventoryReport.test.js b/force-app/main/default/lwc/lexSampleInventoryReport/__tests__/lexSampleInventoryReport.test.js
new file mode 100644
index 0000000..209f0c2
--- /dev/null
+++ b/force-app/main/default/lwc/lexSampleInventoryReport/__tests__/lexSampleInventoryReport.test.js
@@ -0,0 +1,25 @@
+import { createElement } from 'lwc';
+import LexSampleInventoryReport from 'c/lexSampleInventoryReport';
+
+describe('c-lex-sample-inventory-report', () => {
+ afterEach(() => {
+ // The jsdom instance is shared across test cases in a single file so reset the DOM
+ while (document.body.firstChild) {
+ document.body.removeChild(document.body.firstChild);
+ }
+ });
+
+ it('TODO: test case generated by CLI command, please fill in test logic', () => {
+ // Arrange
+ const element = createElement('c-lex-sample-inventory-report', {
+ is: LexSampleInventoryReport
+ });
+
+ // Act
+ document.body.appendChild(element);
+
+ // Assert
+ // const div = element.shadowRoot.querySelector('div');
+ expect(1).toBe(1);
+ });
+});
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSampleInventoryReport/lexSampleInventoryReport.html b/force-app/main/default/lwc/lexSampleInventoryReport/lexSampleInventoryReport.html
new file mode 100644
index 0000000..27e0f69
--- /dev/null
+++ b/force-app/main/default/lwc/lexSampleInventoryReport/lexSampleInventoryReport.html
@@ -0,0 +1,3 @@
+<template>
+
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSampleInventoryReport/lexSampleInventoryReport.js b/force-app/main/default/lwc/lexSampleInventoryReport/lexSampleInventoryReport.js
new file mode 100644
index 0000000..8802b13
--- /dev/null
+++ b/force-app/main/default/lwc/lexSampleInventoryReport/lexSampleInventoryReport.js
@@ -0,0 +1,45 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-09-12 15:25:16
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-09-12 15:40:46
+ */
+import { LightningElement,api,wire } from 'lwc';
+import { CloseActionScreenEvent } from "lightning/actions";
+import { CurrentPageReference } from "lightning/navigation";
+import Sample_Inventory_Report from "@salesforce/label/c.Sample_Inventory_Report";
+import init from '@salesforce/apex/lexAccountController.init';
+
+export default class LexSampleInventoryReport extends LightningElement {
+ @api recordId;
+ name;
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ if (currentPageReference) {
+ this.url = currentPageReference.state.backgroundContext;
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ this.recordId = str;
+ }
+ }
+ }
+
+ connectedCallback() {
+ init({
+ recordId: this.recordId
+ }).then(result=>{
+ this.name = result.name;
+ window.open('/lightning/r/Report/' + Sample_Inventory_Report + '/view?fv0=' + this.name);
+ this.closeAction();
+ });
+
+ }
+
+ closeAction() {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSampleInventoryReport/lexSampleInventoryReport.js-meta.xml b/force-app/main/default/lwc/lexSampleInventoryReport/lexSampleInventoryReport.js-meta.xml
new file mode 100644
index 0000000..8c8f888
--- /dev/null
+++ b/force-app/main/default/lwc/lexSampleInventoryReport/lexSampleInventoryReport.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>58.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__RecordPage</target>
+ <target>lightning__AppPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSampleOrderListDNReport/__tests__/lexSampleOrderListDNReport.test.js b/force-app/main/default/lwc/lexSampleOrderListDNReport/__tests__/lexSampleOrderListDNReport.test.js
new file mode 100644
index 0000000..284cc7e
--- /dev/null
+++ b/force-app/main/default/lwc/lexSampleOrderListDNReport/__tests__/lexSampleOrderListDNReport.test.js
@@ -0,0 +1,25 @@
+import { createElement } from 'lwc';
+import LexSampleOrderListDNReport from 'c/lexSampleOrderListDNReport';
+
+describe('c-lex-sample-order-list-dn-report', () => {
+ afterEach(() => {
+ // The jsdom instance is shared across test cases in a single file so reset the DOM
+ while (document.body.firstChild) {
+ document.body.removeChild(document.body.firstChild);
+ }
+ });
+
+ it('TODO: test case generated by CLI command, please fill in test logic', () => {
+ // Arrange
+ const element = createElement('c-lex-sample-order-list-dn-report', {
+ is: LexSampleOrderListDNReport
+ });
+
+ // Act
+ document.body.appendChild(element);
+
+ // Assert
+ // const div = element.shadowRoot.querySelector('div');
+ expect(1).toBe(1);
+ });
+});
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSampleOrderListDNReport/lexSampleOrderListDNReport.html b/force-app/main/default/lwc/lexSampleOrderListDNReport/lexSampleOrderListDNReport.html
new file mode 100644
index 0000000..27e0f69
--- /dev/null
+++ b/force-app/main/default/lwc/lexSampleOrderListDNReport/lexSampleOrderListDNReport.html
@@ -0,0 +1,3 @@
+<template>
+
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSampleOrderListDNReport/lexSampleOrderListDNReport.js b/force-app/main/default/lwc/lexSampleOrderListDNReport/lexSampleOrderListDNReport.js
new file mode 100644
index 0000000..0b3a61f
--- /dev/null
+++ b/force-app/main/default/lwc/lexSampleOrderListDNReport/lexSampleOrderListDNReport.js
@@ -0,0 +1,45 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-09-12 16:14:53
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-09-12 16:19:28
+ */
+import { LightningElement,api,wire } from 'lwc';
+import { CloseActionScreenEvent } from "lightning/actions";
+import { CurrentPageReference } from "lightning/navigation";
+import Sample_OrderListDN_Report from "@salesforce/label/c.Sample_OrderListDN_Report";
+import init from '@salesforce/apex/lexAccountController.init';
+
+export default class LexSampleOrderListDNReport extends LightningElement {
+ @api recordId;
+ name;
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ if (currentPageReference) {
+ this.url = currentPageReference.state.backgroundContext;
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ this.recordId = str;
+ }
+ }
+ }
+
+ connectedCallback() {
+ init({
+ recordId: this.recordId
+ }).then(result=>{
+ this.name = result.name;
+ window.open('/lightning/r/Report/' + Sample_OrderListDN_Report + '/view?fv0=' + this.name);
+ this.closeAction();
+ });
+
+ }
+
+ closeAction() {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSampleOrderListDNReport/lexSampleOrderListDNReport.js-meta.xml b/force-app/main/default/lwc/lexSampleOrderListDNReport/lexSampleOrderListDNReport.js-meta.xml
new file mode 100644
index 0000000..8c8f888
--- /dev/null
+++ b/force-app/main/default/lwc/lexSampleOrderListDNReport/lexSampleOrderListDNReport.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>58.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__RecordPage</target>
+ <target>lightning__AppPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSampleOrderListReport/__tests__/lexSampleOrderListReport.test.js b/force-app/main/default/lwc/lexSampleOrderListReport/__tests__/lexSampleOrderListReport.test.js
new file mode 100644
index 0000000..a8462a2
--- /dev/null
+++ b/force-app/main/default/lwc/lexSampleOrderListReport/__tests__/lexSampleOrderListReport.test.js
@@ -0,0 +1,25 @@
+import { createElement } from 'lwc';
+import LexSampleOrderListReport from 'c/lexSampleOrderListReport';
+
+describe('c-lex-sample-order-list-report', () => {
+ afterEach(() => {
+ // The jsdom instance is shared across test cases in a single file so reset the DOM
+ while (document.body.firstChild) {
+ document.body.removeChild(document.body.firstChild);
+ }
+ });
+
+ it('TODO: test case generated by CLI command, please fill in test logic', () => {
+ // Arrange
+ const element = createElement('c-lex-sample-order-list-report', {
+ is: LexSampleOrderListReport
+ });
+
+ // Act
+ document.body.appendChild(element);
+
+ // Assert
+ // const div = element.shadowRoot.querySelector('div');
+ expect(1).toBe(1);
+ });
+});
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSampleOrderListReport/lexSampleOrderListReport.html b/force-app/main/default/lwc/lexSampleOrderListReport/lexSampleOrderListReport.html
new file mode 100644
index 0000000..27e0f69
--- /dev/null
+++ b/force-app/main/default/lwc/lexSampleOrderListReport/lexSampleOrderListReport.html
@@ -0,0 +1,3 @@
+<template>
+
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSampleOrderListReport/lexSampleOrderListReport.js b/force-app/main/default/lwc/lexSampleOrderListReport/lexSampleOrderListReport.js
new file mode 100644
index 0000000..98b5e3a
--- /dev/null
+++ b/force-app/main/default/lwc/lexSampleOrderListReport/lexSampleOrderListReport.js
@@ -0,0 +1,45 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-09-12 15:42:24
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-09-12 15:43:23
+ */
+import { LightningElement,api,wire } from 'lwc';
+import { CloseActionScreenEvent } from "lightning/actions";
+import { CurrentPageReference } from "lightning/navigation";
+import Sample_OrderList_Report from "@salesforce/label/c.Sample_OrderList_Report";
+import init from '@salesforce/apex/lexAccountController.init';
+
+export default class LexSampleOrderListReport extends LightningElement {
+ @api recordId;
+ name;
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ if (currentPageReference) {
+ this.url = currentPageReference.state.backgroundContext;
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ this.recordId = str;
+ }
+ }
+ }
+
+ connectedCallback() {
+ init({
+ recordId: this.recordId
+ }).then(result=>{
+ this.name = result.name;
+ window.open('/lightning/r/Report/' + Sample_OrderList_Report + '/view?fv0=' + this.name);
+ this.closeAction();
+ });
+
+ }
+
+ closeAction() {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSampleOrderListReport/lexSampleOrderListReport.js-meta.xml b/force-app/main/default/lwc/lexSampleOrderListReport/lexSampleOrderListReport.js-meta.xml
new file mode 100644
index 0000000..8c8f888
--- /dev/null
+++ b/force-app/main/default/lwc/lexSampleOrderListReport/lexSampleOrderListReport.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>58.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__RecordPage</target>
+ <target>lightning__AppPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexStockApply/lexStockApply.js b/force-app/main/default/lwc/lexStockApply/lexStockApply.js
index 03e63f8..08225c6 100644
--- a/force-app/main/default/lwc/lexStockApply/lexStockApply.js
+++ b/force-app/main/default/lwc/lexStockApply/lexStockApply.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-14 13:04:53
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-24 16:45:55
+ * @LastEditTime: 2023-09-11 16:58:40
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -125,11 +125,13 @@
}
this.handleConfirmClick("涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵");
}
- showToast(msg,type) {
+
+ showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
this.dispatchEvent(new CloseActionScreenEvent);
diff --git a/force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.css b/force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.css
new file mode 100644
index 0000000..d3a1bf5
--- /dev/null
+++ b/force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.css
@@ -0,0 +1,10 @@
+.specSubmitHolder{
+ position: relative;
+ display: inline-block;
+ width: 80px;
+ height: 80px;
+ text-align: center;
+}
+.container .uiContainerManager{
+ display: none !important;
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.html b/force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.html
new file mode 100644
index 0000000..a02df8e
--- /dev/null
+++ b/force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.html
@@ -0,0 +1,5 @@
+<template>
+ <div class="specSubmitHolder" if:true={IsLoading}>
+ <lightning-spinner alternative-text="Loading" size="small"></lightning-spinner>
+ </div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.js b/force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.js
new file mode 100644
index 0000000..ce88ffe
--- /dev/null
+++ b/force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.js
@@ -0,0 +1,102 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-09-11 09:20:29
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-09-11 10:00:40
+ */
+import { api, wire,LightningElement, track } from 'lwc';
+import { CurrentPageReference } from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import updateSubmitReportButton from '@salesforce/apex/lexLostCancelReportController.updateSubmitReportButton';
+import init from '@salesforce/apex/lexLostCancelReportController.initSubmitReportButton';
+import { updateRecord,getRecord } from 'lightning/uiRecordApi';
+import STATUS_FIELD from "@salesforce/schema/Lost_cancel_report__c.Report_Status__c";
+import { refreshApex } from '@salesforce/apex';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import LightningConfirm from 'lightning/confirm';
+
+export default class LexSubmitReport extends LightningElement {
+ @wire(getRecord, { recordId: '$recordId', fields: [STATUS_FIELD] })
+ record;
+ @api recordId;
+ cntLostCancelReport;
+ cntLostCancelDraft;
+ IsLoading = true;
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ console.log(111);
+ console.log(currentPageReference);
+
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ console.log("str");
+ console.log(str);
+ this.recordId = str;
+ }
+ }
+ }
+ showToast(msg,type) {
+ const event = new ShowToastEvent({
+ title: ' ',
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ }
+
+
+ updateRecordView(recordId) {
+ updateRecord({fields: { Id: recordId }});
+ }
+
+ connectedCallback(){
+ init({
+ recordId: this.recordId
+ }).then(result=>{
+ console.log(result);
+ this.cntLostCancelDraft = result.cntLostCancelDraft;
+ this.cntLostCancelReport = result.cntLostCancelReport;
+ this.submitReport();
+ });
+ }
+ submitReport(){
+ if (this.cntLostCancelReport - this.cntLostCancelDraft > 0) {
+ this.showToast('璇环宸茬粡鏈� 鍙栨秷锛忓け鍗曟姤鍛� 浜嗭紒','error');
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ this.handleConfirmClick('涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵');
+ }
+
+ async handleConfirmClick(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+ console.log(result);
+ if(result){
+ updateSubmitReportButton({
+ recordId: this.recordId
+ }).then(result=>{
+ if(result){
+ this.showToast(result,'error');
+ }else{
+ setTimeout(() => {
+ this.IsLoading = false;
+ refreshApex(this.record);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }, 2000);
+ }
+ });
+ }else{
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.js-meta.xml b/force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.js-meta.xml
new file mode 100644
index 0000000..460876b
--- /dev/null
+++ b/force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>56.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__RecordPage</target>
+ <target>lightning__AppPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSubmitSolutionForApproval/lexSubmitSolutionForApproval.js b/force-app/main/default/lwc/lexSubmitSolutionForApproval/lexSubmitSolutionForApproval.js
index acb7b32..0810a87 100644
--- a/force-app/main/default/lwc/lexSubmitSolutionForApproval/lexSubmitSolutionForApproval.js
+++ b/force-app/main/default/lwc/lexSubmitSolutionForApproval/lexSubmitSolutionForApproval.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-06-20 14:37:24
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-08-29 14:07:08
+ * @LastEditTime: 2023-09-13 15:03:09
*/
import { api, wire,LightningElement, track } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -17,6 +17,8 @@
import { refreshApex } from '@salesforce/apex';
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import LightningConfirm from 'lightning/confirm';
+import lwcCSS from '@salesforce/resourceUrl/lwcCSS';
+import {loadStyle} from 'lightning/platformResourceLoader';
export default class LexSubmitSolutionForApproval extends LightningElement {
@wire(getRecord, { recordId: '$recordId', fields: [STATUS_FIELD] })
@@ -60,6 +62,10 @@
}
connectedCallback(){
+ Promise.all([
+ loadStyle(this, lwcCSS)
+ ]);
+
init({
recordId: this.recordId
}).then(result=>{
diff --git a/force-app/main/default/lwc/lexSubmitSolutionSchemeForApproval/lexSubmitSolutionSchemeForApproval.js b/force-app/main/default/lwc/lexSubmitSolutionSchemeForApproval/lexSubmitSolutionSchemeForApproval.js
index 55c7347..bf81d84 100644
--- a/force-app/main/default/lwc/lexSubmitSolutionSchemeForApproval/lexSubmitSolutionSchemeForApproval.js
+++ b/force-app/main/default/lwc/lexSubmitSolutionSchemeForApproval/lexSubmitSolutionSchemeForApproval.js
@@ -70,20 +70,30 @@
}
console.log('this.schemeType:'+this.schemeType);
if((this.records.length > 0 && this.schemeType == '缁撴') || (this.schemeType == '鍒濇')){
- submitApproval({recordId:this.recordId}).then(rep => {
- console.log(rep);
- if(rep==='OK'){
- console.log('1');
- this.showToast('鎻愪氦瀹℃壒鎴愬姛','success');
+ // submitApproval({recordId:this.recordId}).then(rep => {
+ // console.log(rep);
+ // if(rep==='OK'){
+ // console.log('1');
+ // this.showToast('鎻愪氦瀹℃壒鎴愬姛','success');
+ // }else{
+ // console.log('2');
+ // this.showToast(rep,'error');
+ // }
+ // }).catch(err => {
+ // console.log('3');
+ // console.log(err);
+ // this.showToast(err,'error');
+ // })
+ updateSubmitSolutionSchemeForApprovalButton({
+ recordId: this.recordId
+ }).then(res=>{
+ if(res){
+ this.showToast(res,'error');
+ this.dispatchEvent(new CloseActionScreenEvent());
}else{
- console.log('2');
- this.showToast(rep,'error');
+ window.location.href = '/lightning/r/Solution_Programme__c/'+this.recordId+'/view';
}
- }).catch(err => {
- console.log('3');
- console.log(err);
- this.showToast(err,'error');
- })
+ });
}else{
this.showToast('缁撴鐨勬柟妗堟彁浜ゅ墠锛屽繀椤讳笂浼犵粨妗堥檮浠�','error');
this.dispatchEvent(new CloseActionScreenEvent());
diff --git a/force-app/main/default/lwc/lexUpdateToOpp/lexUpdateToOpp.js b/force-app/main/default/lwc/lexUpdateToOpp/lexUpdateToOpp.js
index 6809eb6..c886649 100644
--- a/force-app/main/default/lwc/lexUpdateToOpp/lexUpdateToOpp.js
+++ b/force-app/main/default/lwc/lexUpdateToOpp/lexUpdateToOpp.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-06-21 10:42:48
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-06-21 10:55:05
+ * @LastEditTime: 2023-09-11 15:39:09
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -16,9 +16,10 @@
export default class LexUpdateToOpp extends LightningElement {
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
}
diff --git a/force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js b/force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js
index d95e89e..c24126d 100644
--- a/force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js
+++ b/force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js
@@ -68,14 +68,15 @@
updateRecord({fields: { Id: recordId }});
}
- showToast(msg, type) {
+ showToast(msg,type) {
const event = new ShowToastEvent({
- title: "",
- message: msg,
- variant: type
+ title: ' ',
+ message: msg,
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
- }
+ }
getUserId(userName){
getUserIdByName({
name : userName
diff --git a/force-app/main/default/lwc/lexVOCConfirm/lexVOCConfirm.js b/force-app/main/default/lwc/lexVOCConfirm/lexVOCConfirm.js
index da16952..c3e089b 100644
--- a/force-app/main/default/lwc/lexVOCConfirm/lexVOCConfirm.js
+++ b/force-app/main/default/lwc/lexVOCConfirm/lexVOCConfirm.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-03-27 14:08:56
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-08-24 15:37:45
+ * @LastEditTime: 2023-09-11 13:48:56
*/
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -63,9 +63,10 @@
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
}
diff --git a/force-app/main/default/lwc/lexVOCFinish/lexVOCFinish.js b/force-app/main/default/lwc/lexVOCFinish/lexVOCFinish.js
index 65809d7..44dac34 100644
--- a/force-app/main/default/lwc/lexVOCFinish/lexVOCFinish.js
+++ b/force-app/main/default/lwc/lexVOCFinish/lexVOCFinish.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-03-27 14:11:17
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-05-09 17:10:14
+ * @LastEditTime: 2023-09-11 13:49:03
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -64,9 +64,10 @@
showToast(msg,type) {
const event = new ShowToastEvent({
- title: '',
+ title: ' ',
message: msg,
- variant: type
+ variant: type,
+ mode: 'sticky'
});
this.dispatchEvent(event);
}
diff --git a/force-app/main/default/pages/AssetMaintainIframe.page b/force-app/main/default/pages/AssetMaintainIframe.page
index b9a9549..77aefd1 100644
--- a/force-app/main/default/pages/AssetMaintainIframe.page
+++ b/force-app/main/default/pages/AssetMaintainIframe.page
@@ -40,7 +40,7 @@
<apex:commandButton style="width: 100%" value="鏁版嵁缁存姢鍗�" onclick="window.open('/lightning/o/AssetMaintainHeader__c/list?filterName=Recent')"/>
</div>
<div style="margin-top:10px;">
- <apex:commandButton style="width: 100%" value="缁存姢浜у搧涓绘暟鎹�" onclick="window.open('/a3z/o')"/>
+ <apex:commandButton style="width: 100%" value="缁存姢浜у搧涓绘暟鎹�" onclick="window.open('/lightning/o/Maintenance_Product_Data__c/list?filterName=Recent')"/>
</div>
</div>
diff --git a/force-app/main/default/pages/InventoryIframe.page b/force-app/main/default/pages/InventoryIframe.page
index fd7e896..b49acb4 100644
--- a/force-app/main/default/pages/InventoryIframe.page
+++ b/force-app/main/default/pages/InventoryIframe.page
@@ -49,7 +49,10 @@
<apex:commandButton styleClass="my-button" style="width: 99%" value="鑰楁潗鐩樼偣鎶ュ憡" onclick="loadPage('/apex/InventoryReport?isConsum=true'); return false"/>
</div>
<div style="margin-top:10px;">
- <apex:commandButton styleClass="my-button" style="width: 99%" value="鐩樼偣琛ㄥご" onclick="location.href = '/a3H/o'; return false"/>
+ <apex:commandButton styleClass="my-button" style="width: 99%" value="娓╂箍搴︾洏鐐�" onclick="loadPage('/apex/InventoryTemperatureHumidity'); return false"/>
+ </div>
+ <div style="margin-top:10px;">
+ <apex:commandButton styleClass="my-button" style="width: 99%" value="鐩樼偣琛ㄥご" onclick="window.open('/lightning/o/Inventory_Header__c/list?filterName=Recent'); return false"/>
</div>
</div>
<!-- <div style="width:90%;float:right;margin-left:5px;" id="vf-content"> -->
diff --git a/force-app/main/default/pages/InventoryReport.page b/force-app/main/default/pages/InventoryReport.page
index 38345fb..0fd3cd5 100644
--- a/force-app/main/default/pages/InventoryReport.page
+++ b/force-app/main/default/pages/InventoryReport.page
@@ -345,7 +345,7 @@
</table>
</apex:pageBlock>
</apex:outputPanel> -->
- <apex:outputPanel id="RightArea" layout="block" style="width: 100%;">
+ <apex:outputPanel id="RightArea" layout="block" style="margin: 0 20%;">
<apex:outputPanel id="message" style="width: auto" >
<apex:pageMessages />
</apex:outputPanel>
diff --git a/force-app/main/default/pages/InventoryResultRecord.page b/force-app/main/default/pages/InventoryResultRecord.page
index bd528dd..2f6aa46 100644
--- a/force-app/main/default/pages/InventoryResultRecord.page
+++ b/force-app/main/default/pages/InventoryResultRecord.page
@@ -140,7 +140,7 @@
width: 9%;
}
.inputTextStyle input {
- width: 90%;
+ width: 96%;
}
.inputTextStyle select {
width: 95%;
@@ -241,7 +241,7 @@
}
.startInventoryButtonStyle {
margin-left: 15%;
- width: 12%;
+ width: 11%;
}
.labelStyle {
width: 9%;
@@ -253,7 +253,7 @@
width: 9%;
}
.inputTextStyle input {
- width: 90%;
+ width: 96%;
}
.inputTextStyle select {
width: 95%;
@@ -385,10 +385,11 @@
j$('.inventoryResultsTable').hide();
} else {
if (hasChange == false) {
- j$(escapeVfId('allPage:allForm:recordBlock:overlay_div')).removeClass('overlay');
+ /*j$(escapeVfId('allPage:allForm:recordBlock:overlay_div')).removeClass('overlay');
j$(escapeVfId('allPage:allForm:recordBlock:overlay_div')).hide();
j$('.inventoryResultsTable').show();
- j$('#descdiv').show();
+ j$('#descdiv').show();*/
+ doInit();
} else {
j$.confirm({
title: '纭',
@@ -397,10 +398,11 @@
useBootstrap: false,
buttons: {
OK: function () {
- j$(escapeVfId('allPage:allForm:recordBlock:overlay_div')).removeClass('overlay');
+ /*j$(escapeVfId('allPage:allForm:recordBlock:overlay_div')).removeClass('overlay');
j$(escapeVfId('allPage:allForm:recordBlock:overlay_div')).hide();
j$('.inventoryResultsTable').show();
- j$('#descdiv').show();
+ j$('#descdiv').show();*/
+ doInit();
},
cancel: {
text: '鍙栨秷', // With spaces and symbols
@@ -499,6 +501,7 @@
</div>
</div>
+ <apex:actionFunction name="doInit" action="{!init}" rerender="recordBlock" onComplete="unblockUI()" />
<apex:actionFunction name="startInventory" action="{!startInventory}" rerender="allForm" onComplete="unblockUI()" />
<!-- update by rentx 20210827 start 鑰楁潗鐩樼偣鏂规 -->
<!-- <apex:actionFunction name="searchBtnFunc" action="{!searchBtn}" rerender="allForm" onComplete="unblockUI();changeFullScreen(true);" /> -->
@@ -529,20 +532,6 @@
</table>
</apex:pageBlock>
</apex:outputPanel> -->
-
- <!-- <apex:outputPanel layout="block" style="width: 14%; float: left;">
- <apex:pageBlock mode="maindetail">
- <table style='width:140px;height: 120px'>
- <tr><td class="checkButtonStyle"><apex:commandButton value="鐩樼偣" rendered="{!!inventoryBlueFlag}" onclick="location.href='/apex/InventoryResultRecord'; return false"/></td></tr>
- <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鐩樼偣" rendered="{!inventoryBlueFlag}"/></td></tr>
- <tr><td class="checkButtonStyle"><apex:commandButton value="澶囧搧鐩樼偣鎶ュ憡" rendered="{!!rentBlueFlag}" onclick="location.href='{!$Page.InventoryReport}'; return false" /></td></tr>
- <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="澶囧搧鐩樼偣鎶ュ憡" rendered="{!rentBlueFlag}"/></td></tr>
- <tr><td class="checkButtonStyle"><apex:commandButton value="鑰楁潗鐩樼偣鎶ュ憡" rendered="{!!consumBlueFlag}" onclick="location.href='{!$Page.InventoryReport}?isConsum=true'; return false" /></td></tr>
- <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鑰楁潗鐩樼偣鎶ュ憡" rendered="{!consumBlueFlag}"/></td></tr>
- <tr><td></td></tr>
- </table>
- </apex:pageBlock>
- </apex:outputPanel> -->
<!-- 鍙充晶妫�绱㈠尯 -->
<apex:outputPanel layout="block">
<apex:pageBlock mode="maindetail" id="maindetailId">
@@ -569,7 +558,7 @@
<tr>
<td></td>
<td colspan="10">
- <input class="startInventoryButtonStyle blueStyle" style="margin-left: 0" type="button" value="寮�濮嬬洏鐐�" onclick="startjs(this);return false;" />
+ <input class="startInventoryButtonStyle blueStyle" style="margin-left: 2px" type="button" value="寮�濮嬬洏鐐�" onclick="startjs(this);return false;" />
</td>
</tr>
<!-- <tr>
@@ -645,6 +634,7 @@
</div> -->
</td>
</tr>
+ <tr><td style="height: 23px;"></td></tr>
<tr>
<td class="labelStyle">鐩樹簭/鐩樼泩</td>
<td class="inputTextStyle">
@@ -664,8 +654,13 @@
<td class="blankStyle">
</td>
<td class="blankStyle"></td>
- <td class="blankStyle"></td>
- <td class="blankStyle">
+ <!-- 20230912 ljh start -->
+ <!-- <td class="searchButtonStyle"> -->
+ <td width="11%">
+ <!-- 20230912 ljh end -->
+ <div style="display: table-cell; width: 143px">
+ <apex:commandButton action="{!showResult}" value="鏄剧ず鐩樼偣缁撴灉" reRender="allForm" onclick="blockme()" oncomplete="unblockUI()" rendered="{!canDoFlg}"/>
+ </div>
</td>
<td class="searchButtonStyle" colspan="2">
<div style="display: table-cell; width: 80px">
@@ -673,6 +668,7 @@
</div>
</td>
</tr>
+ <tr><td height="23px"></td></tr>
<tr style="{!IF(bieCunFangDi=='涓婃捣 澶囧搧涓績' || hasConsumAsset,'','display: none;')}">
<td class="labelStyle">澶囧搧绫诲埆</td>
<td class="inputTextStyle">
@@ -934,25 +930,25 @@
<apex:param value="{!consumInventoryHeader.Inventory_Start_Date__c}"></apex:param>
</apex:outputtext>
</div>
- <apex:outputPanel id="message2" layout="block" style="width: 530px">
+ <apex:outputPanel id="message2" layout="block" style="width: 100%">
<apex:pageMessages />
</apex:outputPanel>
<div class="searchButtonStyle1" id="scanAction_div">
<!-- 鑰楁潗杩芥函鏂规 妫�绱㈣�楁潗鏃� 淇敼"鎵弿"涓�"pad鎵弿" -->
- <div style="display: table-cell; width: 100px">
+ <div style="display: table-cell; width: 18%;">
<apex:commandButton value="iPad鎵弿" rendered="{!assetCategory == '鑰楁潗' && bieCunFangDi == '涓婃捣 澶囧搧涓績'}" onclick="qrsacn();return false"/>
<apex:commandButton value="鎵弿" rendered="{!!(assetCategory == '鑰楁潗' && bieCunFangDi == '涓婃捣 澶囧搧涓績') }" onclick="qrsacn();return false"/>
</div>
- <div style="display: table-cell; width: 80px"><apex:commandButton value="淇濆瓨" onclick="savejs();return false"/></div>
- <div style="display: table-cell; width: 80px"><apex:commandButton value="杩斿洖" onclick="changeFullScreen(false); return false"/></div>
+ <div style="display: table-cell; width: 13%;"><apex:commandButton value="淇濆瓨" onclick="savejs();return false"/></div>
+ <div style="display: table-cell; width: 13%;"><apex:commandButton value="杩斿洖" onclick="changeFullScreen(false); return false"/></div>
<!-- 鑰楁潗杩芥函鏂规 娣诲姞 "鐮佹灙鎵弿"杈撳叆妗� add by rentx 20210911 start -->
<apex:outputText rendered="{!assetCategory == '鑰楁潗' && bieCunFangDi = '涓婃捣 澶囧搧涓績'}">
- <div style="display: table-cell; width: 80px">
+ <div style="display: table-cell; width: 19%;">
<apex:commandButton onclick="document.getElementById('maqCode').focus();return false" value="鐮佹灙鎵弿" />
</div>
<div style="display: table-cell; width: 500px" >
- <input value="" autofocus="autofocus" id="maqCode" width="100%" style="background-color: #ffffff" onkeypress="return onKeyPress(event)" />
+ <input value="" autofocus="autofocus" id="maqCode" width="100%" style="background-color: #ffffff;height: 32px;" onkeypress="return onKeyPress(event)" />
</div>
<!-- <div style="display: table-cell;" >
<div style="float: left;display: table-cell;" class="btn" >鐮佹灙鎵弿 </div>
@@ -963,17 +959,23 @@
<!-- 鑰楁潗杩芥函鏂规 娣诲姞 "鐮佹灙鎵弿"杈撳叆妗� add by rentx 20210911 end -->
</div>
- <table border="1px" style="width: 510px;" >
+ <table border="1px" style="width: 95%;" >
<tr>
- <td class="labelStyle" style="width: 130px;">鍨嬪彿</td>
- <td class="labelStyle" style="width: 60px;">鏈鸿韩鍙�</td>
- <apex:outputText rendered="{!angecylookrole}"> <!-- 1650--><td class="labelStyle" style="width: 60px;">璐ф灦鍙�</td></apex:outputText>
- <td class="labelStyle" style="width: 90px;">鎵�鍦ㄥ湴鍖�(鏈儴)</td>
- <td class="labelStyle" style="width: 60px;">璐у尯</td>
- <td class="labelStyle" style="width: 60px;">鍦ㄥ簱鏁伴噺</td>
- <td class="labelStyle" style="width: 60px;">鐩樼偣缁撴灉</td>
- <td class="labelStyle" style="width: 40px;">鐩樼泩</td>
- <td class="labelStyle" style="width: 40px;">鐩樹簭</td>
+ <td class="labelStyle">鍨嬪彿</td>
+ <td class="labelStyle">鏈鸿韩鍙�</td>
+ <apex:outputText rendered="{!angecylookrole}"> <!-- 1650--><td class="labelStyle">璐ф灦鍙�</td></apex:outputText>
+ <td class="labelStyle">鎵�鍦ㄥ湴鍖�(鏈儴)</td>
+ <td class="labelStyle">璐у尯</td>
+ <td class="labelStyle">鍦ㄥ簱鏁伴噺</td>
+ <td class="labelStyle">鐩樼偣缁撴灉</td>
+ <td class="labelStyle">鐩樼泩</td>
+ <td class="labelStyle">鐩樹簭</td>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230801 by lc Start -->
+ <apex:outputText rendered="{!assetCategory!='澶囧搧'}"><td class="labelStyle" style="width: 60px;">鏈夋晥鏈熻嚦</td></apex:outputText>
+ <apex:outputText rendered="{!assetCategory!='澶囧搧'}"><td class="labelStyle" style="width: 50px;">鏁堟湡</td></apex:outputText>
+ <td class="labelStyle" style="width: 50px;">澶栬</td>
+ <td class="labelStyle" style="width: 50px;">鍖呰</td>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230801 by lc End -->
</tr>
<apex:repeat value="{!inventoryDetailList}" var="ivDetail" id="inventroyRow">
<tr class="{!IF(assetCategory!='鑰楁潗','displayRow','hiddenRow')}">
@@ -986,7 +988,7 @@
<td class="labelStyle">
<apex:outputPanel layout="none" rendered="{!ivDetail.Asset__r.Manage_type__c == '涓綋绠＄悊' && ivDetail.Asset_Status__c != '鍐荤粨'}">
<apex:inputField onchange="hasChangeFunc()" html-data-qrcode="{!ivDetail.Fixture_QRCode__c}" html-data-accsessary="{!ivDetail.OneToOne_Accsessary__c}" html-data-main="{!ivDetail.OneToOne_Body__c}" html-data-mid="{!ivDetail.Main_Asset__c}"
- html-disabled="true" html-data-aid="{!ivDetail.Asset__c}" html-data-frozen="{!ivDetail.Asset_Status__c == '鍐荤粨'}" html-data-bpguige="{!ivDetail.Asset__r.Product2.Packing_list_Fixture_F__c}" value="{!ivDetail.Inventory_Count__c}" style="width: 40px"/>
+ html-disabled="true" html-data-aid="{!ivDetail.Asset__c}" html-data-frozen="{!ivDetail.Asset_Status__c == '鍐荤粨'}" html-data-bpguige="{!ivDetail.Asset__r.Product2.Packing_list_Fixture_F__c}" value="{!ivDetail.Inventory_Count__c}" style="width: 80%"/>
<apex:outputPanel layout="none" rendered="{!ivDetail.Asset__r.Manage_type__c == '涓綋绠＄悊'}">
<br/>
<button onclick="lostGeTi(this);return false;">鎵嬪姩</button>
@@ -994,11 +996,15 @@
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!ivDetail.Asset__r.Manage_type__c == '鏁伴噺绠＄悊' || ivDetail.Asset_Status__c == '鍐荤粨'}">
<apex:inputField onchange="hasChangeFunc()" html-data-qrcode="{!ivDetail.Fixture_QRCode__c}" html-data-accsessary="{!ivDetail.OneToOne_Accsessary__c}" html-data-main="{!ivDetail.OneToOne_Body__c}" html-data-mid="{!ivDetail.Main_Asset__c}"
- html-data-aid="{!ivDetail.Asset__c}" html-data-frozen="{!ivDetail.Asset_Status__c == '鍐荤粨'}" html-data-bpguige="{!ivDetail.Asset__r.Product2.Packing_list_Fixture_F__c}" value="{!ivDetail.Inventory_Count__c}" style="width: 40px" />
+ html-data-aid="{!ivDetail.Asset__c}" html-data-frozen="{!ivDetail.Asset_Status__c == '鍐荤粨'}" html-data-bpguige="{!ivDetail.Asset__r.Product2.Packing_list_Fixture_F__c}" value="{!ivDetail.Inventory_Count__c}" style="width: 80%" />
</apex:outputPanel>
</td>
<td class="labelStyle"><apex:outputPanel rendered="{!ivDetail.Inventory_Count__c != null && ivDetail.Inventory_Count__c - ivDetail.Amount__c > 0}">{!ivDetail.Inventory_Count__c - ivDetail.Amount__c}</apex:outputPanel></td>
<td class="labelStyle"><apex:outputPanel rendered="{!ivDetail.Inventory_Count__c != null && ivDetail.Amount__c - ivDetail.Inventory_Count__c > 0}">{!ivDetail.Amount__c - ivDetail.Inventory_Count__c}</apex:outputPanel></td>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230801 by lc Start -->
+ <td class="labelStyle"><apex:inputField value="{!ivDetail.Appearance_Check_Result__c}" style="width: 50px" /></td>
+ <td class="labelStyle"><apex:inputField value="{!ivDetail.Package_Check_Result__c}" style="width: 50px" /></td>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230801 by lc End -->
</tr>
</apex:repeat>
<apex:repeat value="{!consumInventoryDetailList}" var="ivDetail" id="consumInventroyRow">
@@ -1013,7 +1019,7 @@
<td class="labelStyle">
<apex:outputPanel layout="none" rendered="{!ivDetail.Asset__r.Manage_type__c == '涓綋绠＄悊' && ivDetail.Asset_Status__c != '鍐荤粨'}">
<apex:inputField onchange="hasChangeFunc()" html-data-accsessary="false" html-data-barcode="{!ivDetail.Barcode__c}" html-data-ProductSerialNo="{!ivDetail.Asset__r.Product_Serial_No__c}" html-data-salesdepartment="{!ivDetail.Salesdepartment__c}"
- html-disabled="true" html-data-qrcode="{!ivDetail.Fixture_QRCode__c}" html-data-aid="{!ivDetail.Asset__c}" html-data-frozen="{!ivDetail.Asset_Status__c == '鍐荤粨'}" html-data-bpguige="{!ivDetail.Asset__r.Product2.Packing_list_Fixture_F__c}" value="{!ivDetail.Inventory_Count__c}" style="width: 40px"/>
+ html-disabled="true" html-data-qrcode="{!ivDetail.Fixture_QRCode__c}" html-data-aid="{!ivDetail.Asset__c}" html-data-frozen="{!ivDetail.Asset_Status__c == '鍐荤粨'}" html-data-bpguige="{!ivDetail.Asset__r.Product2.Packing_list_Fixture_F__c}" value="{!ivDetail.Inventory_Count__c}" style="width: 80%"/>
<!-- add by rentx 20210823 start 鑰楁潗鐩樼偣鏃惰褰昪ode -->
<apex:inputHidden value="{!ivDetail.HCCodes__c}" />
<!-- add by rentx 20210823 start 鑰楁潗鐩樼偣鏃惰褰昪ode -->
@@ -1024,7 +1030,7 @@
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!ivDetail.Asset__r.Manage_type__c == '鏁伴噺绠＄悊' || ivDetail.Asset_Status__c == '鍐荤粨'}">
<apex:inputField onchange="hasChangeFunc()" html-data-accsessary="false" html-data-barcode="{!ivDetail.Barcode__c}" html-data-ProductSerialNo="{!ivDetail.Asset__r.Product_Serial_No__c}" html-data-salesdepartment="{!ivDetail.Salesdepartment__c}"
- html-data-qrcode="{!ivDetail.Fixture_QRCode__c}" html-data-aid="{!ivDetail.Asset__c}" html-data-frozen="{!ivDetail.Asset_Status__c == '鍐荤粨'}" html-data-bpguige="{!ivDetail.Asset__r.Product2.Packing_list_Fixture_F__c}" value="{!ivDetail.Inventory_Count__c}" style="width: 40px" />
+ html-data-qrcode="{!ivDetail.Fixture_QRCode__c}" html-data-aid="{!ivDetail.Asset__c}" html-data-frozen="{!ivDetail.Asset_Status__c == '鍐荤粨'}" html-data-bpguige="{!ivDetail.Asset__r.Product2.Packing_list_Fixture_F__c}" value="{!ivDetail.Inventory_Count__c}" style="width: 80%" />
<!-- add by rentx 20210819 start -->
<apex:inputHidden value="{!ivDetail.HCCodes__c}" />
<!-- add by rentx 20210819 start -->
@@ -1033,6 +1039,16 @@
</td>
<td class="labelStyle"><apex:outputPanel rendered="{!ivDetail.Inventory_Count__c != null && ivDetail.Inventory_Count__c - ivDetail.Amount__c > 0}">{!ivDetail.Inventory_Count__c - ivDetail.Amount__c}</apex:outputPanel></td>
<td class="labelStyle"><apex:outputPanel rendered="{!ivDetail.Inventory_Count__c != null && ivDetail.Amount__c - ivDetail.Inventory_Count__c > 0}">{!ivDetail.Amount__c - ivDetail.Inventory_Count__c}</apex:outputPanel></td>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230801 by lc Start -->
+ <td class="labelStyle">
+ <apex:outputtext value="{0, date, yyyyMMdd}">
+ <apex:param value="{!ivDetail.Consumable_Guaranteen_end__c}" />
+ </apex:outputtext>
+ </td>
+ <td class="labelStyle"><apex:inputField value="{!ivDetail.Expiration_Check_Result__c}" style="width: 50px" /></td>
+ <td class="labelStyle"><apex:inputField value="{!ivDetail.Appearance_Check_Result__c}" style="width: 50px" /></td>
+ <td class="labelStyle"><apex:inputField value="{!ivDetail.Package_Check_Result__c}" style="width: 50px" /></td>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230801 by lc End -->
</tr>
</apex:repeat>
</table>
diff --git a/force-app/main/default/pages/LostEditPage1.page b/force-app/main/default/pages/LostEditPage1.page
index 48e10de..5f23335 100644
--- a/force-app/main/default/pages/LostEditPage1.page
+++ b/force-app/main/default/pages/LostEditPage1.page
@@ -47,13 +47,13 @@
if (this.location.search.indexOf("?") == 0 && this.location.search.indexOf("=") > 1) {
arrSource = decodeURI(this.location.search).substring(1, this.location.search.length).split("&"), i = 0;
while (i < arrSource.length && !isFound) arrSource[i].indexOf("=") > 0 && arrSource[i].split("=")[0].toLowerCase() == paramName.toLowerCase() && (paramValue = arrSource[i].split("=")[1], isFound = !0), i++
- }
+ }
return paramValue == "" && (paramValue = null), paramValue;
}
function lostReport(){
//澶卞崟鎶ュ憡鐨処D
var ReportId = getParam('id');
- var str = '/apex/PCLLostReportPage?pageStatus=Edit&id=' + ReportId;
+ var str = '/apex/PCLLostReportPageLwc?pageStatus=Edit&reportId=' + ReportId;
window.open(str,'_self');
}
diff --git a/force-app/main/default/pages/LostEditPage1.page-meta.xml b/force-app/main/default/pages/LostEditPage1.page-meta.xml
index d525d39..3e8a4f2 100644
--- a/force-app/main/default/pages/LostEditPage1.page-meta.xml
+++ b/force-app/main/default/pages/LostEditPage1.page-meta.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
- <apiVersion>52.0</apiVersion>
+ <apiVersion>57.0</apiVersion>
<availableInTouch>false</availableInTouch>
<confirmationTokenRequired>false</confirmationTokenRequired>
<label>LostEditPage1</label>
diff --git a/force-app/main/default/pages/LostViewPage1.page b/force-app/main/default/pages/LostViewPage1.page
index d451e2f..bd14ee6 100644
--- a/force-app/main/default/pages/LostViewPage1.page
+++ b/force-app/main/default/pages/LostViewPage1.page
@@ -51,7 +51,7 @@
function lostReport(){
//澶卞崟鎶ュ憡鐨処D
var ReportId = getParam('id');
- var str = '/apex/PCLLostReportPage?pageStatus=View&id=' + ReportId;
+ var str = '/apex/PCLLostReportPageLwc?pageStatus=View&reportId=' + ReportId;
window.open(str,'_self');
diff --git a/force-app/main/default/pages/LostViewPage1.page-meta.xml b/force-app/main/default/pages/LostViewPage1.page-meta.xml
index 90694c2..aaf57c0 100644
--- a/force-app/main/default/pages/LostViewPage1.page-meta.xml
+++ b/force-app/main/default/pages/LostViewPage1.page-meta.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
- <apiVersion>52.0</apiVersion>
+ <apiVersion>57.0</apiVersion>
<availableInTouch>false</availableInTouch>
<confirmationTokenRequired>false</confirmationTokenRequired>
<label>LostViewPage1</label>
diff --git a/force-app/main/default/pages/NewQuoteEntry.page b/force-app/main/default/pages/NewQuoteEntry.page
index e17140f..ae89c1e 100644
--- a/force-app/main/default/pages/NewQuoteEntry.page
+++ b/force-app/main/default/pages/NewQuoteEntry.page
@@ -2,16 +2,13 @@
-->
<apex:page controller="NewQuoteEntryController" sidebar="false" action="{!init}" id="Page" lightningStylesheets="true" >
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
-
-
- <apex:stylesheet value="{!URLFOR($Resource.NewQuoteEntryCss)}"/>
-
+ <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.NewQuoteEntryJS)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.clipboardminjs)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
<script type="text/javascript">
- if(window.sfdcPage && window.sfdcPage.appendToOnloadQueue){
- window.sfdcPage.appendToOnloadQueue(
- function() { calonLoad() }
- );
- }
//娣诲姞琛� html鐗规�у鍔犳粦鍔ㄦ潯 绮剧悽鎶�鏈� wql 2021/02/09 start
//dialog 寮圭獥 start
var popupBox;
@@ -40,15 +37,11 @@
// }
//dialog 寮圭獥 end
// 娣诲姞琛� html鐗规�у鍔犳粦鍔ㄦ潯 绮剧悽鎶�鏈� wql 2021/02/09 end
-
+ debugger
var QuoteEntryMaxLine = {!QuoteEntryMaxLine};
- console.log(QuoteEntryMaxLine );
var trade = '{!oppInfo.Trade}';
- console.log(trade );
var displayCost = '{!displayCost}';
- console.log(displayCost );
var quoid = '{!quoid}';
- console.log(quoid );
var Session_ID = '{!$Api.Session_ID}';
var Price_Valid_Period = '{!$Label.Price_Valid_Period}';
var Message_001 = '{!$Label.Message_001}';
@@ -68,6 +61,14 @@
var QuoteDecide = {!QuoteDecide};
window.sfdcPage.appendToOnloadQueue(function() { calonLoad() });
var openQuoteExcelImportWindow = null;
+
+ // function checkHaveVirtual(msg){
+ // var haveVirtual = j$(escapeVfId("Page:mainForm:block:hidden_HaveVirtual")).value();
+ // console.log(haveVirtual);
+ // if(haveVirtual == true){
+ // alert(msg);
+ // }
+ // }
function selectAll() {
var checklist = j$("input[name='checklist']");
@@ -105,7 +106,7 @@
</script>
<style type="text/css">
div#iframelike {
- color: rgb(24, 24, 24);
+ color: #fff;
height: 300px;
overflow: auto;
}
@@ -191,7 +192,6 @@
opacity: 0.5;
}
/* 娣诲姞琛� html鐗规�у鍔犳粦鍔ㄦ潯 绮剧悽鎶�鏈� wql 2021/02/09 end */
-
</style>
<apex:form id="mainForm">
@@ -258,6 +258,9 @@
<!-- 澶氬勾淇濅慨 start -->
<apex:inputHidden id="hidden_MultiYearWarrantyTotalPrice" value="{!quo.MultiYearWarrantyTotalPrice__c}"/>
<!-- 澶氬勾淇濅慨 end -->
+ <!-- 铏氭嫙浜у搧 start -->
+ <apex:inputHidden id="hidden_HaveVirtual" value="{!quo.Have_Virtual__c}"/>
+ <!-- 铏氭嫙浜у搧 end -->
<apex:inputHidden value="{!enableSales}" id="SalesRoot_Flg"/>
<apex:inputHidden value="{!oppInfo.CurrencyIsoCode}" id="CurrencyIsoCode"/>
<apex:inputHidden value="{!baseUrl}" id="baseUrl"/>
@@ -266,6 +269,10 @@
<apex:inputHidden value="{!oppInfo.Authorized_DB_No}" id="Authorized_DB_No" rendered="{!displayFlg}"/>
<apex:inputHidden value="{!oppInfo.If_Need_Authorize}" id="If_Need_Authorize" rendered="{!displayFlg}"/>
<!-- LHJ End -->
+ <!-- DB202303051651 浜у搧鎶ヤ环閲戦鑷姩璁＄畻 ssm start -->
+ <apex:inputHidden id="rateHospital" value="{!oppInfo.rate_hospital}"/>
+ <apex:inputHidden id="rateAgency1" value="{!oppInfo.rate_agency1}"/>
+ <!-- DB202303051651 浜у搧鎶ヤ环閲戦鑷姩璁＄畻 ssm end -->
<apex:outputPanel id="message1">
<apex:messages styleClass="editListError"/>
@@ -291,7 +298,7 @@
</tr>
</table>
</apex:outputPanel>
- <div style="background-color:#f4f8fd73">
+ <div>
<table border="0">
<tr>
<th style="text-align:right;width:90px;">{!$Label.Quoto_No}</th>
@@ -335,13 +342,12 @@
<td style="width:130px;"><apex:commandButton onclick="openQuoteExcelImport(event);return false;" value="{!$Label.Excel_Import}" style="width:110px;" rerender="dummy"/></td>
<td style="text-align:right;width:50px;"><apex:commandButton rerender="dummy" id="Btn_RowDelete" onclick="radioChecker2('del');return false;" value="{!$Label.deleteLabel}" style="width:60px;" /></td>
<!-- 娣诲姞琛� -->
- <td width="50px;">
+ <td width="40px;">
<!-- 娣诲姞琛� html鐗规�у鍔犳粦鍔ㄦ潯 绮剧悽鎶�鏈� wql 2021/02/09 end -->
<apex:commandButton onclick="openAddMultipleRow(); return false;" value="澧炲姞琛�" rerender="{!displayFlg}"/>
</td>
- <td style="width:50px;">
- <apex:commandButton rerender="dummy" id="Btn_RowUp" onclick="radioChecker2('up');return false;" value="{!$Label.Row_Up}" style="width:60px;"/> </td>
- <td style="width:50px;">
+ <td style="width:130px;">
+ <apex:commandButton rerender="dummy" id="Btn_RowUp" onclick="radioChecker2('up');return false;" value="{!$Label.Row_Up}" style="width:60px;"/>
<apex:commandButton rerender="dummy" id="Btn_RowDown" onclick="radioChecker2('down');return false;" value="{!$Label.Row_Down}" style="width:60px;"/>
</td>
@@ -363,21 +369,20 @@
</table>
-->
<!-- 鍘熶唬鐮� end -->
- <div style="background-color:#f4f8fd73">
- <table >
+ <table>
<tr>
<td> </td>
</tr>
<tr>
<th style="text-align:right;width:30px;"> </th>
- <th style="text-align:left;width:130px;">鍚堝悓淇濅慨鏈燂紙骞达級: </th>
+ <th style="text-align:right;width:50px;">鍚堝悓淇濅慨鏈燂紙骞达級: </th>
<td style="width:190px;"><apex:inputField id="AllGurantee_Period" value="{!quo.Gurantee_Period__c}" onchange="calGuranteePeriod();" style="width:50px; text-align:right;" />
<apex:inputHidden id="Gurantee_Period__c" value="{!quo.Gurantee_Period__c}"/>
</td>
<!-- 澶栬锤澶氬勾淇� 鍙栨秷nodiscount 鍚堣 闅愯棌 绮剧悽鎶�鏈� wql 2021/01/18 start -->
<apex:variable id="contractWarranty" value="{!1}" var="abc" >
- <th style="text-align:right;width:130px;">
+ <th style="text-align:right;width:50px;">
{!$ObjectType.Quote.fields.MultiYearWarrantyTotalPrice__c.label}
: </th>
<td style="width:370px;">
@@ -412,7 +417,7 @@
</div>
</td>
- <th style="text-align:right;width:130px;">
+ <th style="text-align:right;width:20px;">
{!$ObjectType.Quote.fields.multiYearWarranty__c.label}
: </th>
<td style="width:200px;"><apex:inputField id="multiYearWarranty" value="{!quo.multiYearWarranty__c}" onchange="callFromCancelgurantee_MD();" style="text-align:right;width:30px;" /></td>
@@ -438,8 +443,7 @@
<tr>
<td> </td>
</tr>
- </table></div>
-
+ </table>
<!-- 澶氬勾淇濅慨 end -->
<DIV style="OVERFLOW-Y: hidden; OVERFLOW-X:auto;width:1260px">
@@ -521,7 +525,7 @@
<td class="dataCell" style="text-align:center;width:125px;">
<!-- Celon璇环淇敼 2022-04-24 ssm start -->
<!-- <apex:inputText id="Assert" style="width:95%;" value="{!s.Asset_Model}" onclick="searchProduct('{!s.lineNo}',this.value)" /> -->
- <apex:inputText id="Assert" style="width:95%;" value="{!s.Asset_Model}" onclick="searchProduct('{!s.lineNo}',{!quoteEntryMaxLine},'{!oppInfo.CelonOpportunity}')" />
+ <apex:inputText id="Assert" style="width:95%;" value="{!s.Asset_Model}" onclick="searchProduct('{!s.lineNo}',this.value,'{!oppInfo.CelonOpportunity}')" />
<!-- Celon璇环淇敼 2022-04-24 ssm end -->
</td>
<td class="dataCell" id="{!Text(cnt-1)}:td_Status__c" style="width:70px;text-align: center;">
@@ -566,7 +570,7 @@
</td>
<td class="dataCell" style="text-align: center;width:50px;">
<!-- 2018/09/28 CHAN-B4YAB8 缁忛攢鍟嗗崟浠疯绠� start -->
- <apex:inputField id="Quantity" style="width:45px;text-align:center;" value="{!s.PageObject.Quantity__c}" onChange="calPrice('{!s.lineNo}');quoteAgencyTotalPriceAction();AgencyDiscountCalculation1();"/>
+ <apex:inputField id="Quantity" style="width:30px;text-align:center;" value="{!s.PageObject.Quantity__c}" onChange="calPrice('{!s.lineNo}');quoteAgencyTotalPriceAction();AgencyDiscountCalculation1();"/>
<!-- 2018/09/28 CHAN-B4YAB8 缁忛攢鍟嗗崟浠疯绠� end -->
</td>
<td class="dataCell" style="width:20px;text-align: center;">
@@ -878,10 +882,4 @@
</script>
<!-- //娣诲姞琛� html鐗规�у鍔犳粦鍔ㄦ潯 绮剧悽鎶�鏈� wql 2021/02/09 end -->
- <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
- <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
- <apex:includeScript value="{!URLFOR($Resource.NewQuoteEntryJS)}"/>
- <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
- <apex:includeScript value="{!URLFOR($Resource.clipboardminjs)}"/>
- <apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/PCLLostReportPage.page b/force-app/main/default/pages/PCLLostReportPage.page
index f013ee9..f99779a 100644
--- a/force-app/main/default/pages/PCLLostReportPage.page
+++ b/force-app/main/default/pages/PCLLostReportPage.page
@@ -1,10 +1,16 @@
<apex:page standardcontroller="Lost_cancel_report__c" extensions="PCLLostReportController" showHeader="false" sidebar="false"
- id="allPage" action="{!init}" title="璇环澶卞崟/鍙栨秷鎶ュ憡" lightningStylesheets="true">
+ id="allPage" action="{!init}" title="璇环澶卞崟/鍙栨秷鎶ュ憡">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}" />
+
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}" />
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}" />
<apex:form id="allForm">
<script>
+ // 20230418 ljh DB202304320022 start
+ window.onload = function init(){
+ clearBrandMannualName();
+ }
+ // 20230418 ljh DB202304320022 end
function saveJs() {
blockme();
save();
@@ -31,6 +37,12 @@
search(topNum, secondNum);
}
// add tcm 20211118 end
+ // 20230418 ljh DB202304320022 start
+ function edit2JS() {
+ blockme();
+ edit2();
+ }
+ // 20230418 ljh DB202304320022 end
function setLostTotalAmount() {
//console.log('setLostTotalAmount start:');
var totalAmount = document.getElementById("allPage:allForm:allBlock:EditPage:LostReport:lstReport:LostTotalAmountOut:LostTotalAmount");
@@ -67,6 +79,82 @@
}
//console.log('setLostTotalAmount end');
}
+
+ //20230506 lt DB202304618804 鍖呭惈瓒呭０ start
+ function setInclusionUltrasound() {
+ debugger
+ //鍖呭惈瓒呭０
+ // var Inc = document.getElementById("allPage:allForm:allBlock:ReadPage:LostReport:lstReport1:InclusionUltrasoundOut1:InclusionUltrasound");
+ // //鈥嬪け鍗曚骇鍝佺被鍒�
+ // var Inc = document.getElementById("allPage:allForm:allBlock:ReadPage:LostReport:lstReport1:InclusionUltrasoundOut1:InclusionUltrasound");
+ // //澶卞崟浜у搧鍖哄垎
+ // var Inc = document.getElementById("allPage:allForm:allBlock:ReadPage:LostReport:lstReport1:InclusionUltrasoundOut1:InclusionUltrasound");
+
+ var Inc = document.getElementById("allPage:allForm:allBlock:EditPage:LostReport:lstReport1:InclusionUltrasoundOut:InclusionUltrasound");
+ var IncHidden = document.getElementById("allPage:allForm:allBlock:InclusionUltrasound");
+
+ if(Inc == null || Inc == undefined){
+ Inc = '0';
+ }
+
+ // if (!!Inc && !!IncHidden) {
+ var tempInc = '0';
+
+ //澶卞崟鍝佺墝
+ var i = 0;
+ var brandCount = parseInt("{!brandCount}");
+ //澶卞崟鍨嬪彿
+ var j = 0;
+
+ for (var i = 0; i < brandCount; i++){
+ for (var j = 0; j < 10; j++) {
+ //鈥嬪け鍗曚骇鍝佺被鍒�
+ //allPage:allForm:allBlock:ReadPage:LostBrands:0:LostBrand:productTable:0:LostPRoductClass
+ // var LostProClassObject =
+ // document.getElementById("allPage:allForm:allBlock:EditPage:LostBrands:" +
+ // i + ":LostBrand:productTable:"+ j +":LostPRoductClass1");
+ var LostProClassObject = j$(escapeVfId('allPage:allForm:allBlock:EditPage:LostBrands:' +
+ i + ':LostBrand:productTable:'+ j +':LostPRoductClass1')).value();
+
+ var LostProClassObject1 = j$(escapeVfId('allPage:allForm:allBlock:EditPage:LostBrands:' +
+ i + ':LostBrand:productTable:'+ j +':LostPRoductClass')).value();
+ //澶卞崟浜у搧鍖哄垎
+ //allPage:allForm:allBlock:ReadPage:LostBrands:0:LostBrand:productTable:0:LostProductCategory
+ // var LostProCategoryObject =
+ // document.getElementById("allPage:allForm:allBlock:EditPage:LostBrands:" +
+ // i + ":LostBrand:productTable:"+ j +":LostProductCategory1");
+ var LostProCategoryObject = j$(escapeVfId('allPage:allForm:allBlock:EditPage:LostBrands:' +
+ i + ':LostBrand:productTable:'+ j +':LostProductCategory1')).value();
+
+ var LostProCategoryObject1 = j$(escapeVfId('allPage:allForm:allBlock:EditPage:LostBrands:' +
+ i + ':LostBrand:productTable:'+ j +':LostProductCategory')).value();
+
+ if(tempInc != '1'){
+ if((LostProClassObject == '涓绘満' && LostProCategoryObject == '瓒呭０涓绘満') || (LostProClassObject1 == '涓绘満' && LostProCategoryObject1 == '瓒呭０涓绘満')){
+ tempInc = '1';
+ }
+ }
+
+ // if (!!LostProClassObject && !!LostProCategoryObject) {
+
+ // var LostProClassText = LostProClassObject.innerText;
+ // var LostProClassValue = LostProClassObject.value;
+
+ // var LostProCategoryText = LostProCategoryObject.innerText;
+ // var LostProCategoryValue = LostProCategoryObject.value;
+
+ // }
+ }
+ }
+
+ Inc.innerText = tempInc;
+ IncHidden.value = tempInc;
+
+ // }
+
+ }
+ //20230506 lt DB202304618804 鍖呭惈瓒呭０ end
+
function setBrandName(brandNumber) {
blockme();
setbrand(brandNumber);
@@ -76,14 +164,32 @@
setbrandmannual(brandNumber);
}
// 澶卞崟鍝佺墝涓嶇瓑浜庡叾浠栨椂,澶卞崟鍝佺墝锛堟墜鍔級娓呯┖骞朵笖涓嶅厑璁稿～鍐�,澶卞崟鍝佺墝绛変簬鍏朵粬鏃�,澶卞崟瀵规墜鍨嬪彿涓嶅彲鐢� thh 2022-01-13 start
- function clearBrandMannualName(){
- if(document.getElementById('allPage:allForm:allBlock:EditPage:LostBrands:0:LostBrand:BrandContent:Lost_By_CompanyOut:Lost_By_Company').value == '鍏朵粬'){
- j$(escapeVfId('allPage:allForm:allBlock:EditPage:LostBrands:0:LostBrand:productTable:0:LostProduct')).attr("disabled", true);
- } else{
- document.getElementById('allPage:allForm:allBlock:EditPage:LostBrands:0:LostBrand:BrandContent:Lost_By_Company_MannualOut:Lost_By_Company_Mannual').value = '';
- j$(escapeVfId('allPage:allForm:allBlock:EditPage:LostBrands:0:LostBrand:BrandContent:Lost_By_Company_MannualOut:Lost_By_Company_Mannual')).attr("disabled", true);
+ // function clearBrandMannualName(){
+ // if(document.getElementById('allPage:allForm:allBlock:EditPage:LostBrands:0:LostBrand:BrandContent:Lost_By_CompanyOut:Lost_By_Company').value == '鍏朵粬'){
+ // j$(escapeVfId('allPage:allForm:allBlock:EditPage:LostBrands:0:LostBrand:productTable:0:LostProduct')).attr("disabled", true);
+ // } else{
+ // document.getElementById('allPage:allForm:allBlock:EditPage:LostBrands:0:LostBrand:BrandContent:Lost_By_Company_MannualOut:Lost_By_Company_Mannual').value = '';
+ // j$(escapeVfId('allPage:allForm:allBlock:EditPage:LostBrands:0:LostBrand:BrandContent:Lost_By_Company_MannualOut:Lost_By_Company_Mannual')).attr("disabled", true);
+ // }
+ // }
+ // 20230418 ljh DB202304320022 start
+ function clearBrandMannualName(){
+ var pageStatus = "{!pageStatus}";
+ if(pageStatus == 'Create'|| pageStatus == 'Edit'){
+ var brandCount = parseInt("{!brandCount}");
+ for(var i = 0;i<brandCount;i++){
+ if(document.getElementById('allPage:allForm:allBlock:EditPage:LostBrands:'+i+':LostBrand:BrandContent:Lost_By_CompanyOut:Lost_By_Company').value == '鍏朵粬'){
+ if(document.getElementById('allPage:allForm:allBlock:EditPage:LostBrands:'+i+':LostBrand:BrandContent:Lost_By_Company_MannualOut:Lost_By_Company_Mannual').value == '' || document.getElementById('allPage:allForm:allBlock:EditPage:LostBrands:'+i+':LostBrand:BrandContent:Lost_By_Company_MannualOut:Lost_By_Company_Mannual').value == null){
+ j$(escapeVfId('allPage:allForm:allBlock:EditPage:LostBrands:'+i+':LostBrand:productTable:0:LostProduct')).attr("disabled", true);
+ }
+ } else{
+ document.getElementById('allPage:allForm:allBlock:EditPage:LostBrands:'+i+':LostBrand:BrandContent:Lost_By_Company_MannualOut:Lost_By_Company_Mannual').value = '';
+ j$(escapeVfId('allPage:allForm:allBlock:EditPage:LostBrands:'+i+':LostBrand:BrandContent:Lost_By_Company_MannualOut:Lost_By_Company_Mannual')).attr("disabled", true);
+ }
+ }
}
}
+ // 20230418 ljh DB202304320022 end
// 澶卞崟鍝佺墝涓嶇瓑浜庡叾浠栨椂,澶卞崟鍝佺墝锛堟墜鍔級娓呯┖骞朵笖涓嶅厑璁稿～鍐�,澶卞崟鍝佺墝绛変簬鍏朵粬鏃�,澶卞崟瀵规墜鍨嬪彿涓嶅彲鐢� thh 2022-01-13 end
</script>
<apex:actionFunction name="save" action="{!save}" oncomplete="unblockUI();clearBrandMannualName();" rerender="allForm,EditButton2"></apex:actionFunction>
@@ -93,22 +199,35 @@
</apex:actionFunction>
<!-- 澶卞崟鍝佺墝涓嶇瓑浜庡叾浠栨椂,澶卞崟鍝佺墝锛堟墜鍔級娓呯┖骞朵笖涓嶅厑璁稿～鍐�,澶卞崟鍝佺墝绛変簬鍏朵粬鏃�,澶卞崟瀵规墜鍨嬪彿涓嶅彲鐢� thh 2022-01-13 end -->
- <apex:actionFunction name="setbrandmannual" action="{!setbrandmannual}" oncomplete="unblockUI();" rerender="allForm">
+ <!-- 20230418 ljh DB202304320022 start -->
+ <!-- <apex:actionFunction name="setbrandmannual" action="{!setbrandmannual}" oncomplete="unblockUI();" rerender="allForm"> -->
+ <apex:actionFunction name="setbrandmannual" action="{!setbrandmannual}" oncomplete="clearBrandMannualName(),unblockUI();" rerender="allForm">
+ <!-- 20230418 ljh DB202304320022 end -->
<apex:param assignTo="{!setBrandNo}" name="setBrandNo" value="" />
</apex:actionFunction>
<apex:actionFunction name="submit" action="{!submit}" oncomplete="unblockUI();" rerender="allForm,EditButton2"></apex:actionFunction>
-
-
- <apex:actionFunction name="addBrand" action="{!addBrand}" oncomplete="unblockUI();" rerender="allForm,EditButton2"></apex:actionFunction>
- <apex:actionFunction action="{!addProduct}" name="addProduct" reRender="allForm" oncomplete="unblockUI();">
+ <!-- 20230418 ljh DB202304320022 start -->
+ <apex:actionFunction name="edit2" action="{!edit2}" oncomplete="clearBrandMannualName(),unblockUI();" rerender="allForm,EditButton2"></apex:actionFunction>
+ <!-- <apex:actionFunction name="addBrand" action="{!addBrand}" oncomplete="unblockUI();" rerender="allForm,EditButton2"></apex:actionFunction> -->
+ <apex:actionFunction name="addBrand" action="{!addBrand}" oncomplete="clearBrandMannualName(),unblockUI();" rerender="allForm,EditButton2"></apex:actionFunction>
+
+ <!-- <apex:actionFunction action="{!addProduct}" name="addProduct" reRender="allForm" oncomplete="unblockUI();"> -->
+ <apex:actionFunction action="{!addProduct}" name="addProduct" reRender="allForm" oncomplete="clearBrandMannualName(),unblockUI();">
+ <!-- 20230418 ljh DB202304320022 end -->
<apex:param assignTo="{!brandNo}" name="brandNo" value="" />
</apex:actionFunction>
- <apex:actionFunction action="{!Remove}" name="Remove" reRender="allForm" oncomplete="unblockUI();">
+ <!-- 20230418 ljh DB202304320022 start -->
+ <!-- <apex:actionFunction action="{!Remove}" name="Remove" reRender="allForm" oncomplete="unblockUI();"> -->
+ <apex:actionFunction action="{!Remove}" name="Remove" reRender="allForm" oncomplete="clearBrandMannualName(),unblockUI();">
+ <!-- 20230418 ljh DB202304320022 end -->
<apex:param assignTo="{!RemoveBrandNo}" name="RemoveBrandNo" value="" />
</apex:actionFunction>
<!-- add tcm 20211118 start -->
- <apex:actionFunction action="{!search}" name="search" reRender="allForm" oncomplete="unblockUI();">
+ <!-- 20230418 ljh DB202304320022 start -->
+ <!-- <apex:actionFunction action="{!search}" name="search" reRender="allForm" oncomplete="unblockUI();"> -->
+ <apex:actionFunction action="{!search}" name="search" reRender="allForm" oncomplete="clearBrandMannualName(),unblockUI();">
+ <!-- 20230418 ljh DB202304320022 end -->
<apex:param assignTo="{!topNum}" name="topNum" value="" />
<apex:param assignTo="{!secondNum}" name="secondNum" value="" />
</apex:actionFunction>
@@ -118,9 +237,12 @@
<apex:pageMessages />
</apex:outputPanel>
<apex:inputHidden id="LostTotalAmount" value="{!LostReport.lostReport.LostTotalAmount__c}" />
+
+ <apex:inputHidden id="InclusionUltrasound" value="{!InclusionUltrasound}" /> <!-- 20230506 lt DB202304618804 鍖呭惈瓒呭０ add -->
+
<apex:outputPanel rendered="{!IF(pageStatus == 'Create'|| pageStatus == 'Edit' , 'true', 'false')}">
<apex:pageBlock title="澶卞崟鎶ュ憡缂栬緫椤甸潰" id="EditPage">
- <apex:pageBlockSection columns="2" id="LostReport">
+ <apex:pageBlockSection columns="3" id="LostReport">
<apex:pageBlockSectionItem id="lstReport" labelStyle="text-align:left;">
<apex:pageBlockSectionItem labelStyle="text-align:left;">
<apex:outputLabel value="澶卞崟绫诲瀷: ">
@@ -132,12 +254,24 @@
<apex:outputLabel value="澶卞崟鎬婚噾棰濓紙鍏冿級: "></apex:outputLabel>
<apex:outputField id="LostTotalAmount" value="{!LostReport.lostReport.LostTotalAmount__c}" />
</apex:pageBlockSectionItem>
-
</apex:pageBlockSectionItem>
+
+ <!-- 20230506 lt DB202304618804 鍖呭惈瓒呭０ start -->
+ <apex:pageBlockSectionItem id="lstReport1" labelStyle="text-align:left;">
+
+ <apex:pageBlockSectionItem id="InclusionUltrasoundOut" labelStyle="text-align:left;">
+ <apex:outputLabel value="鍖呭惈瓒呭０: "></apex:outputLabel>
+ <apex:outputLabel id="InclusionUltrasound" value="{!InclusionUltrasound}" />
+ </apex:pageBlockSectionItem>
+
<apex:pageBlockSectionItem id="Report_Statusout" labelStyle="text-align:left;">
<apex:outputLabel value="鐘舵��: "></apex:outputLabel>
<apex:outputField id="Report_Status" value="{!LostReport.lostReport.Report_Status__c}" />
</apex:pageBlockSectionItem>
+
+ </apex:pageBlockSectionItem>
+ <!-- 20230506 lt DB202304618804 鍖呭惈瓒呭０ end -->
+
</apex:pageBlockSection>
<apex:variable value="{!0}" var="BCnt" />
<apex:repeat value="{!LostReport.LostBrands}" var="brand" id="LostBrands">
@@ -147,7 +281,7 @@
<apex:outputText id="LostBrandName" value="澶卞崟鍝佺墝{!brand.lineNo + 1}" />
<apex:commandButton rendered="{!IF(brandCount > 1 , 'true', 'false')}" onclick="RemoveJs({!brand.lineNo});return false;"
value="鍒犻櫎" style="width: 100px;margin-left: 50px;float: right;" />
- <apex:commandButton onclick="saveJs();return false;" value="淇濆瓨" style="width: 100px;margin-left: 50px;float: right;" />
+ <apex:commandButton onclick="setInclusionUltrasound();saveJs();return false;" value="淇濆瓨" style="width: 100px;margin-left: 50px;float: right;" />
</apex:outputPanel>
</apex:facet>
<apex:pageBlockSection id="BrandContent" columns="3">
@@ -156,7 +290,8 @@
<apex:outputLabel value="澶卞崟鍝佺墝:">
<span style="color:red;font-size: 18px;">* </span>
</apex:outputLabel>
- <apex:inputField id="Lost_By_Company" onchange="setLostTotalAmount();setBrandName({!brand.lineNo});" value="{!brand.lostBrand.Lost_By_Company__c}"/>
+ <!-- 20230506 lt DB202304618804 鍖呭惈瓒呭０ add setInclusionUltrasound(); -->
+ <apex:inputField id="Lost_By_Company" onchange="setLostTotalAmount();setInclusionUltrasound();setBrandName({!brand.lineNo});" value="{!brand.lostBrand.Lost_By_Company__c}"/>
</apex:pageBlockSectionItem>
<apex:pageBlockSectionItem dataStyle="width:10%;border-top:2px solid;border-left:2px solid;border-bottom:2px solid;" labelStyle="width:23%;white-space:none;text-align:left;border-top:2px solid; solid ;border-bottom:2px solid;">
@@ -235,7 +370,8 @@
</apex:column>
<apex:column headerValue="澶卞崟鏁伴噺">
<span style="color:red;font-size: 18px;">* </span>
- <apex:inputField id="Quantity" style="min-width: 150px;" value="{!product.LostProductss.Quantity__c}" />
+ <!-- 20230506 lt DB202304618804 鍖呭惈瓒呭０ add onclick="setInclusionUltrasound();" -->
+ <apex:inputField id="Quantity" style="min-width: 150px;" value="{!product.LostProductss.Quantity__c}" onclick="setInclusionUltrasound();" />
</apex:column>
<!-- SWAG-C6P9PX lt 20210913 add start -->
<apex:column headerValue="澶卞崟瀵规墜鍨嬪彿(鎵嬪姩)">
@@ -248,7 +384,7 @@
<apex:outputPanel rendered="{!IF(product.bool=true,true,false)}">
<apex:outputField id="LostPRoductClass1" value="{!product.LostProductss.ProductClass__c}" />
</apex:outputPanel>
- <apex:outputPanel rendered="{!!IF(product.bool==true,true,false)}">
+ <apex:outputPanel rendered="{!!IF(product.bool==true,true,false)}" >
<apex:inputField id="LostPRoductClass" value="{!product.LostProductss.ProductClass__c}" />
</apex:outputPanel>
</apex:column>
@@ -258,7 +394,8 @@
<apex:outputField id="LostProductCategory1" value="{!product.LostProductss.ProductCategory__c}" />
</apex:outputPanel>
<apex:outputPanel rendered="{!!IF(product.bool==true,true,false)}">
- <apex:inputField id="LostProductCategory" value="{!product.LostProductss.ProductCategory__c}" />
+ <!-- 20230506 lt DB202304618804 鍖呭惈瓒呭０ add onchange="setInclusionUltrasound();" -->
+ <apex:inputField id="LostProductCategory" value="{!product.LostProductss.ProductCategory__c}" onchange="setInclusionUltrasound();"/>
</apex:outputPanel>
</apex:column>
<!-- tcm 20211117 add end -->
@@ -272,14 +409,14 @@
</apex:repeat>
<apex:pageBlockButtons >
<apex:commandButton onclick="addBrandJs();return false;" value="杩藉姞鍝佺墝" style="width: 150px;margin-left: 50px;" />
- <apex:commandButton onclick="saveJs();return false;" value="淇濆瓨" style="width: 150px;margin-left: 50px;" />
+ <apex:commandButton onclick="setInclusionUltrasound();saveJs();return false;" value="淇濆瓨" style="width: 150px;margin-left: 50px;" />
<apex:commandButton id="CancelButton" action="{!cancel}" value="杩斿洖璇环" style="width: 150px;margin-left: 50px;" />
</apex:pageBlockButtons>
</apex:pageBlock>
</apex:outputPanel>
<apex:outputPanel rendered="{!IF(pageStatus == 'View', 'true', 'false')}">
<apex:pageBlock title="澶卞崟鎶ュ憡鏌ョ湅椤甸潰" id="ReadPage">
- <apex:pageBlockSection columns="2" id="LostReport">
+ <apex:pageBlockSection columns="3" id="LostReport">
<apex:pageBlockSectionItem labelStyle="text-align:left;">
<apex:pageBlockSectionItem labelStyle="text-align:left;">
<apex:outputLabel value="澶卞崟绫诲瀷: "></apex:outputLabel>
@@ -291,10 +428,25 @@
</apex:pageBlockSectionItem>
</apex:pageBlockSectionItem>
- <apex:pageBlockSectionItem id="Report_Statusout" labelStyle="text-align:left;">
- <apex:outputLabel value="鐘舵��: "></apex:outputLabel>
- <apex:outputField id="Report_Status" value="{!LostReport.lostReport.Report_Status__c}" />
+
+ <!-- 20230506 lt DB202304618804 鍖呭惈瓒呭０ start -->
+ <apex:pageBlockSectionItem id="lstReport1" labelStyle="text-align:left;">
+
+ <apex:pageBlockSectionItem id="InclusionUltrasoundOut1" labelStyle="text-align:left;">
+ <apex:outputLabel value="鍖呭惈瓒呭０: "></apex:outputLabel>
+ <apex:outputLabel id="InclusionUltrasound" value="{!InclusionUltrasound}" />
+ </apex:pageBlockSectionItem>
+
+ <apex:pageBlockSectionItem id="Report_Statusout" labelStyle="text-align:left;">
+ <apex:outputLabel value="鐘舵��: "></apex:outputLabel>
+ <apex:outputField id="Report_Status" value="{!LostReport.lostReport.Report_Status__c}" />
+ </apex:pageBlockSectionItem>
+
</apex:pageBlockSectionItem>
+
+ <!-- 20230506 lt DB202304618804 鍖呭惈瓒呭０ end -->
+
+
</apex:pageBlockSection>
<apex:variable value="{!0}" var="BCnt" />
<apex:repeat value="{!LostReport.LostBrands}" var="brand" id="LostBrands">
@@ -401,11 +553,23 @@
<apex:pageBlockButtons >
- <apex:commandButton rendered="{!IF(LostReport.lostReport.Report_Status__c = '鑽夋', 'true', 'false')}" id="SubmitButton" onclick="submitJS();return false;"
+ <!-- 20230814 lt DB202308068183 澶卞崟鎶ュ憡瀹℃壒鑺傜偣澧炲姞鍔╃悊瀹℃壒鑺傜偣 add
+ || LostReport.lostReport.Report_Status__c = '鎵瑰噯'
+ -->
+ <apex:commandButton rendered="{!IF(LostReport.lostReport.Report_Status__c = '鑽夋' || LostReport.lostReport.Report_Status__c = '鎵瑰噯', 'true', 'false')}" id="SubmitButton" onclick="submitJS();return false;"
value="鎻愪氦" style="width: 150px;margin-left: 50px;" />
- <apex:commandButton rendered="{!IF(LostReport.lostReport.Report_Status__c = '鑽夋' || $Profile.Id = '00e10000000Y3o5AAC', 'true', 'false')}"
+ <!-- 20230418 ljh DB202304320022 start -->
+ <!-- <apex:commandButton rendered="{!IF(LostReport.lostReport.Report_Status__c = '鑽夋' || $Profile.Id = '00e10000000Y3o5AAC', 'true', 'false')}"
id="EditButton" reRender="allForm" action="{!edit2}" value="缂栬緫" style="width: 150px;margin-left: 50px;"
+ /> -->
+ <!-- 20230814 lt DB202308068183 澶卞崟鎶ュ憡瀹℃壒鑺傜偣澧炲姞鍔╃悊瀹℃壒鑺傜偣 add $Label
+ DB202307674351 缂栬緫鏉冮檺锛氱郴缁熺鐞嗗憳 2S1 2S6-2 2S4 2S6-1
+ || (LostReport.lostReport.Report_Status__c = '鎵瑰噯' && contains($Label.PCLReportProfileId,$Profile.Id))
+ -->
+ <apex:commandButton rendered="{!IF(LostReport.lostReport.Report_Status__c = '鑽夋' || $Profile.Id = '00e10000000Y3o5AAC' || (LostReport.lostReport.Report_Status__c = '鎵瑰噯' && contains($Label.PCLReportProfileId,$Profile.Id)), 'true', 'false')}"
+ id="EditButton" reRender="allForm" onclick="edit2JS();return false;" value="缂栬緫" style="width: 150px;margin-left: 50px;"
/>
+ <!-- 20230418 ljh DB202304320022 end -->
<apex:commandButton id="CancelButton" action="{!cancel}" value="杩斿洖璇环" style="width: 150px;margin-left: 50px;" />
</apex:pageBlockButtons>
diff --git a/force-app/main/default/staticresources/lwcCSS.css b/force-app/main/default/staticresources/lwcCSS.css
new file mode 100644
index 0000000..7dbefca
--- /dev/null
+++ b/force-app/main/default/staticresources/lwcCSS.css
@@ -0,0 +1,12 @@
+.slds-theme--error {
+ --slds-g-color-error-base-40: #ba0517 !important;
+}
+.slds-theme--success {
+ --slds-g-color-success-base-50: #2E844A !important;
+}
+.slds-theme--warning {
+ --slds-g-color-warning-base-60: #DD7A01 !important;
+}
+.slds-theme--info {
+ --slds-g-color-neutral-base-50: #747474 !important;
+}
\ No newline at end of file
diff --git a/force-app/main/default/staticresources/lwcCSS.resource-meta.xml b/force-app/main/default/staticresources/lwcCSS.resource-meta.xml
new file mode 100644
index 0000000..2d345da
--- /dev/null
+++ b/force-app/main/default/staticresources/lwcCSS.resource-meta.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<StaticResource xmlns="http://soap.sforce.com/2006/04/metadata">
+ <cacheControl>Public</cacheControl>
+ <contentType>text/css</contentType>
+ <description>鎻愮ず妗嗛鑹查棯鍔ㄨВ鍐虫柟妗�</description>
+</StaticResource>
--
Gitblit v1.9.1