From 7c7cb195462c2ded7bfe4105959ea36d1dd68ded Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期三, 11 十月 2023 19:26:36 +0800
Subject: [PATCH] 近期修改
---
force-app/main/default/lwc/lexCancelReport/lexCancelReport.js | 23
force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.js | 38
force-app/main/default/pages/searchAimsAccount.page | 32
force-app/main/default/lwc/lexAppCancelSubmit/lexAppCancelSubmit.js | 23
force-app/main/default/classes/OpportunityLightingButtonController.cls | 16
force-app/main/default/lwc/lexVOCAnswer/lexVOCAnswer.js | 25
force-app/main/default/lwc/lexEditLost/lexEditLost.js | 27
force-app/main/default/lwc/lexApplicationCancelSubmit/lexApplicationCancelSubmit.js | 23
force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js | 25
force-app/main/default/lwc/lexVOCSubmit/lexVOCSubmit.js | 26
force-app/main/default/lwc/lexNewSolutionProgramma/lexNewSolutionProgramma.js | 25
force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.js | 25
force-app/main/default/lwc/lexOLYwinBid/lexOLYwinBid.js | 26
force-app/main/default/lwc/lexUpdateToOpp/lexUpdateToOpp.js | 25
force-app/main/default/classes/OpportunityService.cls | 98 ++
force-app/main/default/classes/lexPCLLostReportLwcControllerTest.cls | 143 +++
force-app/main/default/lwc/lexQuotationRequest/lexQuotationRequest.js | 27
force-app/main/default/lwc/lexVOCFinish/lexVOCFinish.js | 25
force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js | 25
force-app/main/default/lwc/lexStartTrading/lexStartTrading.css | 11
force-app/main/default/lwc/lexStartTrading/lexStartTrading.js | 112 ++
force-app/main/default/lwc/lexBeforeOPDPDFBtnSIS/lexBeforeOPDPDFBtnSIS.js | 26
force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.css | 4
force-app/main/default/lwc/lexAllReceivedBtns/lexAllReceivedBtns.js | 23
force-app/main/default/lwc/lexNewSolutionClosingAttachment/lexNewSolutionClosingAttachment.js | 25
force-app/main/default/lwc/lexOPDReportConsum/lexOPDReportConsum.js | 26
force-app/main/default/lwc/lexQuoteEntryDecidebottonLwc/lexQuoteEntryDecidebottonLwc.js | 79 ++
force-app/main/default/lwc/lexSubmitSolutionSchemeForApproval/lexSubmitSolutionSchemeForApproval.js | 24
force-app/main/default/lwc/lexVOCConfirm/lexVOCConfirm.js | 25
force-app/main/default/lwc/lexOpporSplite/lexOpporSplite.js | 26
force-app/main/default/classes/lexPCLLostReportLwcControllerTest.cls-meta.xml | 5
force-app/main/default/lwc/lexNewOpportunityAgency/lexNewOpportunityAgency.js | 23
force-app/main/default/lwc/lexCopyWithAsset/lexCopyWithAsset.js | 25
force-app/main/default/lwc/tEnquiry/tEnquiry.js | 60 -
force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.js | 3
force-app/main/default/lwc/lexSubmitCompetitorReport/lexSubmitCompetitorReport.js | 25
force-app/main/default/lwc/tEnquiry/tEnquiry.html | 85 -
force-app/main/default/lwc/improvedForecastTime/improvedForecastTime.js | 13
force-app/main/default/classes/PCLLostReportControllerTest.cls | 78 +-
force-app/main/default/lwc/lexCancelSubmitReport/lexCancelSubmitReport.js | 14
force-app/main/default/lwc/lexCancel/lexCancel.js | 4
force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.js | 25
force-app/main/default/lwc/lexStartTrading/lexStartTrading.js-meta.xml | 11
force-app/main/default/lwc/lexQuoteEntryDecidebottonLwc/lexQuoteEntryDecidebottonLwc.html | 5
force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.js | 159 +++
force-app/main/default/classes/ConsumTrialPDFController.cls | 30
force-app/main/default/lwc/lexPredictedDateChange/lexPredictedDateChange.js | 28
force-app/main/default/lwc/lexImprovedForecastTimeNew/lexImprovedForecastTimeNew.html | 4
force-app/main/default/lwc/lexLoseReport/lexLoseReport.js | 30
force-app/main/default/lwc/lexSubmitSolutionForApproval/lexSubmitSolutionForApproval.js | 27
force-app/main/default/classes/AssetMaintainControllerTest.cls | 2
force-app/main/default/lwc/lexSIStoOPD/lexSIStoOPD.js | 26
force-app/main/default/lwc/lexNewAgencyHospital/lexNewAgencyHospital.js | 25
force-app/main/default/lwc/lexDispatchOCSMQARA/lexDispatchOCSMQARA.js | 26
force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js | 25
force-app/main/default/lwc/lexQuotationProductNew/lexQuotationProductNew.js | 26
force-app/main/default/lwc/lexAgencyAuthorize/lexAgencyAuthorize.js | 26
force-app/main/default/lwc/lexOPDReport/lexOPDReport.js | 25
force-app/main/default/lwc/lexRequestDB/lexRequestDB.js | 25
force-app/main/default/lwc/lexCreateEvent/lexCreateEvent.js | 24
force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.html | 6
force-app/main/default/lwc/lexStartTrading/lexStartTrading.html | 6
force-app/main/default/lwc/lexNewOpportunityFile/lexNewOpportunityFile.js | 25
force-app/main/default/lwc/lexQuoteEntryDecidebottonLwc/lexQuoteEntryDecidebottonLwc.js-meta.xml | 12
force-app/main/default/lwc/lexLoseReport/lexLoseReport.js-meta.xml | 2
force-app/main/default/lwc/lexChangeContractType/lexChangeContractType.js | 25
force-app/main/default/lwc/lexStockApply/lexStockApply.js | 38
force-app/main/default/lwc/lexBeforeOPDPDFBtn/lexBeforeOPDPDFBtn.js | 25
force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js | 23
force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox .css | 3
force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html | 66 +
force-app/main/default/lwc/lexLoseBid/lexLoseBid.js | 26
force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js | 26
force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.html | 8
force-app/main/default/classes/lexPCLLostReportLwcController.cls | 36
75 files changed, 1,610 insertions(+), 659 deletions(-)
diff --git a/force-app/main/default/classes/AssetMaintainControllerTest.cls b/force-app/main/default/classes/AssetMaintainControllerTest.cls
index 87bdfe4..bc40865 100644
--- a/force-app/main/default/classes/AssetMaintainControllerTest.cls
+++ b/force-app/main/default/classes/AssetMaintainControllerTest.cls
@@ -3,6 +3,8 @@
private static void createAssetData() {
// OLY_OCM-643 杩藉姞EscapeNFM001Trigger
ControllerUtil.EscapeNFM001Trigger = true;
+ TestDataUtility.CreatePIPolicyConfiguration();
+ StaticParameter.EscapeVMCTrigger = true;
// 鐪�
Address_Level__c al = new Address_Level__c();
al.Name = '鏉变含';
diff --git a/force-app/main/default/classes/ConsumTrialPDFController.cls b/force-app/main/default/classes/ConsumTrialPDFController.cls
index ef43365..ffdac9d 100644
--- a/force-app/main/default/classes/ConsumTrialPDFController.cls
+++ b/force-app/main/default/classes/ConsumTrialPDFController.cls
@@ -21,9 +21,9 @@
public Integer consumApplySetDetailListSize { get; set; } // 鑰楁潗澶囧搧鎬绘暟閲�
public String errorMsg { get; set; } // 閿欒淇℃伅
- public string staticResource { get; private set; }
- public string staticResourceCon { get; private set; }
- public string staticResourceFile { get; private set; }
+ //public string staticResource { get; private set; }
+ //public string staticResourceCon { get; private set; }
+ //public string staticResourceFile { get; private set; }
public string BRSrc{get;private set;}
public string QRSrc{get;private set;}
@@ -33,9 +33,9 @@
throw new ControllerUtil.myException('鍙傛暟閿欒锛氳鎸囧畾Id銆�');
}
pdfPageList = new List<PdfPageClass>();
- staticResource = JSON.serialize(PIHelper.getPIIntegrationInfo('Consum_Apply_Equipment_Set_Detail__c'));
- staticResourceCon = JSON.serialize(PIHelper.getPIIntegrationInfo('Consum_Apply__c'));
- staticResourceFile = JSON.serialize(PIHelper.getPIIntegrationInfo('Document'));
+ //staticResource = JSON.serialize(PIHelper.getPIIntegrationInfo('Consum_Apply_Equipment_Set_Detail__c'));
+ //staticResourceCon = JSON.serialize(PIHelper.getPIIntegrationInfo('Consum_Apply__c'));
+ //staticResourceFile = JSON.serialize(PIHelper.getPIIntegrationInfo('Document'));
}
/**
@@ -91,7 +91,7 @@
, Post_Code__c // 閭紪
, Loaner_received_staff__c // 鎺ユ敹浜哄鍚�
, Loaner_received_staff_phone__c // 鎺ユ敹浜虹數璇�
- ,AWS_Data_Id__c
+ //,AWS_Data_Id__c //deloitte-zhj 20231010 PIPL杩樺師
FROM Consum_Apply__c
WHERE Id = :targetConsumApplyId
];
@@ -153,7 +153,7 @@
, Follower_User__r.Name
, Spare__c // 澶囩敤
, Comment__c // 澶囨敞
- , AWS_Data_Id__c
+ //, AWS_Data_Id__c //deloitte-zhj 20231010 PIPL杩樺師
, ManagementCode__c // 绠＄悊缂栫爜 yc 鑰楁潗杩芥函
, EquipmentManagementCode__c // 澶囧搧绠＄悊鐮� yc 鑰楁潗杩芥函
FROM Consum_Apply_Equipment_Set_Detail__c
@@ -223,12 +223,16 @@
}
}
+
+
public static string GetImageBase64(string id){
- List<ContentVersion> version = [select VersionData from ContentVersion where Id =: id];
- // List<Attachment> atts = [SELECT Id, IsDeleted, ParentId, Name, IsPrivate, ContentType, BodyLength, Body, OwnerId, CreatedDate, CreatedById, LastModifiedDate, LastModifiedById, SystemModstamp, Description FROM Attachment where id=:id];
- if (version.size()==0) {
- return null;
+ List<ContentVersion> version =new List<ContentVersion>();
+ version = [select VersionData from ContentVersion where Id =: id];
+ if(version.size() > 0){
+ return 'data:image/png;base64,' + EncodingUtil.base64Encode(version[0].VersionData);
+ }else{
+ return '';
}
- return 'data:image/png;base64,' + EncodingUtil.base64Encode(version[0].VersionData);
+
}
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/OpportunityLightingButtonController.cls b/force-app/main/default/classes/OpportunityLightingButtonController.cls
index a68cb79..03f0d91 100644
--- a/force-app/main/default/classes/OpportunityLightingButtonController.cls
+++ b/force-app/main/default/classes/OpportunityLightingButtonController.cls
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-12 11:16:07
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-10-08 18:09:35
+ * @LastEditTime: 2023-10-10 17:08:13
*/
public with sharing class OpportunityLightingButtonController {
@AuraEnabled
@@ -19,6 +19,12 @@
from Lost_cancel_report__c where RecordTypeId != '01210000000R4hHAAS' and Opportunity__c =: recordId];
rep.lostReport = re;
objs.put('report',rep);
+ Schema.DescribeSObjectResult s = Lost_cancel_report__c.sObjectType.getDescribe();
+ if( !s.isCreateable()) {
+ objs.put('error',true);
+ }else{
+ objs.put('error',false);
+ }
} catch (Exception e) {
objs.put('error',e.getMessage());
return objs;
@@ -294,6 +300,12 @@
res.salesOwnerBuchang = opportunity.Sales_owner_buchang__c;
res.salesOwnerBuchangID = opportunity.Sales_owner_buchangID__c;
res.cntLostCancelDraft = opportunity.Cnt_Lost_cancel_Draft__c;
+ Schema.DescribeSObjectResult s = Lost_cancel_report__c.sObjectType.getDescribe();
+ if( !s.isCreateable()) {
+ res.isHavePower = false;
+ }else{
+ res.isHavePower = true;
+ }
} catch (Exception e) {
}
@@ -1101,5 +1113,7 @@
public String reportStatus;
@AuraEnabled
public String reportId;
+ @AuraEnabled
+ public Boolean isHavePower;
}
}
\ No newline at end of file
diff --git a/force-app/main/default/classes/OpportunityService.cls b/force-app/main/default/classes/OpportunityService.cls
index f8044db..063be70 100644
--- a/force-app/main/default/classes/OpportunityService.cls
+++ b/force-app/main/default/classes/OpportunityService.cls
@@ -1,6 +1,8 @@
public with sharing class OpportunityService{
- private static String opp_search_field = ' Id, Name, Account_Name_F__c, OwnerId, Hospital__c, Opportunity_No__c, Opportunity_stage__c, StageName__c, Bidding_Project_Name_Bid__c, Department_Class__r.RecordTypeId ';
+ public static Decimal selectcancelcount{get;set;}//閫夋嫨鐨勫彇娑堢殑璇环涓暟
+
+ private static String opp_search_field = ' Id, Name, Account_Name_F__c, OwnerId, Hospital__c, Opportunity_No__c, Opportunity_stage__c, StageName__c, stagename, Bidding_Project_Name_Bid__c, Department_Class__r.RecordTypeId ';
// 鏌ヨ宸蹭繚瀛樼殑鏁版嵁
//noStr 璇环鐨処D
@@ -36,10 +38,13 @@
// String paremt2 = '01210000000QekK';
// String paremt3 = '寮曞悎';
// sql += ' and (recordtypeid = :paremt1 or recordtypeid = :paremt2) and stagename = :paremt3 ';
- sql += ' and recordtype.developername in (\'Opportunity\',\'SI_Oppor\') and Hospital__r.Is_Active__c = \'鏈夊姽\' '+
+ sql += ' and recordtype.developername in (\'Opportunity\',\'SI_Oppor\') and Hospital__r.Is_Active__c = \'鏈夊姽\' ';
// 杩欓噷鏈変慨鏀癸紝鍒粰鐩栦簡
+ /**
+ DB202305552102 you 202305230 闄や簡鐩爣鐨勯兘鐪�
' and ( (SAP_Send_OK__c = true and SAP_Send_OK_Date__c = LAST_N_DAYS:183 ) '+
'or( stagename = \'鏁楁垿\' and Final_Contract_Proceeded_Date__c = LAST_N_DAYS:183 ) or stagename = \'寮曞悎\' ) ';
+ **/
// 杩欓噷鏈変慨鏀癸紝鍒粰鐩栦簡
// 20210914 鎴樼暐绉戝淇敼
//if (departments != null && String.isNotBlank(departments)) {
@@ -59,9 +64,15 @@
if(proId.substring(0,15) == p_2M4.substring(0,15)){
sql += ' AND OwnerId =\''+UserInfo.getUserId()+'\'';
}
- System.debug('sql:'+sql);
// 20221014 ljh SWAG-CK28WT add end
- sql += ' limit 50';
+ //DB202305552102 you 202305230 闄や簡鐩爣鐨勯兘鐪�
+ sql += ' and stageName != \'鐩\'';
+ //DB202305552102 you 202305230 闄や簡鐩爣鐨勯兘鐪�
+ //DB202309608863 chenjingwu 2023/10/11 鎷涙爣椤圭洰寰呭叧鑱旇浠蜂腑鎺掗櫎鍙樻洿鐢ㄦ埛璇环
+ sql += ' and If_Account_Change__c = false';
+ //DB202309608863 chenjingwu 2023/10/11 鎷涙爣椤圭洰寰呭叧鑱旇浠蜂腑鎺掗櫎鍙樻洿鐢ㄦ埛璇环
+ sql += ' order by stageName limit 50';
+ System.debug('sql1:'+sql);
List<Opportunity> arrays = Database.query(sql);
return JSON.serialize(arrays);
@@ -73,7 +84,6 @@
@AuraEnabled
public static string GetNormalProductDataNotSave(String IdStr,String[] hospital, String departments) {
- //TODU
// QueryWrapper query = new QueryWrapper(Tender_information__c.SObjectType);
// query.eq('Id',IdStr);
@@ -90,10 +100,12 @@
// String paremt3 = '寮曞悎';
// sql += ' and (recordtypeid = :paremt1 or recordtypeid = :paremt2) and stagename = \'寮曞悎\' ';
// sql += ' and recordtype.developername in (\'Opportunity\',\'SI_Oppor\') and Hospital__r.Is_Active__c = \'鏈夊姽\' '+
- sql += ' where recordtype.developername in (\'Opportunity\',\'SI_Oppor\') and Hospital__r.Is_Active__c = \'鏈夊姽\' '+
+ sql += ' where recordtype.developername in (\'Opportunity\',\'SI_Oppor\') and Hospital__r.Is_Active__c = \'鏈夊姽\' ';
// 杩欓噷鏈変慨鏀癸紝鍒粰鐩栦簡
+ /**DB202305552102 you 202305230 闄や簡鐩爣鐨勯兘鐪�
' and ( (SAP_Send_OK__c = true and SAP_Send_OK_Date__c = LAST_N_DAYS:183 ) '+
'or( stagename = \'鏁楁垿\' and Final_Contract_Proceeded_Date__c = LAST_N_DAYS:183 ) or stagename = \'寮曞悎\' ) ';
+ **/
// 杩欓噷鏈変慨鏀癸紝鍒粰鐩栦簡
// 鍘绘帀宸茬粡鍏宠仈鐨勬嫑鏍�
if(IdStr != null && String.isNotBlank(IdStr)) {
@@ -112,16 +124,23 @@
sql += ' and Hospital__c in :hospital';
}
// 20221014 ljh SWAG-CK28WT add start
+
String proId = UserInfo.getProfileId();
String p_2M4 = System.Label.ProfileId_2M4;
if(proId.substring(0,15) == p_2M4.substring(0,15)){
sql += ' AND OwnerId =\''+UserInfo.getUserId()+'\'';
}
- System.debug('sql:'+sql);
+
// 20221014 ljh SWAG-CK28WT add end
- sql += ' limit 50';
+ //DB202305552102 you 202305230 闄や簡鐩爣鐨勯兘鐪�
+ sql += ' and stageName != \'鐩\'';
+ //DB202305552102 you 202305230 闄や簡鐩爣鐨勯兘鐪�
+ //DB202309608863 chenjingwu 2023/10/11 鎷涙爣椤圭洰寰呭叧鑱旇浠蜂腑鎺掗櫎鍙樻洿鐢ㄦ埛璇环
+ sql += ' and If_Account_Change__c = false';
+ //DB202309608863 chenjingwu 2023/10/11 鎷涙爣椤圭洰寰呭叧鑱旇浠蜂腑鎺掗櫎鍙樻洿鐢ㄦ埛璇环
+ sql += ' order by stageName limit 200';
+ System.debug('sql2:'+sql);
List<Opportunity> arrays = Database.query(sql);
-
// Tender_information__c
return JSON.serialize(arrays);
@@ -167,7 +186,7 @@
// flag 淇敼 鎷涙姇鏍囬」鐩� 鍏宠仈璇环鏃堕棿鐨勪竴涓爣璇�
@AuraEnabled
public static string SaveData(String JsonSelected,String JsonNotSelected,String BiddingId,Boolean flag) {
-
+ selectcancelcount=0;
try{
// 鏂板鎷涙爣-璇环鍏宠仈鍏崇郴琛紝鍘绘帀鏇存柊璇环涓婄殑鏈�鏂版嫑鏍囦俊鎭� 20210813 start
// if(JsonSelected != null && JsonSelected != '' && JsonSelected !='[]')
@@ -234,9 +253,12 @@
sql += 'Hospital2__c, ';
sql += 'Hospital3__c, ';
sql += 'Hospital4__c, ';
+ sql += 'OpportunityNum__c, ';//20230714 you DB202306372336
sql += 'publicDate__c, ';// 20221114 ljh SWAG-CKL5UC
sql += 'Tender_Order__c, '; //20220620 you SWAG-CFD4SU
- sql += 'subInfoType__c '; //20220718 you 鎷涙爣浠诲姟
+ sql += 'subInfoType__c, '; //20220718 you 鎷涙爣浠诲姟
+ sql += 'status__c, ProjectRestartFLG__c,IsTerminate__c,TerminateApprovalStatus__c, ';
+ sql += 'TerminateApprovalTime__c ';//DB202305552102 澧炲姞椤圭洰缁堟鏃堕棿 鍙湁鐢宠椤圭洰缁堟鎵嶅厑璁稿叧鑱斿彇娑堢殑璇环
sql += 'FROM Tender_information__c WHERE Id = :BiddingId order by Tender_Order__c desc,relativeTime_F__c desc'; //20220620 you SWAG-CFD4SU 澧炲姞 order by
List<Tender_information__c> arrays = Database.query(sql);
Tender_information__c tender = arrays[0];
@@ -291,8 +313,37 @@
List<Opportunity> upd_opps = new List<Opportunity>();
List<Opportunity> upd_opps1 = new List<Opportunity>();
List<String> owners = new List<String>();
+ Integer links=0;
// 鎻掑叆link
if (all_selected_list.size() > 0) {
+ //鍙栨秷鐘舵�� 璇环鍒ゆ柇
+ Map<String,String> oppStagename= new Map<String,String>();
+ for (Opportunity opp : all_selected_list) { //褰撳墠閫夋嫨鐨勮浠�
+ if(opp.stagename=='鍓婇櫎'){
+ oppStagename.put(opp.Id,opp.stagename);
+ selectcancelcount +=1;
+ }
+ }
+
+ system.debug(all_selected_list.size()+'==oppStagename=='+oppStagename +'==selectcancelcount=='+selectcancelcount);
+ if(null!= oppStagename && oppStagename.size()>0 && tender.TerminateApprovalTime__c ==null){
+ return '鍙湁鐢宠椤圭洰缁堟鎵嶅厑璁稿叧鑱斿彇娑堢殑璇环';
+ /**
+ List<Tender_Opportunity_Link__c> del_links = [select Id,Opportunity__c,Opportunity__r.Name,Opportunity__r.Opportunity_No__c,Tender_information__r.status__c from Tender_Opportunity_Link__c where Opportunity__c = :oppStagename.keySet() and Tender_information__r.status__c !='09.缁堟'];
+ system.debug('==del_links=='+del_links);
+ Map<String,String> deldate= new Map<String,String>();
+ if(del_links != null && del_links.size() > 0){
+ for(Tender_Opportunity_Link__c ten:del_links){
+ deldate.put(ten.Opportunity__c,ten.Opportunity__r.Name);
+ }
+ }
+ if(null!=deldate&& deldate.size()>0){
+ for (String del : deldate.keySet()) {
+ qxopp+=deldate.get(del)+',';
+ }
+ }
+ **/
+ }
// 璁剧疆鎷涙爣鎵�鏈変汉
// OppOwnerId = all_selected_list[0].ownerId;
// 鍒濆鍖栧弬鏁�
@@ -313,6 +364,7 @@
}
// 鎻掑叆link
if (add_list.size() > 0) {
+ links=add_list.size();
insert add_list;
}
// 鎭㈠trigger鏍囪
@@ -356,7 +408,8 @@
}
opp.Tender_Number__c = returncount;
// 20221114 ljh SWAG-CKL5UC start
- if(opp.LeakageNumber__c != 1 && tender.publicDate__c != null && String.isNotBlank(opp.LeadSource) && opp.LeadSource == '鎷涙爣缃�' && opp.Created_Day__c > tender.publicDate__c){
+ //20230727 lt DB202307367354 銆愭嫑鏍囬」鐩�戞紡鍗曡绠楅�昏緫淇敼 delete && String.isNotBlank(opp.LeadSource) && opp.LeadSource == '鎷涙爣缃�'
+ if(opp.LeakageNumber__c != 1 && tender.publicDate__c != null && opp.Created_Day__c > tender.publicDate__c){
opp.LeakageNumber__c = 1;
}
// 20221114 ljh SWAG-CKL5UC start
@@ -396,7 +449,9 @@
tender.IsReactionOpp__c = true;
// 鏌ヨ鎷涙爣鏁伴噺骞舵洿鏂�
//List<Tender_Opportunity_Link__c> tenderLinks = [SELECT id, Tender_information__c, Opportunity__c, Opportunity__r.Hospital__c FROM Tender_Opportunity_Link__c WHERE Tender_information__c = :tender.Id];
- tender.OpportunityNum__c = tenderLinks != null ? tenderLinks.size() : 0;
+ //tender.OpportunityNum__c = tenderLinks != null ? tenderLinks.size() : 0;
+ //20230714 you DB202306372336 鍘熷洜锛屽綋鍓嶆媴褰撳彧鑳界湅鍒拌嚜宸卞緱鍏宠仈璇环锛岀湅涓嶅埌鍏朵粬浜哄緱锛屾墍浠ヨ浠锋暟閲忎篃鍙兘绱鑷繁鐨�
+ tender.OpportunityNum__c = tender.OpportunityNum__c != null ? tender.OpportunityNum__c + links :links ;
// 鍏宠仈璇环鏃堕棿鍜屾槸鍚︾浉鍏崇姸鎬�
if (tender.IsRelateProject__c != '鏄�') {
tender.IsRelateProject__c = '鏄�';
@@ -446,11 +501,22 @@
tender.Hospital3__c = fiveHospitalMap.get('Hospital3__c');
tender.Hospital4__c = fiveHospitalMap.get('Hospital4__c');
}
+ //鐘舵�佷负缁堟 && 鍏ㄩ儴閫夋嫨鐨勬槸鍙栨秷鏃讹紝涓嶈繘琛岄」鐩噸鍚�
+ if(tender.status__c == '09.缁堟' && selectcancelcount !=0 && selectcancelcount != all_selected_list.size()){
+ tender.ProjectRestartFLG__c = true;
+ tender.IsTerminate__c = null;
+ tender.TerminateApprovalTime__c = null;
+ tender.TerminateApprovalStatus__c = null;
+ }
update tender;
// 鎷涙爣-璇环鍏宠仈淇敼 20210813 end
- return '鎴愬姛';
- }catch (Exception ex) {
- return ex.getMessage();
+ return '鎴愬姛';
+ }catch (Exception e) {
+ // String eMsg = e.getMessage();
+ // Integer left = eMsg.indexOf('锛�')+1;
+ // Integer right = eMsg.indexOf('锛�');
+ // return eMsg.substring(left,right);
+ return e.getMessage();
}
}
diff --git a/force-app/main/default/classes/PCLLostReportControllerTest.cls b/force-app/main/default/classes/PCLLostReportControllerTest.cls
index 25c8081..4300451 100644
--- a/force-app/main/default/classes/PCLLostReportControllerTest.cls
+++ b/force-app/main/default/classes/PCLLostReportControllerTest.cls
@@ -297,50 +297,50 @@
conTest2.dataEntry();
}
- @isTest
- private static void TestMeth3(){
+ //@isTest
+ // private static void TestMeth3(){
- // recode type 銈掑彇寰�
- List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
- if (rectCo.size() == 0) {
- throw new ControllerUtil.myException('not found 鐥呴櫌 recodetype');
- }
- List<RecordType> rectDpt = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Account' and Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�') order by Name desc];
- if (rectDpt.size() == 0) {
- throw new ControllerUtil.myException('not found 瑷虹檪绉� recodetype');
- }
+ // // recode type 銈掑彇寰�
+ // List<RecordType> rectCo = [select Id from RecordType where IsActive = true and SobjectType = 'Account' and Name = '鐥呴櫌'];
+ // if (rectCo.size() == 0) {
+ // throw new ControllerUtil.myException('not found 鐥呴櫌 recodetype');
+ // }
+ // List<RecordType> rectDpt = [select Id, Name from RecordType where IsActive = true and SobjectType = 'Account' and Name IN ('瑷虹檪绉� 娑堝寲绉�', '瑷虹檪绉� 鍛煎惛绉�') order by Name desc];
+ // if (rectDpt.size() == 0) {
+ // throw new ControllerUtil.myException('not found 瑷虹檪绉� recodetype');
+ // }
- // insert
- Account company1 = new Account();
- company1.RecordTypeId = rectCo[0].Id;
- company1.Name = '鐥呴櫌銉嗐偣銉�1';
- insert company1;
+ // // insert
+ // Account company1 = new Account();
+ // company1.RecordTypeId = rectCo[0].Id;
+ // company1.Name = '鐥呴櫌銉嗐偣銉�1';
+ // insert company1;
- List<Account> dc1s = [Select Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c from Account where Parent.Id = : company1.Id order by Department_Class_Label__c];
+ // List<Account> dc1s = [Select Id, Name, Department_Class_Label__c, Sys_Dept_Name_Change_Chk__c from Account where Parent.Id = : company1.Id order by Department_Class_Label__c];
- Account depart1 = new Account();
- depart1.RecordTypeId = rectDpt[0].Id;
- depart1.Name = '*';
- depart1.Department_Name__c = '瑷虹檪绉�1';
- depart1.ParentId= dc1s[0].Id;
- depart1.Department_Class__c = dc1s[0].Id;
- depart1.Hospital__c= company1.Id;
- insert depart1;
+ // Account depart1 = new Account();
+ // depart1.RecordTypeId = rectDpt[0].Id;
+ // depart1.Name = '*';
+ // depart1.Department_Name__c = '瑷虹檪绉�1';
+ // depart1.ParentId= dc1s[0].Id;
+ // depart1.Department_Class__c = dc1s[0].Id;
+ // depart1.Hospital__c= company1.Id;
+ // insert depart1;
- PCLLostReportController conTest2 = EditLoad();
- Set<Id> IdSet=new Set<Id> {depart1.Id};
- conTest2.deleteBrandIDSet=IdSet;
- conTest2.LostReport.LostReport.LostType__c = '閮ㄥ垎澶卞崟';
- conTest2.LostReport.LostBrands[0].lostBrand.LostPrice__c = 12;
- conTest2.LostReport.LostBrands[0].lostBrand.Lost_reason_main__c = '浠锋牸';
- conTest2.LostReport.LostBrands[0].LostProducts[0].LostProductss.Quantity__c =0;
- conTest2.LostReport.LostBrands[0].lostBrand.Agency__c = depart1.Id;
- conTest2.LostReport.LostBrands[0].lostBrand.Lost_By_Company__c = 'STORZ';
- conTest2.LostReport.LostBrands[0].LostProducts[0].lineNo2 = 0;
- conTest2.LostReport.LostBrands[0].LostProducts[0].LostProductss = new PCLLostProduct__c(Quantity__c = 0);
- // conTest2.setBrand();
- conTest2.dataEntry();
- }
+ // PCLLostReportController conTest2 = EditLoad();
+ // Set<Id> IdSet=new Set<Id> {depart1.Id};
+ // conTest2.deleteBrandIDSet=IdSet;
+ // conTest2.LostReport.LostReport.LostType__c = '閮ㄥ垎澶卞崟';
+ // conTest2.LostReport.LostBrands[0].lostBrand.LostPrice__c = 12;
+ // conTest2.LostReport.LostBrands[0].lostBrand.Lost_reason_main__c = '浠锋牸';
+ // conTest2.LostReport.LostBrands[0].LostProducts[0].LostProductss.Quantity__c =0;
+ // conTest2.LostReport.LostBrands[0].lostBrand.Agency__c = depart1.Id;
+ // conTest2.LostReport.LostBrands[0].lostBrand.Lost_By_Company__c = 'STORZ';
+ // conTest2.LostReport.LostBrands[0].LostProducts[0].lineNo2 = 0;
+ // conTest2.LostReport.LostBrands[0].LostProducts[0].LostProductss = new PCLLostProduct__c(Quantity__c = 0);
+ // // conTest2.setBrand();
+ // conTest2.dataEntry();
+ // }
diff --git a/force-app/main/default/classes/lexPCLLostReportLwcController.cls b/force-app/main/default/classes/lexPCLLostReportLwcController.cls
index 9e33408..3457411 100644
--- a/force-app/main/default/classes/lexPCLLostReportLwcController.cls
+++ b/force-app/main/default/classes/lexPCLLostReportLwcController.cls
@@ -92,6 +92,7 @@
pickList.put('娲楁秷鏈�', xixiaoji);
pickList.put('鍏夋簮', guangyuan);
pickList.put('鍏朵粬', qita);
+ pickList.put('鍏ㄩ儴',lstPickvals);
return JSON.serialize(pickList);
}
@AuraEnabled
@@ -104,7 +105,7 @@
submitFlag = submitFlag1;
return init1();
} catch (Exception e) {
- throw new AuraHandledException(e.getMessage());
+ return e.getMessage();
}
}
// 鍒濆鍖�
@@ -310,14 +311,14 @@
if(pros.size() > 0){
List<ProcessInstanceHistory> items = new List<ProcessInstanceHistory>();
- maps.put('allowUserId',pros[0].StepsAndWorkitems[0].OriginalActor.Id);
+ maps.put('allowUserId',pros[0].StepsAndWorkitems[0].Actor.Id);
maps.put('userProfileId',UserInfo.getProfileId());
for(ProcessInstance pro: pros){
items.addAll(pro.StepsAndWorkitems);
}
for(ProcessInstanceHistory pro: pros[0].StepsAndWorkitems){
if(pro.StepStatus == 'Started'){
- maps.put('submitUserId',pro.OriginalActorId);
+ maps.put('submitUserId',pro.ActorId);
}
}
LostReport.approvalHistorys = items;
@@ -381,7 +382,7 @@
}
} catch (Exception e) {
- throw new AuraHandledException(e.getMessage());
+ return e.getMessage();
}
}
// 鏁版嵁褰曞叆
@@ -764,30 +765,7 @@
}
}
}
- // add tcm 20211119 end
-
- // add tcm 20211118 start
- public static 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].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 {
- 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;
-
- }
- }
- }
+
@AuraEnabled
public static string searchProduct(String lostProduct){
Product2 prd = null;
@@ -797,7 +775,7 @@
, ProductCategory__c
from Product2 where Id =:lostProduct];
} catch (Exception e) {
- throw new AuraHandledException(e.getMessage());
+ return e.getMessage();
}
return JSON.serialize(prd);
}
diff --git a/force-app/main/default/classes/lexPCLLostReportLwcControllerTest.cls b/force-app/main/default/classes/lexPCLLostReportLwcControllerTest.cls
new file mode 100644
index 0000000..94f7ea4
--- /dev/null
+++ b/force-app/main/default/classes/lexPCLLostReportLwcControllerTest.cls
@@ -0,0 +1,143 @@
+@isTest
+private class lexPCLLostReportLwcControllerTest {
+
+ @TestSetup
+ static void makeData(){
+ PCLLostProduct2AssetHandlerTest.setUp();
+ }
+ static testMethod void testInitCreate(){
+ Opportunity opp = [select Id from Opportunity limit 1];
+ Test.startTest();
+ lexPCLLostReportLwcController.init('' + opp.Id,'','Create','澶卞崟','');
+ Test.stopTest();
+ }
+ static testMethod void testInitView(){
+ Lost_cancel_report__c report = [select Id from Lost_cancel_report__c where LostType__c = '澶卞崟'];
+ Test.startTest();
+ lexPCLLostReportLwcController.init('','' + report.Id,'View','','');
+ Test.stopTest();
+ }
+ static testMethod void testOther(){
+ Lost_cancel_report__c report = [select Id from Lost_cancel_report__c where LostType__c = '澶卞崟'];
+ Test.startTest();
+ lexPCLLostReportLwcController.getUserProfileId();
+ lexPCLLostReportLwcController.getPickList('PCLLostProduct__c','ProductCategory__c');
+ lexPCLLostReportLwcController.searchBrands();
+ lexPCLLostReportLwcController.searchBatchIfForProduct('');
+ lexPCLLostReportLwcController.getNewLostBrand(0);
+ lexPCLLostReportLwcController.getNewLostProduct(0);
+
+ Test.stopTest();
+ }
+ static testMethod void testSave(){
+ // Lost_cancel_report__c report = [select Id from Lost_cancel_report__c where LostType__c = '澶卞崟'];
+ Account depart1 = [select Id from Account where RecordTypeId = '01210000000QemG' limit 1];
+ LostReport conTest2 = new LostReport();
+ conTest2.lostReport.LostType__c = '澶卞崟';
+ conTest2.LostBrands[0].lostBrand.LostPrice__c = 12;
+ conTest2.LostBrands[0].lostBrand.Lost_reason_main__c = '浠锋牸';
+ conTest2.LostBrands[0].LostProducts[0].LostProductss.Quantity__c =3;
+ conTest2.LostBrands[0].lostBrand.Agency__c = depart1.Id;
+ conTest2.LostBrands[0].lostBrand.Lost_By_Company__c = '鍏朵粬';
+ conTest2.LostBrands[0].lostBrand.Lost_By_Company_Mannual__c = 'dddddd';
+ conTest2.LostBrands[0].LostProducts[0].lineNo2 = 0;
+ conTest2.LostBrands[0].LostProducts[0].LostProductss = new PCLLostProduct__c(Quantity__c = 3);
+
+ Test.startTest();
+ lexPCLLostReportLwcController.dataEntry(JSON.serialize(conTest2),new List<Id>(),new List<Id>());
+ Test.stopTest();
+ }
+
+ // 椤甸潰鐨勬暟鎹粨鏋�
+ public class LostReport {
+ @AuraEnabled
+ public Lost_cancel_report__c lostReport { get; set; }
+ @AuraEnabled
+ public list<LostBrand> LostBrands { get; set; }
+ @AuraEnabled
+ public list<ProcessInstanceHistory> approvalHistorys { get; set; }
+ public LostReport(){
+ lostReport = new Lost_cancel_report__c();
+ LostBrands = new list<LostBrand> {new LostBrand(0)};
+ approvalHistorys = new list<ProcessInstanceHistory>();
+ }
+ public LostReport(Lost_cancel_report__c lostReport){
+ this.lostReport = lostReport;
+ LostBrands = new list<LostBrand> {new LostBrand(0)};
+ approvalHistorys = new list<ProcessInstanceHistory>();
+ }
+ public LostReport(Lost_cancel_report__c lostReport, list<LostBrand> LostBrands){
+ this.lostReport = lostReport;
+ this.LostBrands = LostBrands;
+ approvalHistorys = new list<ProcessInstanceHistory>();
+ }
+ }
+
+ public class LostBrand {
+ @AuraEnabled
+ public PCLLostBrand__c lostBrand;
+ @AuraEnabled
+ public Integer lineNo;
+ @AuraEnabled
+ public list<PCLLostProducts> LostProducts;
+ @AuraEnabled
+ public Integer ProductSize;
+ @AuraEnabled
+ public Boolean reasonFlag = false;
+ @AuraEnabled
+ public String brandTitle;
+ public LostBrand( integer lineNo ){
+ lostBrand = new PCLLostBrand__c();
+ this.lineNo = lineNo;
+ this.brandTitle = '澶卞崟鍝佺墝' + (lineNo + 1);
+ 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.brandTitle = '澶卞崟鍝佺墝' + (lineNo + 1);
+ this.LostProducts = LostProducts;
+ ProductSize = LostProducts.size();
+ }
+ public LostBrand( integer lineNo, list<PCLLostProducts> LostProducts, PCLLostBrand__c lostBrand){
+ this.lostBrand = lostBrand;
+ this.lineNo = lineNo;
+ this.brandTitle = '澶卞崟鍝佺墝' + (lineNo + 1);
+ this.LostProducts = LostProducts;
+ ProductSize = LostProducts.size();
+ }
+ }
+ // add tcm 20211119 start
+ public class PCLLostProducts {
+ @AuraEnabled
+ public Integer lineNo2;
+ @AuraEnabled
+ public PCLLostProduct__c LostProductss;
+ @AuraEnabled
+ public Boolean bool;
+ @AuraEnabled
+ public String productName;
+ @AuraEnabled
+ public List<Map<String, String>> productOptions = new List<Map<String, String>>();
+ 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;
+ }
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexPCLLostReportLwcControllerTest.cls-meta.xml b/force-app/main/default/classes/lexPCLLostReportLwcControllerTest.cls-meta.xml
new file mode 100644
index 0000000..642d054
--- /dev/null
+++ b/force-app/main/default/classes/lexPCLLostReportLwcControllerTest.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/lwc/improvedForecastTime/improvedForecastTime.js b/force-app/main/default/lwc/improvedForecastTime/improvedForecastTime.js
index cd815ff..d84a617 100644
--- a/force-app/main/default/lwc/improvedForecastTime/improvedForecastTime.js
+++ b/force-app/main/default/lwc/improvedForecastTime/improvedForecastTime.js
@@ -5,6 +5,7 @@
import SystemModstamp from '@salesforce/schema/Account.SystemModstamp';
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import { CloseActionScreenEvent } from 'lightning/actions';
+import { updateRecord } from 'lightning/uiRecordApi';
import lwcCSS from '@salesforce/resourceUrl/lwcCSS';
import {loadStyle} from 'lightning/platformResourceLoader';
import lexDateCss from '@salesforce/resourceUrl/lexDateCss';
@@ -18,6 +19,9 @@
{label:"鎻愬墠",value:"鎻愬墠"},
{label:"寤跺悗",value:"寤跺悗"},
]
+ updateRecordView(recordId) {
+ updateRecord({fields: { Id: recordId }});
+ }
handleRelationFn(event){
@@ -158,14 +162,14 @@
showToast(msg,type) {
if(type == 'success'){
const event = new ShowToastEvent({
- title: ' ',
+ title: '',
message: msg,
variant: type
});
this.dispatchEvent(event);
}else{
const event = new ShowToastEvent({
- title: ' ',
+ title: '',
message: msg,
variant: type,
mode: 'sticky'
@@ -264,12 +268,15 @@
SaveData({JsonData:JSON.stringify(this.opp)}).then((response)=>{
if (response == '鎴愬姛') {
this.OnLoading(false);
- this.showToast("淇濆瓨鎴愬姛","success");
+ this.showToast("淇濆瓨鎴愬姛","success");
// window.location.hash = "Refresh"+"=="+this.oppId;
const closeEvent = new CustomEvent('closeaction', {
bubbles: true, // 鍏佽浜嬩欢鍐掓场鑷崇埗缁勪欢
composed: true, // 鍏佽浜嬩欢绌胯秺 Shadow DOM 鐣岄檺
});
+ setTimeout(() => {
+ window.location = '/' + this.recordId;
+ }, 2000);
this.dispatchEvent(closeEvent);
}else{
this.showToast(response,"error");
diff --git a/force-app/main/default/lwc/lexAgencyAuthorize/lexAgencyAuthorize.js b/force-app/main/default/lwc/lexAgencyAuthorize/lexAgencyAuthorize.js
index 2f53e5c..7a9f8f2 100644
--- a/force-app/main/default/lwc/lexAgencyAuthorize/lexAgencyAuthorize.js
+++ b/force-app/main/default/lwc/lexAgencyAuthorize/lexAgencyAuthorize.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-12 14:51:44
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-10-04 12:28:54
+ * @LastEditTime: 2023-10-10 17:25:57
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -328,14 +328,22 @@
}
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: '',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
- this.dispatchEvent(new CloseActionScreenEvent());
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
diff --git a/force-app/main/default/lwc/lexAllReceivedBtns/lexAllReceivedBtns.js b/force-app/main/default/lwc/lexAllReceivedBtns/lexAllReceivedBtns.js
index a940c01..5368c13 100644
--- a/force-app/main/default/lwc/lexAllReceivedBtns/lexAllReceivedBtns.js
+++ b/force-app/main/default/lwc/lexAllReceivedBtns/lexAllReceivedBtns.js
@@ -34,13 +34,22 @@
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: '',
- message: msg,
- variant: type
- });
- this.dispatchEvent(event);
- this.dispatchEvent(new CloseActionScreenEvent());
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
diff --git a/force-app/main/default/lwc/lexAppCancelSubmit/lexAppCancelSubmit.js b/force-app/main/default/lwc/lexAppCancelSubmit/lexAppCancelSubmit.js
index a99c517..73218bf 100644
--- a/force-app/main/default/lwc/lexAppCancelSubmit/lexAppCancelSubmit.js
+++ b/force-app/main/default/lwc/lexAppCancelSubmit/lexAppCancelSubmit.js
@@ -72,14 +72,21 @@
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- message: msg,
- variant: type
- });
if(type == 'success'){
- this.updateRecordView();
- }
- this.dispatchEvent(event);
- this.dispatchEvent(new CloseActionScreenEvent());
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexApplicationCancelSubmit/lexApplicationCancelSubmit.js b/force-app/main/default/lwc/lexApplicationCancelSubmit/lexApplicationCancelSubmit.js
index ee9ec67..983dcf7 100644
--- a/force-app/main/default/lwc/lexApplicationCancelSubmit/lexApplicationCancelSubmit.js
+++ b/force-app/main/default/lwc/lexApplicationCancelSubmit/lexApplicationCancelSubmit.js
@@ -61,14 +61,21 @@
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- message: msg,
- variant: type
- });
if(type == 'success'){
- this.updateRecordView();
- }
- this.dispatchEvent(event);
- this.dispatchEvent(new CloseActionScreenEvent());
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexBeforeOPDPDFBtn/lexBeforeOPDPDFBtn.js b/force-app/main/default/lwc/lexBeforeOPDPDFBtn/lexBeforeOPDPDFBtn.js
index 46d4e66..d467f94 100644
--- a/force-app/main/default/lwc/lexBeforeOPDPDFBtn/lexBeforeOPDPDFBtn.js
+++ b/force-app/main/default/lwc/lexBeforeOPDPDFBtn/lexBeforeOPDPDFBtn.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-13 15:08:43
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-09-14 16:11:28
+ * @LastEditTime: 2023-10-10 17:30:54
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -52,13 +52,22 @@
this.handleConfirmClick('鏄惁鏂板缓OPD鎶ュ憡涔︼紵\n[纭畾] => 鏂板缓OPD\n[鍙栨秷] => 鍙敓鎴� 锛讳骇鍝佽瘯鐢ㄨ瘎浠凤冀');
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
diff --git a/force-app/main/default/lwc/lexBeforeOPDPDFBtnSIS/lexBeforeOPDPDFBtnSIS.js b/force-app/main/default/lwc/lexBeforeOPDPDFBtnSIS/lexBeforeOPDPDFBtnSIS.js
index bbf8ecd..e8f0a73 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-09-14 16:11:51
+ * @LastEditTime: 2023-10-10 17:30:18
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -91,12 +91,22 @@
}
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
+
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCancel/lexCancel.js b/force-app/main/default/lwc/lexCancel/lexCancel.js
index db1f503..be1d3d5 100644
--- a/force-app/main/default/lwc/lexCancel/lexCancel.js
+++ b/force-app/main/default/lwc/lexCancel/lexCancel.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-03-27 13:47:21
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-10-09 17:47:05
+ * @LastEditTime: 2023-10-10 17:31:25
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -56,14 +56,12 @@
showToast(msg,type) {
if(type == 'success'){
const event = new ShowToastEvent({
- title: ' ',
message: msg,
variant: type
});
this.dispatchEvent(event);
}else{
const event = new ShowToastEvent({
- title: ' ',
message: msg,
variant: type,
mode: 'sticky'
diff --git a/force-app/main/default/lwc/lexCancelReport/lexCancelReport.js b/force-app/main/default/lwc/lexCancelReport/lexCancelReport.js
index c2e872e..736a8f8 100644
--- a/force-app/main/default/lwc/lexCancelReport/lexCancelReport.js
+++ b/force-app/main/default/lwc/lexCancelReport/lexCancelReport.js
@@ -72,13 +72,22 @@
});
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
diff --git a/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js b/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js
index b8ac66a..1a561c2 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-09-14 16:13:34
+ * @LastEditTime: 2023-10-10 17:32:11
*/
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -65,13 +65,22 @@
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
diff --git a/force-app/main/default/lwc/lexCancelSubmitReport/lexCancelSubmitReport.js b/force-app/main/default/lwc/lexCancelSubmitReport/lexCancelSubmitReport.js
index 8f0d7ae..b469ec8 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-10-09 17:48:24
+ * @LastEditTime: 2023-10-10 17:32:29
*/
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -65,21 +65,19 @@
showToast(msg,type) {
if(type == 'success'){
const event = new ShowToastEvent({
- title: ' ',
message: msg,
- variant: type
- });
+ variant: type,
+ });
this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
}else{
const event = new ShowToastEvent({
- title: ' ',
message: msg,
variant: type,
mode: 'sticky'
});
this.dispatchEvent(event);
- }
-
-
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexChangeContractType/lexChangeContractType.js b/force-app/main/default/lwc/lexChangeContractType/lexChangeContractType.js
index 76fb4e7..dc619a2 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-09-25 10:17:42
+ * @LastEditTime: 2023-10-10 17:33:05
*/
/*
* @Description:
@@ -137,13 +137,22 @@
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
diff --git a/force-app/main/default/lwc/lexCopyWithAsset/lexCopyWithAsset.js b/force-app/main/default/lwc/lexCopyWithAsset/lexCopyWithAsset.js
index 33401e2..616f82c 100644
--- a/force-app/main/default/lwc/lexCopyWithAsset/lexCopyWithAsset.js
+++ b/force-app/main/default/lwc/lexCopyWithAsset/lexCopyWithAsset.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-21 14:32:09
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-09-25 10:40:25
+ * @LastEditTime: 2023-10-10 17:33:45
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -37,13 +37,22 @@
}
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
connectedCallback(){
Promise.all([
diff --git a/force-app/main/default/lwc/lexCreateEvent/lexCreateEvent.js b/force-app/main/default/lwc/lexCreateEvent/lexCreateEvent.js
index 6e293fb..3a8a60f 100644
--- a/force-app/main/default/lwc/lexCreateEvent/lexCreateEvent.js
+++ b/force-app/main/default/lwc/lexCreateEvent/lexCreateEvent.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-13 13:50:23
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-09-06 14:36:47
+ * @LastEditTime: 2023-10-10 17:34:10
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -60,12 +60,22 @@
this.dispatchEvent(new CloseActionScreenEvent());
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: '',
- message: msg,
- variant: type
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
diff --git a/force-app/main/default/lwc/lexDispatchOCSMQARA/lexDispatchOCSMQARA.js b/force-app/main/default/lwc/lexDispatchOCSMQARA/lexDispatchOCSMQARA.js
index 4bd9c74..01da6b9 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-09-14 16:31:46
+ * @LastEditTime: 2023-10-10 17:34:49
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -44,15 +44,23 @@
this.DispatchOCSMQARA();
}
-
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
diff --git a/force-app/main/default/lwc/lexEditLost/lexEditLost.js b/force-app/main/default/lwc/lexEditLost/lexEditLost.js
index 0f688d1..315f579 100644
--- a/force-app/main/default/lwc/lexEditLost/lexEditLost.js
+++ b/force-app/main/default/lwc/lexEditLost/lexEditLost.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-09-12 17:37:34
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-10-09 16:43:31
+ * @LastEditTime: 2023-10-11 14:58:33
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -37,13 +37,22 @@
}
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
connectedCallback(){
@@ -55,7 +64,7 @@
}).then(result=>{
console.log(result);
if(result.error){
- this.showToast(res.error);
+ this.showToast('鎮ㄤ笉鑳戒慨鏀瑰け鍗�/閮ㄥ垎澶卞崟鎶ュ憡锛�','error');
this.dispatchEvent(new CloseActionScreenEvent());
}else if(result.report){
this.lostlist = result.report.lostReport;
diff --git a/force-app/main/default/lwc/lexImprovedForecastTimeNew/lexImprovedForecastTimeNew.html b/force-app/main/default/lwc/lexImprovedForecastTimeNew/lexImprovedForecastTimeNew.html
index e9f6459..f2b6719 100644
--- a/force-app/main/default/lwc/lexImprovedForecastTimeNew/lexImprovedForecastTimeNew.html
+++ b/force-app/main/default/lwc/lexImprovedForecastTimeNew/lexImprovedForecastTimeNew.html
@@ -9,7 +9,7 @@
<div class="slds-notify slds-notify_toast slds-theme_success" role="status">
<lightning-icon class="white" icon-name="utility:success" alternative-text="success" variant="inverse" size="small" ></lightning-icon>
<div class="slds-notify__content" style="padding-left: 20px;">
- <h2 style="color:white;font-size:large">{message}</h2>
+ <h2 style="color:white;font-size:16px;">{message}</h2>
</div>
<div class="slds-notify__close">
<lightning-button-icon icon-name="utility:close" variant="bare-inverse" size="large" onclick={closeAction}></lightning-button-icon>
@@ -43,7 +43,7 @@
<div class="slds-notify slds-notify_toast slds-theme_error" role="status">
<lightning-icon class="white" icon-name="utility:error" size="small" variant="inverse"></lightning-icon>
<div class="slds-notify__content" style="padding-left: 20px;">
- <h2 style="color:white;font-size:large">{message}</h2>
+ <h2 style="color:white;font-size:16px;">{message}</h2>
</div>
<div class="slds-notify__close">
<lightning-button-icon icon-name="utility:close" variant="bare-inverse" size="large" onclick={closeAction}></lightning-button-icon>
diff --git a/force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.html b/force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.html
index f2d27b9..112e773 100644
--- a/force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.html
+++ b/force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.html
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-05-25 13:59:44
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-09-27 15:30:16
+ * @LastEditTime: 2023-10-11 11:43:30
-->
<template>
<div data-id="myInput">
@@ -39,13 +39,13 @@
</template>
</div>
<template if:true={recordsList}>
- <div class="slds-combobox_container">
+ <div onmousedown={dontClose} class="slds-combobox_container">
<div id="listbox-id-1" class="slds-dropdown slds-dropdown_fluid slds-dropdown_autocomplete" role="listbox" style=" overflow: auto;">
<ul class="slds-listbox slds-listbox_vertical" role="presentation">
<template for:each={recordsList} for:item="item">
<li key={item.Id} role="presentation" class="slds-listbox__item">
<div class="slds-media slds-listbox__option slds-listbox__option_plain slds-media_small" role="option"
- data-itemid = {item.Id} data-itemname={item.Name} onmousedown={setSelectedValue}>
+ data-itemid = {item.Id} data-itemname={item.Name} onclick={setSelectedValue}>
<span role="menuitem" tabindex="-1" data-itemid = {item.Id} data-itemname={item.Name}>
<lightning-icon icon-name={iconname} size="x-small" data-itemid = {item.Id} data-itemname={item.Name}></lightning-icon> {item.Name}
</span>
diff --git a/force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.js b/force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.js
index 6c82379..319c137 100644
--- a/force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.js
+++ b/force-app/main/default/lwc/lexLookupLwc/lexLookupLwc.js
@@ -78,6 +78,9 @@
});
this.dispatchEvent(customEvent);
}
+ dontClose(event){
+ event.preventDefault();
+ }
//Method to pass selected record to parent component.
setSelectedValue(event) {
diff --git a/force-app/main/default/lwc/lexLoseBid/lexLoseBid.js b/force-app/main/default/lwc/lexLoseBid/lexLoseBid.js
index 5025ed8..f9edbac 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-09-20 17:11:07
+ * @LastEditTime: 2023-10-10 17:35:09
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -107,14 +107,22 @@
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
- this.dispatchEvent(new CloseActionScreenEvent());
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
diff --git a/force-app/main/default/lwc/lexLoseReport/lexLoseReport.js b/force-app/main/default/lwc/lexLoseReport/lexLoseReport.js
index cd790ad..3caec8e 100644
--- a/force-app/main/default/lwc/lexLoseReport/lexLoseReport.js
+++ b/force-app/main/default/lwc/lexLoseReport/lexLoseReport.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-20 14:08:55
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-10-08 15:40:39
+ * @LastEditTime: 2023-10-10 17:35:29
*/
/*
* @Description:
@@ -70,6 +70,11 @@
this.salesOwnerBuchang = result.salesOwnerBuchang;
this.salesOwnerBuchangID = result.salesOwnerBuchangID;
this.cntLostCancelDraft = result.cntLostCancelDraft;
+ if(!result.isHavePower){
+ this.showToast('鎮ㄤ笉鑳藉垱寤哄け鍗�/閮ㄥ垎澶卞崟鎶ュ憡锛�','error');
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
this.loseReport();
})
}
@@ -108,13 +113,22 @@
this.dispatchEvent(new CloseActionScreenEvent());
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
//鏄剧ず淇℃伅
showMyToast(title, message, variant) {
diff --git a/force-app/main/default/lwc/lexLoseReport/lexLoseReport.js-meta.xml b/force-app/main/default/lwc/lexLoseReport/lexLoseReport.js-meta.xml
index 3392981..f7e0d84 100644
--- a/force-app/main/default/lwc/lexLoseReport/lexLoseReport.js-meta.xml
+++ b/force-app/main/default/lwc/lexLoseReport/lexLoseReport.js-meta.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
- <apiVersion>54.0</apiVersion>
+ <apiVersion>58.0</apiVersion>
<isExposed>true</isExposed>
<targets>
<target>lightning__RecordPage</target>
diff --git a/force-app/main/default/lwc/lexNewAgencyHospital/lexNewAgencyHospital.js b/force-app/main/default/lwc/lexNewAgencyHospital/lexNewAgencyHospital.js
index 866b87b..c8b1eba 100644
--- a/force-app/main/default/lwc/lexNewAgencyHospital/lexNewAgencyHospital.js
+++ b/force-app/main/default/lwc/lexNewAgencyHospital/lexNewAgencyHospital.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-09-09 13:31:12
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-09-14 16:33:54
+ * @LastEditTime: 2023-10-10 17:35:45
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -36,14 +36,23 @@
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: '',
- message: msg,
- variant: type
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
-
connectedCallback(){
Promise.all([
loadStyle(this, lwcCSS)
diff --git a/force-app/main/default/lwc/lexNewOpportunityAgency/lexNewOpportunityAgency.js b/force-app/main/default/lwc/lexNewOpportunityAgency/lexNewOpportunityAgency.js
index a0eccad..41650dc 100644
--- a/force-app/main/default/lwc/lexNewOpportunityAgency/lexNewOpportunityAgency.js
+++ b/force-app/main/default/lwc/lexNewOpportunityAgency/lexNewOpportunityAgency.js
@@ -264,13 +264,22 @@
this.IsLoading = false;
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
diff --git a/force-app/main/default/lwc/lexNewOpportunityFile/lexNewOpportunityFile.js b/force-app/main/default/lwc/lexNewOpportunityFile/lexNewOpportunityFile.js
index d14fefd..25c8aaf 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-09-14 16:35:40
+ * @LastEditTime: 2023-10-10 17:36:38
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -35,13 +35,22 @@
}
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
connectedCallback(){
Promise.all([
diff --git a/force-app/main/default/lwc/lexNewSolutionClosingAttachment/lexNewSolutionClosingAttachment.js b/force-app/main/default/lwc/lexNewSolutionClosingAttachment/lexNewSolutionClosingAttachment.js
index 5a0f048..2603716 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-09-14 16:36:05
+ * @LastEditTime: 2023-10-10 17:36:56
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -36,13 +36,22 @@
}
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
connectedCallback(){
Promise.all([
diff --git a/force-app/main/default/lwc/lexNewSolutionProgramma/lexNewSolutionProgramma.js b/force-app/main/default/lwc/lexNewSolutionProgramma/lexNewSolutionProgramma.js
index dc0f5b0..ca6c410 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-09-14 16:36:31
+ * @LastEditTime: 2023-10-10 17:37:14
*/
import { api, wire,LightningElement } from 'lwc';
@@ -41,13 +41,22 @@
}
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
connectedCallback(){
Promise.all([
diff --git a/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js b/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js
index 5dfcd42..07b1c07 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-10-03 12:39:11
+ * @LastEditTime: 2023-10-10 17:37:39
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -108,13 +108,22 @@
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
noToReport(){
diff --git a/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js b/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js
index 980c0ae..4216225 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-09-14 16:38:02
+ * @LastEditTime: 2023-10-10 17:37:58
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -97,13 +97,22 @@
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
diff --git a/force-app/main/default/lwc/lexOLYwinBid/lexOLYwinBid.js b/force-app/main/default/lwc/lexOLYwinBid/lexOLYwinBid.js
index 35bbafa..f3de97b 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-09-20 16:58:35
+ * @LastEditTime: 2023-10-10 17:38:20
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -106,14 +106,22 @@
});
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
- this.dispatchEvent(new CloseActionScreenEvent());
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
diff --git a/force-app/main/default/lwc/lexOPDReport/lexOPDReport.js b/force-app/main/default/lwc/lexOPDReport/lexOPDReport.js
index dec11b5..b59338b 100644
--- a/force-app/main/default/lwc/lexOPDReport/lexOPDReport.js
+++ b/force-app/main/default/lwc/lexOPDReport/lexOPDReport.js
@@ -37,15 +37,24 @@
}
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
- this.dispatchEvent(new CloseActionScreenEvent());
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
+
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
}
diff --git a/force-app/main/default/lwc/lexOPDReportConsum/lexOPDReportConsum.js b/force-app/main/default/lwc/lexOPDReportConsum/lexOPDReportConsum.js
index 8c8dae1..068563f 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-09-14 16:39:39
+ * @LastEditTime: 2023-10-10 17:38:50
*/
import { LightningElement,api, track, wire } from 'lwc';
import {CurrentPageReference} from 'lightning/navigation';
@@ -44,14 +44,22 @@
}
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
- this.dispatchEvent(new CloseActionScreenEvent());
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
diff --git a/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js b/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js
index b6589e3..195d039 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-09-14 16:40:30
+ * @LastEditTime: 2023-10-10 17:39:04
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -64,15 +64,23 @@
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
-
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
}
diff --git a/force-app/main/default/lwc/lexOpporSplite/lexOpporSplite.js b/force-app/main/default/lwc/lexOpporSplite/lexOpporSplite.js
index 3ed036a..a6d9e71 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-09-14 16:40:55
+ * @LastEditTime: 2023-10-10 17:39:34
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -94,14 +94,22 @@
}
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
- this.dispatchEvent(new CloseActionScreenEvent());
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
diff --git a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.css b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.css
index ef26aba..3e669aa 100644
--- a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.css
+++ b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.css
@@ -108,4 +108,8 @@
display: block;
width: 10%;
}
+}
+
+.textAreaBody {
+ --sds-c-textarea-sizing-min-height:175px;
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.html
index 66e4503..57c7626 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-09-09 13:27:59
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-10-09 17:10:13
+ * @LastEditTime: 2023-10-11 14:52:27
-->
<!--
* @Description:
@@ -26,7 +26,7 @@
<div class="slds-notify slds-notify_toast slds-theme_success" role="status" style="top: 130px;">
<lightning-icon class="white" icon-name="utility:success" alternative-text="success" variant="inverse" size="small" ></lightning-icon>
<div class="slds-notify__content" style="padding-left: 20px;">
- <span class="toastMessage forceActionsText">{message}</span>
+ <span style="font-size: 16px;" class="toastMessage forceActionsText">{message}</span>
</div>
<div class="slds-notify__close">
<lightning-button-icon icon-name="utility:close" variant="bare-inverse" size="large" onclick={closeAction}></lightning-button-icon>
@@ -60,7 +60,7 @@
<div class="slds-notify slds-notify_toast slds-theme_error" role="status" style="background-color: #BA0517;top: 130px;">
<lightning-icon class="white" icon-name="utility:error" size="small" variant="inverse"></lightning-icon>
<div class="slds-notify__content" style="padding-left: 20px;">
- <span class="toastMessage forceActionsText">{message}</span>
+ <span style="font-size: 16px;" class="toastMessage forceActionsText">{message}</span>
</div>
<div class="slds-notify__close">
<lightning-button-icon icon-name="utility:close" variant="bare-inverse" size="large" onclick={closeAction}></lightning-button-icon>
@@ -149,7 +149,7 @@
</lightning-layout>
<lightning-layout>
<template if:true={isEdit}>
- <template if:true={brand.lostBrand.Lost_By_Company_Mannual__c}>
+ <!-- <template if:true={brand.lostBrand.Lost_By_Company_Mannual__c}>
<lightning-layout-item size="4" padding="horizontal-small">
<lightning-input name={i} data-id="Lost_By_Company_Mannual" value={brand.lostBrand.Lost_By_Company_Mannual__c} type="text" label="澶卞崟鍝佺墝(鎵嬪姩): " class="searchField" onchange={handleLostByCompanyMannualChange}></lightning-input>
</lightning-layout-item>
@@ -158,7 +158,10 @@
<lightning-layout-item size="4" padding="horizontal-small">
<lightning-input disabled="true" name={i} data-id="Lost_By_Company_Mannual" value={brand.lostBrand.Lost_By_Company_Mannual__c} type="text" label="澶卞崟鍝佺墝(鎵嬪姩): " class="searchField" onchange={handleLostByCompanyMannualChange}></lightning-input>
</lightning-layout-item>
- </template>
+ </template> -->
+ <lightning-layout-item size="4" padding="horizontal-small">
+ <lightning-input disabled="true" name={i} data-id="Lost_By_Company_Mannual" value={brand.lostBrand.Lost_By_Company_Mannual__c} type="text" label="澶卞崟鍝佺墝(鎵嬪姩): " class="searchField" onchange={handleLostByCompanyMannualChange}></lightning-input>
+ </lightning-layout-item>
</template>
<template if:false={isEdit}>
<lightning-layout-item size="4" padding="horizontal-small">
@@ -245,7 +248,13 @@
<td>
<template if:true={isEdit}>
<template if:true={product.LostProductss.ProductClass__c}>
- <lightning-combobox variant="label-hidden" read-only="true" class="ProductClass" data-id={i} placeholder="--鏃�--" title={i} name={j} options={productClassOptions} value={product.LostProductss.ProductClass__c} onchange={handleProductClassChange}></lightning-combobox>
+
+ <template if:true={product.LostProductss.LostProduct__c}>
+ <lightning-combobox variant="label-hidden" read-only="true" class="ProductClass" data-id={i} placeholder="--鏃�--" title={i} name={j} options={productClassOptions} value={product.LostProductss.ProductClass__c} onchange={handleProductClassChange}></lightning-combobox>
+ </template>
+ <template if:false={product.LostProductss.LostProduct__c}>
+ <lightning-combobox variant="label-hidden" class="ProductClass" data-id={i} placeholder="--鏃�--" title={i} name={j} options={productClassOptions} value={product.LostProductss.ProductClass__c} onchange={handleProductClassChange}></lightning-combobox>
+ </template>
</template>
<template if:false={product.LostProductss.ProductClass__c}>
<lightning-combobox variant="label-hidden" class="ProductClass" data-id={i} placeholder="--鏃�--" title={i} name={j} options={productClassOptions} value={product.LostProductss.ProductClass__c} onchange={handleProductClassChange}></lightning-combobox>
@@ -265,7 +274,7 @@
<td>
<template if:true={isEdit}>
- <lightning-combobox variant="label-hidden" class="ProductCategory" data-id={i} placeholder={product.LostProductss.ProductCategory__c} title={i} name={j} options={product.productOptions} value={product.LostProductss.ProductCategory__c} onchange={handleProductCategoryChange} read-only="true"></lightning-combobox>
+ <lightning-combobox variant="label-hidden" class="ProductCategory" data-id={i} placeholder="--鏃�--" title={i} name={j} options={product.productOptions} value={product.LostProductss.ProductCategory__c} onchange={handleProductCategoryChange} read-only="true"></lightning-combobox>
</template>
<template if:false={isEdit}>
<lightning-combobox variant="label-hidden" class="ProductCategory" data-id={i} placeholder="--鏃�--" title={i} name={j} options={product.productOptions} value={product.LostProductss.ProductCategory__c} onchange={handleProductCategoryChange} read-only="true"></lightning-combobox>
@@ -670,13 +679,23 @@
</div>
</template>
<template if:true={isPop}>
- <section role="dialog" aria-labelledby="modal-heading-01" aria-describedby="modal-content-id-1" tabindex="-1" aria-modal="true" class="slds-modal slds-fade-in-open " data-aura-rendered-by="478:0">
- <div style="height: 50px;"></div>
- <div style="background-color: white;height:196px;" class="slds-modal__container" data-aura-rendered-by="479:0">
-
-
- <div style="align-self: center;font-size: large;padding-bottom: 10px" slot="header">{modalsubmitLabel}椤甸潰</div>
- <template if:true={isLookup}>
+ <section role="dialog" tabindex="-1" aria-modal="true" aria-labelledby="modal-heading-01" class="slds-modal slds-fade-in-open">
+ <div class="slds-modal__container" data-aura-rendered-by="479:0">
+ <!-- <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse">
+ <svg aria-hidden="true">
+ <use xlink:href="/assets/icons/utility-sprite/svg/symbols.svg#close"></use>
+ </svg>
+ <span class="slds-assistive-text">Cancel and close</span>
+ </button> -->
+ <div style="height: 40px;">
+ <lightning-button-icon style="float: right;" variant="bare" icon-class="slds-button__icon slds-button__icon_large slds-button_icon-inverse" icon-name="utility:close" onclick={handleModalCancel}></lightning-button-icon>
+ </div>
+
+ <div class="slds-modal__header">
+ <h1 id="modal-heading-01" class="slds-modal__title slds-hyphenate">{modalsubmitLabel} 璇环澶卞崟/鍙栨秷鎶ュ憡</h1>
+ </div>
+ <div class="slds-modal__content slds-p-around_medium" id="modal-content-id-1">
+ <template if:true={isLookup}>
<lightning-record-edit-form
object-api-name='Lost_Report__c'
@@ -688,13 +707,16 @@
</div>
</lightning-record-edit-form>
- </template>
- <template if:false={isLookup}>
- <div style="height: 100px;">
- <lightning-textarea class="comment" style="width: 95%;padding-left: 10px;" data-id="comment" label="璇勮" value=""></lightning-textarea>
-
- </div>
- </template>
+ </template>
+ <template if:false={isLookup}>
+ <div>
+ <lightning-textarea class="textAreaBody" style="width: 95%;padding-left: 10px;" data-id="comment" label="璇勮" value=""></lightning-textarea>
+
+ </div>
+ </template>
+ </div>
+ <!-- <div style="align-self: center;font-size: large;padding-bottom: 10px" slot="header"></div> -->
+
<!-- <template if:true={isLookup}>
@@ -710,7 +732,7 @@
</lightning-layout-item>
</template> -->
- <div slot="footer" style="align-self: center;padding-top: 10px;">
+ <div class="slds-modal__footer">
<lightning-button
class="slds-button "
data-id="Cancel"
diff --git a/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.js b/force-app/main/default/lwc/lexPCLLostReportPage/lexPCLLostReportPage.js
index ed14ca8..6b3f341 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-10-09 16:36:54
+ * @LastEditTime: 2023-10-11 18:24:16
*/
let columns2=[
{ label: '--鏃�--', value: '' },
@@ -91,6 +91,7 @@
import lexButtonCss from '@salesforce/resourceUrl/lexButtonCss';
import systemProfileId from '@salesforce/label/c.ProfileId_SystemAdmin';
import {loadStyle} from 'lightning/platformResourceLoader';
+import { RefreshEvent } from "lightning/refresh";
export default class LexPCLLostReportPage extends NavigationMixin(LightningElement) {
@track visible = false;
@wire(CurrentPageReference) pageRef;
@@ -197,7 +198,8 @@
}else{
this.showToast(result.message,"error");
setTimeout(() => {
- window.location = '/lightning/r/Opportunity/' + this.oppId + '/view';
+ // window.location = '/lightning/r/Opportunity/' + this.oppId + '/view';
+ this.remoteUrl();
}, 2000);
}
}else{
@@ -226,6 +228,18 @@
var report = result.LostReport;
this.LostReport = report;
+
+
+ // this.LostReport.LostBrands.forEach(brand=>{
+ // if(brand.lostBrand.Lost_Reason_Sub__c == '琛屾斂鍐崇瓥' || brand.lostBrand.Lost_reason_main__c == '琛屾斂鍐崇瓥'){
+ // this.template.querySelectorAll();
+ // }
+ // });
+ // for(var i=0;i < this.LostReport.LostBrands.length;i++){
+ // if(this.LostReport.LostBrands[i].lostBrand.Lost_Reason_Sub__c == '琛屾斂鍐崇瓥' || this.LostReport.LostBrands[i].lostBrand.Lost_reason_main__c == '琛屾斂鍐崇瓥'){
+
+ // }
+ // }
if(!this.LostReport.lostReport.LostTotalAmount__c){
this.LostReport.lostReport.LostTotalAmount__c = 0.0;
@@ -316,6 +330,11 @@
fieldName: 'ProductCategory__c'
}).then(result=>{
this.productOptionsList = JSON.parse(result);
+ this.LostReport.LostBrands.forEach(brand=>{
+ brand.LostProducts.forEach(product=>{
+ product.productOptions = this.productOptionsList['鍏ㄩ儴'];
+ });
+ });
this.LostReport = JSON.parse(JSON.stringify(this.LostReport));
console.log(this.LostReport.approvalHistorys.length + 'size');
}).catch(error=>{
@@ -324,15 +343,38 @@
});
}
+ isqita(){
+
+ }
renderedCallback(){
const sections = this.template.querySelectorAll('lightning-accordion-section');
sections.forEach(section=>{
- console.log(section);
section.active = true;
});
- console.log('1');
- console.log(this.LostReport.lostReport.LostTotalAmount__c);
- this.LostReport.lostReport.LostTotalAmount__c = this.LostReport.lostReport.LostTotalAmount__c;
+ var elements = this.template.querySelectorAll('lightning-combobox');
+ elements.forEach(element=>{
+ if(element.value == '琛屾斂鍐崇瓥'){
+ element.options = columns2;
+ }
+ });
+ var elements1 = this.template.querySelectorAll('[data-id="Lost_By_Company_Mannual"]');
+ var i = 0;
+ console.log('elements1=> ' + elements1[i]);
+ this.LostReport.LostBrands.forEach(brand=>{
+ if(brand.lostBrand.Lost_By_Company__c == '鍏朵粬' && elements1.length > 0 ){
+ console.log('val=> ' + elements1[i].value);
+ if(elements1[i].value){
+ elements1[i].disabled = false;
+ elements1[i].required = true;
+ }
+ }
+
+ });
+ // if((value == '' || value == null) && this.LostReport.LostBrands[index].lostBrand.Lost_By_Company__c == '鍏朵粬'){
+ // var elements =
+ // elements[index].disabled = false;
+
+ // }
// this.LostReport = JSON.parse(JSON.stringify(this.LostReport));
}
brandTitle = ['澶卞崟鍝佺墝1','澶卞崟鍝佺墝2','澶卞崟鍝佺墝3','澶卞崟鍝佺墝4','澶卞崟鍝佺墝5','澶卞崟鍝佺墝6'];
@@ -495,6 +537,8 @@
}).then(result=>{
result.LostProductss.LostBrandName__c = this.LostReport.LostBrands[index].lostBrand.Lost_By_Company__c;
this.LostReport.LostBrands[index].LostProducts.push(result);
+ console.log('***');
+ console.log(this.LostReport);
});
}
submitJs() {
@@ -546,7 +590,7 @@
this.showToast('鎻愪氦鎴愬姛锛�','success');
setTimeout(() => {
- window.location = '/' + this.LostReport.lostReport.Id;
+ this.remoteUrl();
}, 2000);
}
this.IsLoading = false;
@@ -554,6 +598,19 @@
console.log("error");
console.log(error);
});
+ }
+
+ remoteUrl(){
+ var url = '/lightning/n/PCLLostReportPageLwc#pageStatus=View&reportId=' + this.LostReport.lostReport.Id;
+ var urlStatus = this.getQueryVariable('pageStatus',this.location);
+ if(urlStatus == 'View'){
+ console.log('viewpage');
+ window.location.reload();
+ }else{
+ console.log('editpage');
+ window.location = url;
+ window.location.reload();
+ }
}
onApproveChange(event){
// var approvalId;
@@ -626,7 +683,6 @@
// this.setDefaultBrand(payload.value,index);
this.clearBrandMannualName(payload.value,index);
}
- console.log('cnm:' + JSON.stringify(this.LostReport));
});
}
@@ -651,27 +707,40 @@
}
clearProducts(value,index){
var cc = this.LostReport.LostBrands[index].lostBrand.Lost_By_Company_Mannual__c;
- if (value == '鍏朵粬' && (cc != null || cc != '' || cc != undefined)) {
+ console.log('cc=' + cc)
+ if (value == '鍏朵粬' && (cc != null && cc != '' && cc != undefined)) {
return;
+ }else if(value != '鍏朵粬'){
+ this.LostReport.LostBrands[index].lostBrand.Lost_By_Company_Mannual__c = null;
+ console.log('wqeer1');
}
var newProducts = [];
console.log(this.newProduct);
getNewLostProduct({
lineNo2: this.LostReport.LostBrands[index].LostProducts.length
}).then(result=>{
+ console.log('wqeer2');
this.LostReport.LostBrands[index].LostProducts.forEach(product=>{
result.LostProductss.LostBrandName__c = value;
newProducts.push(result);
});
+ console.log('wqeer3');
var elements1 = this.template.querySelectorAll('.ProductClass[data-id="' + index + '"]');
elements1.forEach(element=>{
element.readOnly = false;
});
+ console.log('wqeer4');
var elements2 = this.template.querySelectorAll('.Product[data-id="' + index + '"]');
elements2.forEach(element=>{
element.clearSelection();
});
+ console.log('wqeer5');
this.LostReport.LostBrands[index].LostProducts = newProducts;
+ console.log('wqeer');
+ console.log(this.LostReport);
+ }).catch(error=>{
+ console.log('error');
+ console.log(error);
});
@@ -801,15 +870,21 @@
}
}
}
-
+ this.status.pageStatus = 'View';
this.LostReport = newLostReport;
this.reportId = result.reportId;
// this.LostReport.lostReport.Id = result.reportId;
// console.log(this.LostReport);
- this.status.pageStatus = 'View';
+
this.tableflag = 0;
this.showToast('淇濆瓨鎴愬姛','success');
console.log(this.LostReport);
+ this.LostReport.LostBrands.forEach(brand=>{
+ if(brand.lostBrand.Id){
+ this.updateRecordView(brand.lostBrand.Id);
+ }
+ });
+
}
this.IsLoading = false;
}).catch(error=>{
@@ -818,7 +893,15 @@
});
}
editJs(){
+
this.status.pageStatus = 'Edit';
+ var elements = this.template.querySelectorAll('lightning-combobox');
+ console.log('elements=>' + elements.length);
+ elements.forEach(element=>{
+ if(element.value == '琛屾斂鍐崇瓥'){
+ element.options = columns2;
+ }
+ });
}
dataCheck(){
@@ -925,7 +1008,10 @@
console.log('12345');
var elements1 = this.template.querySelectorAll('.ProductClass[data-id="' + topNum + '"]');
var elements2 = this.template.querySelectorAll('.ProductCategory[data-id="' + topNum + '"]');
+
if (this.LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.LostProduct__c==null) {
+ console.log('element1' + elements1[secondNum]);
+ console.log('element2' + elements2[secondNum]);
elements1[secondNum].readOnly = false;
elements2[secondNum].readOnly = false;
this.LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductClass__c=null;
@@ -942,7 +1028,12 @@
var prd = JSON.parse(result);
this.LostReport.LostBrands[topNum].LostProducts[secondNum].productOptions = this.productOptionsList[prd.ProductClass__c];
if (prd.ProductCategory__c!=null) {
- elements1[secondNum].readOnly = false;
+ console.log('element1' + elements1[secondNum]);
+ console.log('element2' + elements2[secondNum]);
+ if(elements1[secondNum]!=undefined){
+ elements1[secondNum].readOnly = false;
+ }
+
elements2[secondNum].readOnly = false;
this.LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductClass__c=prd.ProductClass__c;
console.log(prd.ProductClass__c + ' ' + prd.ProductCategory__c);
@@ -952,10 +1043,14 @@
this.LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductCategory__c=prd.ProductCategory__c;
}
- elements1[secondNum].readOnly = true;
+ if(elements1[secondNum]!=undefined){
+ elements1[secondNum].readOnly = true;
+ }
elements2[secondNum].readOnly = true;
}else {
- elements1[secondNum].readOnly = false;
+ if(elements1[secondNum]!=undefined){
+ elements1[secondNum].readOnly = false;
+ }
elements2[secondNum].readOnly = false;
this.LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductClass__c=null;
this.LostReport.LostBrands[topNum].LostProducts[secondNum].LostProductss.ProductCategory__c=null;
@@ -992,7 +1087,8 @@
this.showToast('鎮ㄦ棤鏉冮噸鏂板垎閰�','error');
this.IsLoading = false;
}else{
- window.location = '/' + this.LostReport.lostReport.Id;
+ // window.location = '/' + this.LostReport.lostReport.Id;
+ this.remoteUrl();
}
});
@@ -1013,7 +1109,8 @@
this.IsLoading = false;
}else{
- window.location = '/' + this.LostReport.lostReport.Id;
+ // window.location = '/' + this.LostReport.lostReport.Id;
+ this.remoteUrl();
}
});
}
@@ -1105,20 +1202,30 @@
}
handleLostByCompanyMannualChange(event){
+ try {
var index = event.target.name;
var value = event.target.value;
this.LostReport.LostBrands[index].lostBrand.Lost_By_Company_Mannual__c = value;
this.setDefaultBrand(value,index);
- var elements = this.template.querySelectorAll('.Product[data-id="' + index + '"]');
- if(value == '' || value == null){
- elements.forEach(element=>{
- element.letDisabledTrue();
- });
- }else{
- elements.forEach(element=>{
- element.letDisabledFalse();
- });
- }
+ // if((value == '' || value == null) && this.LostReport.LostBrands[index].lostBrand.Lost_By_Company__c == '鍏朵粬'){
+ // var elements = this.template.querySelectorAll('[data-id="Lost_By_Company_Mannual"]');
+ // elements[index].disabled = false;
+
+ // }
+ } catch (error) {
+ console.log('error');
+ console.log(error);
+ }
+ // var elements = this.template.querySelectorAll('.Product[data-id="' + index + '"]');
+ // if(value == '' || value == null){
+ // elements.forEach(element=>{
+ // element.letDisabledTrue();
+ // });
+ // }else{
+ // elements.forEach(element=>{
+ // element.letDisabledFalse();
+ // });
+ // }
}
handleLostPriceOutChange(event){
diff --git a/force-app/main/default/lwc/lexPredictedDateChange/lexPredictedDateChange.js b/force-app/main/default/lwc/lexPredictedDateChange/lexPredictedDateChange.js
index b65ddb8..51eed6f 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-09-20 17:28:12
+ * @LastEditTime: 2023-10-10 17:39:53
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -39,15 +39,23 @@
}
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
-
- }
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
}
diff --git a/force-app/main/default/lwc/lexQuotationProductNew/lexQuotationProductNew.js b/force-app/main/default/lwc/lexQuotationProductNew/lexQuotationProductNew.js
index 31d9b4a..1670951 100644
--- a/force-app/main/default/lwc/lexQuotationProductNew/lexQuotationProductNew.js
+++ b/force-app/main/default/lwc/lexQuotationProductNew/lexQuotationProductNew.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-14 17:15:33
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-09-08 13:07:55
+ * @LastEditTime: 2023-10-10 17:40:15
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -58,13 +58,23 @@
this.dispatchEvent(new CloseActionScreenEvent());
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: '',
- message: msg,
- variant: type
- });
- this.dispatchEvent(event);
- }
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
}
diff --git a/force-app/main/default/lwc/lexQuotationRequest/lexQuotationRequest.js b/force-app/main/default/lwc/lexQuotationRequest/lexQuotationRequest.js
index 23590f5..8be1e88 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-09-14 16:42:54
+ * @LastEditTime: 2023-10-10 17:40:30
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -64,14 +64,23 @@
})
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
- }
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
}
diff --git a/force-app/main/default/lwc/lexQuoteEntryDecidebottonLwc/lexQuoteEntryDecidebottonLwc.html b/force-app/main/default/lwc/lexQuoteEntryDecidebottonLwc/lexQuoteEntryDecidebottonLwc.html
new file mode 100644
index 0000000..bc883e6
--- /dev/null
+++ b/force-app/main/default/lwc/lexQuoteEntryDecidebottonLwc/lexQuoteEntryDecidebottonLwc.html
@@ -0,0 +1,5 @@
+<template>
+ <div class="toReportHolder" 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/lexQuoteEntryDecidebottonLwc/lexQuoteEntryDecidebottonLwc.js b/force-app/main/default/lwc/lexQuoteEntryDecidebottonLwc/lexQuoteEntryDecidebottonLwc.js
new file mode 100644
index 0000000..e713262
--- /dev/null
+++ b/force-app/main/default/lwc/lexQuoteEntryDecidebottonLwc/lexQuoteEntryDecidebottonLwc.js
@@ -0,0 +1,79 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-10-09 19:20:28
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-10-09 19:21:32
+ */
+import { LightningElement,wire,track,api } from 'lwc';
+import { CurrentPageReference,NavigationMixin } from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import updateOpportunity from '@salesforce/apex/LexQuoteEntryDecidebottonController.updateOpportunity';
+import selectOpportunityById from '@salesforce/apex/LexQuoteEntryDecidebottonController.selectOpportunityById';
+import selectUser from '@salesforce/apex/LexQuoteEntryDecidebottonController.selectUser';
+import lwcCSS from '@salesforce/resourceUrl/lwcCSS';
+import {loadStyle} from 'lightning/platformResourceLoader'
+
+export default class LexQuoteEntryDecidebottonLwc extends NavigationMixin(LightningElement) {
+ @api recordId;
+ IsLoading = true;
+ // IsLoading2 = true;
+ msg;
+ success;
+
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ console.log(currentPageReference);
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ console.warn("str");
+ console.warn(str);
+ this.recordId = str;
+ }
+ }
+ }
+
+ connectedCallback(){
+ console.warn('recordId'+this.recordId);
+ selectUser().then(us=>{
+ if (!us.Quote_Correct__c) {
+ this.showToast("浣犳病鏈夊彇娑圖ecide鐨勬潈闄�","error");
+ } else {
+ selectOpportunityById({recordId:this.recordId}).then(opp=>{
+ if (!opp.Estimation_Decision__c) {
+ this.showToast("杩樻病鏈塂ecide杩囷紝涓嶈兘鍙栨秷","error");
+ } else {
+ updateOpportunity({recordId:this.recordId}).then(result=>{
+ if (result == 'success') {
+ this.showToast("鍙栨秷Decide浜嗭紒","success");
+ setTimeout(() => {
+ window.open('/' +this.recordId, '_self');
+ },3000);
+ } else {
+ this.showToast(result,"error");
+ }
+ });
+ }
+ this.IsLoading = false;
+ });
+ }
+ });
+ Promise.all([
+ loadStyle(this, lwcCSS)
+ ]);
+ }
+ showToast(msg,type) {
+ const event = new ShowToastEvent({
+ titel:' ',
+ message: msg,
+ variant : type,
+ mode : 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexQuoteEntryDecidebottonLwc/lexQuoteEntryDecidebottonLwc.js-meta.xml b/force-app/main/default/lwc/lexQuoteEntryDecidebottonLwc/lexQuoteEntryDecidebottonLwc.js-meta.xml
new file mode 100644
index 0000000..0600d96
--- /dev/null
+++ b/force-app/main/default/lwc/lexQuoteEntryDecidebottonLwc/lexQuoteEntryDecidebottonLwc.js-meta.xml
@@ -0,0 +1,12 @@
+<?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__AppPage</target>
+ <target>lightning__RecordPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ <target>lightning__FlowScreen</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexRequestDB/lexRequestDB.js b/force-app/main/default/lwc/lexRequestDB/lexRequestDB.js
index cfdb850..605b790 100644
--- a/force-app/main/default/lwc/lexRequestDB/lexRequestDB.js
+++ b/force-app/main/default/lwc/lexRequestDB/lexRequestDB.js
@@ -128,14 +128,23 @@
this.dispatchEvent(new CloseActionScreenEvent());
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
- }
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
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 338ef7e..2c9f3e8 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-09-14 16:43:46
+ * @LastEditTime: 2023-10-10 17:41:01
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -63,16 +63,26 @@
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
+
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
}
diff --git a/force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.js b/force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.js
index dc7e066..287722e 100644
--- a/force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.js
+++ b/force-app/main/default/lwc/lexSpecSubmit/lexSpecSubmit.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-06-06 15:41:32
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-09-14 16:45:42
+ * @LastEditTime: 2023-10-10 17:41:40
*/
import { api, wire,LightningElement, track } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -42,13 +42,22 @@
}
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
diff --git a/force-app/main/default/lwc/lexStartTrading/lexStartTrading.css b/force-app/main/default/lwc/lexStartTrading/lexStartTrading.css
new file mode 100644
index 0000000..0d6e794
--- /dev/null
+++ b/force-app/main/default/lwc/lexStartTrading/lexStartTrading.css
@@ -0,0 +1,11 @@
+.StartTradingbtn{
+ 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/lexStartTrading/lexStartTrading.html b/force-app/main/default/lwc/lexStartTrading/lexStartTrading.html
new file mode 100644
index 0000000..05643df
--- /dev/null
+++ b/force-app/main/default/lwc/lexStartTrading/lexStartTrading.html
@@ -0,0 +1,6 @@
+<template>
+ <!-- <div class="StartTradingbtn" if:true={IsLoading}>
+ <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ </div> -->
+ <lightning-spinner if:true={IsLoading} variant="brand" alternative-text="Loading" size="large"> </lightning-spinner>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexStartTrading/lexStartTrading.js b/force-app/main/default/lwc/lexStartTrading/lexStartTrading.js
new file mode 100644
index 0000000..682de42
--- /dev/null
+++ b/force-app/main/default/lwc/lexStartTrading/lexStartTrading.js
@@ -0,0 +1,112 @@
+import { LightningElement,api, track, wire } from 'lwc';
+import {CurrentPageReference} from 'lightning/navigation';
+import { CloseActionScreenEvent } from 'lightning/actions';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import { NavigationMixin } from 'lightning/navigation';
+import init from '@salesforce/apex/StartTradingController2.init';
+import start from '@salesforce/apex/StartTradingController2.start';
+import lwcCSS from '@salesforce/resourceUrl/lwcCSS';
+import {loadStyle} from 'lightning/platformResourceLoader';
+
+export default class LexStartTrading extends NavigationMixin(LightningElement) {
+ @api recordId;
+ IsLoading=true;
+ Hospital_Name__c;
+ Close_Forecasted_Date__c;
+ Opp_Name_Search__c;
+ begin_opp_name__c;
+ Status;
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference){
+ console.log("杩涘叆椤甸潰");
+ console.log(currentPageReference);
+ if(currentPageReference){
+ const urvalue=currentPageReference.state.recordId;
+ if(urvalue){
+ let str=`${urvalue}`;
+ this.recordId=str;
+ }
+ }
+ }
+
+ connectedCallback(){
+ Promise.all([
+ loadStyle(this, lwcCSS)
+ ]);
+ init({Id:this.recordId}).then(result=>{
+ console.log('init result==========',result);
+ if(result!=null){
+ // 缁欏弬鏁拌祴鍊�
+ this.Hospital_Name__c = result.Hospital_Name__c;
+ this.Close_Forecasted_Date__c = result.Close_Forecasted_Date__c;
+ this.Opp_Name_Search__c = result.Opp_Name_Search__c;
+ this.begin_opp_name__c = result.begin_opp_name__c;
+ this.Status = result.Status;
+ // 鎵ц鍒ゆ柇
+ this.InquiryJudgment();
+ }
+ });
+ // .catch(err=>{
+ // console.log("init error:");
+ // console.log(err);
+ // }).finally(()=>{});
+ }
+
+ InquiryJudgment(){
+ console.log('InquiryJudgment check');
+ let status_list = ['瀹屾瘯','鏃犻渶姹�','宸叉湁璇环','纰鸿獚娓堛伩','涓嶈','寮�濮嬭浠�'];
+ let lead_status = this.Status;
+ let that = this;
+ if(this.Hospital_Name__c == ''){
+ this.showToast('鐥呴櫌鍚嶇О銈掕ō瀹氥仐銇︺亸銇犮仌銇�','error');
+ } else if (this.comparDate(this.Close_Forecasted_Date__c)) {
+ this.showToast('棰勬祴OCSM绛剧害鏃ヤ笉鑳藉皬浜庝粖澶�','error');
+ } else if (this.Opp_Name_Search__c == '' || !this.begin_opp_name__c == '' || status_list.indexOf(lead_status) !== -1) {
+ this.showToast('宸插瓨鍦ㄨ浆鍖栫殑璇环鎴栦笉闇�瑕佽浆鍖栬浠�','error');
+ } else{
+ console.log('start at: ' + this.recordId);
+ start({Id:this.recordId}).then(result=>{
+ console.log('start result==========',result);
+ if(result!=null){
+ this.showToast('宸叉垚鍔熻浆鍖栬浠�','success');
+ window.open('/lightning/r/Opportunity/'+result+'/view','_parent');
+ // this[NavigationMixin.GenerateUrl]({
+ // type: "standard__recordPage",
+ // attributes: {
+ // recordId: result,
+ // objectApiName:"Opportunity",
+ // actionName:"edit"
+ // }
+ // })
+ }
+ });
+ // .catch(err=>{
+ // console.log("start error:");
+ // console.log(err);
+ // }).finally(()=>{});
+ }
+
+ }
+ comparDate(dateValue) {
+ return new Date().getTime() >= new Date(dateValue).getTime() + 3600 * 1000 * 24;
+ }
+
+ showToast(msg,type) {
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexStartTrading/lexStartTrading.js-meta.xml b/force-app/main/default/lwc/lexStartTrading/lexStartTrading.js-meta.xml
new file mode 100644
index 0000000..fafbfc5
--- /dev/null
+++ b/force-app/main/default/lwc/lexStartTrading/lexStartTrading.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/lexStockApply/lexStockApply.js b/force-app/main/default/lwc/lexStockApply/lexStockApply.js
index d2697d9..bb00fec 100644
--- a/force-app/main/default/lwc/lexStockApply/lexStockApply.js
+++ b/force-app/main/default/lwc/lexStockApply/lexStockApply.js
@@ -2,9 +2,17 @@
* @Description:
* @version:
* @Author: chen jing wu
+ * @Date: 2023-09-09 13:27:59
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-10-11 17:59:10
+ */
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
* @Date: 2023-04-14 13:04:53
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-09-14 16:46:11
+ * @LastEditTime: 2023-10-10 17:41:57
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -131,16 +139,24 @@
this.handleConfirmClick("涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵");
}
- showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
- this.dispatchEvent(new CloseActionScreenEvent);
- }
+ showToast(msg,type) {
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
}
diff --git a/force-app/main/default/lwc/lexSubmitCompetitorReport/lexSubmitCompetitorReport.js b/force-app/main/default/lwc/lexSubmitCompetitorReport/lexSubmitCompetitorReport.js
index 99cdd9e..c77e61c 100644
--- a/force-app/main/default/lwc/lexSubmitCompetitorReport/lexSubmitCompetitorReport.js
+++ b/force-app/main/default/lwc/lexSubmitCompetitorReport/lexSubmitCompetitorReport.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-07 09:02:03
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-09-14 16:46:40
+ * @LastEditTime: 2023-10-10 17:42:13
*/
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -53,13 +53,22 @@
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
diff --git a/force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.js b/force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.js
index f87159c..2f13e16 100644
--- a/force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.js
+++ b/force-app/main/default/lwc/lexSubmitReport/lexSubmitReport.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-09-11 09:20:29
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-09-26 09:32:55
+ * @LastEditTime: 2023-10-10 17:47:00
*/
import { api, wire,LightningElement, track } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -41,13 +41,22 @@
}
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
diff --git a/force-app/main/default/lwc/lexSubmitSolutionForApproval/lexSubmitSolutionForApproval.js b/force-app/main/default/lwc/lexSubmitSolutionForApproval/lexSubmitSolutionForApproval.js
index 0810a87..84ae69b 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-09-13 15:03:09
+ * @LastEditTime: 2023-10-11 16:54:13
*/
import { api, wire,LightningElement, track } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -47,13 +47,22 @@
}
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
@@ -105,7 +114,7 @@
var usrname = this.userName;
var rtn = '';
console.log("start");
- if(header.includes(usrname)){
+ if(header != undefined && header != null && header != '' && header.includes(usrname)){
rtn = 'Y';
}else{
rtn = 'N';
diff --git a/force-app/main/default/lwc/lexSubmitSolutionSchemeForApproval/lexSubmitSolutionSchemeForApproval.js b/force-app/main/default/lwc/lexSubmitSolutionSchemeForApproval/lexSubmitSolutionSchemeForApproval.js
index 6d4cbd9..d1fcae7 100644
--- a/force-app/main/default/lwc/lexSubmitSolutionSchemeForApproval/lexSubmitSolutionSchemeForApproval.js
+++ b/force-app/main/default/lwc/lexSubmitSolutionSchemeForApproval/lexSubmitSolutionSchemeForApproval.js
@@ -110,14 +110,22 @@
}
}
showToast(msg, type) {
- const event = new ShowToastEvent({
- message: msg,
- variant: type
- });
- this.dispatchEvent(event);
- this.dispatchEvent(new CloseActionScreenEvent());
- if(type==='success'){
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
window.location.href = '/lightning/r/Solution_Programme__c/'+this.recordId+'/view';
- }
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexUpdateToOpp/lexUpdateToOpp.js b/force-app/main/default/lwc/lexUpdateToOpp/lexUpdateToOpp.js
index bf82410..5136f38 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-09-14 16:47:51
+ * @LastEditTime: 2023-10-10 17:44:41
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -17,13 +17,22 @@
import {loadStyle} from 'lightning/platformResourceLoader';
export default class LexUpdateToOpp extends LightningElement {
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
connectedCallback(){
Promise.all([
diff --git a/force-app/main/default/lwc/lexVOCAnswer/lexVOCAnswer.js b/force-app/main/default/lwc/lexVOCAnswer/lexVOCAnswer.js
index beebd63..7bd6e3f 100644
--- a/force-app/main/default/lwc/lexVOCAnswer/lexVOCAnswer.js
+++ b/force-app/main/default/lwc/lexVOCAnswer/lexVOCAnswer.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-03-27 14:05:59
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-09-14 16:48:12
+ * @LastEditTime: 2023-10-10 17:45:01
*/
import { LightningElement, wire, track, api } from "lwc";
import { CurrentPageReference } from "lightning/navigation";
@@ -60,13 +60,22 @@
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
updateRecordView(recordId) {
diff --git a/force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js b/force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js
index 3c57a99..5d71c9b 100644
--- a/force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js
+++ b/force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js
@@ -74,13 +74,22 @@
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
getUserId(userName){
getUserIdByName({
diff --git a/force-app/main/default/lwc/lexVOCConfirm/lexVOCConfirm.js b/force-app/main/default/lwc/lexVOCConfirm/lexVOCConfirm.js
index a04b7ac..988f4c0 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-09-14 16:49:02
+ * @LastEditTime: 2023-10-10 17:45:58
*/
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -67,13 +67,22 @@
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
diff --git a/force-app/main/default/lwc/lexVOCFinish/lexVOCFinish.js b/force-app/main/default/lwc/lexVOCFinish/lexVOCFinish.js
index 0b54a8e..5044976 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-09-14 16:49:23
+ * @LastEditTime: 2023-10-10 17:46:16
*/
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -68,13 +68,22 @@
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
diff --git a/force-app/main/default/lwc/lexVOCSubmit/lexVOCSubmit.js b/force-app/main/default/lwc/lexVOCSubmit/lexVOCSubmit.js
index 09c72ce..3493c3b 100644
--- a/force-app/main/default/lwc/lexVOCSubmit/lexVOCSubmit.js
+++ b/force-app/main/default/lwc/lexVOCSubmit/lexVOCSubmit.js
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-03-27 13:39:23
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-09-14 16:49:45
+ * @LastEditTime: 2023-10-10 17:46:31
*/
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
@@ -65,15 +65,25 @@
}
showToast(msg,type) {
- const event = new ShowToastEvent({
- title: ' ',
- message: msg,
- variant: type,
- mode: 'sticky'
- });
- this.dispatchEvent(event);
+ if(type == 'success'){
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type,
+ mode: 'sticky'
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
}
+
Submit () {
if (this.status != "鑽夋涓�") {
this.showToast("涓嶆槸鑽夋涓笉鑳界偣鍑�","error");
diff --git a/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox .css b/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox .css
index 4442364..98fc5ef 100644
--- a/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox .css
+++ b/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox .css
@@ -14,7 +14,8 @@
display: flex;
}
.inputBox input {
- padding-left: 10px;
+ padding-left: 100px;
+ cursor: pointer;
}
.eachItem:hover {
background-color: #F1F1F1;
diff --git a/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.html b/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.html
index cdae2ba..17859cb 100644
--- a/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.html
+++ b/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.html
@@ -4,7 +4,7 @@
* @Author: chen jing wu
* @Date: 2023-04-25 17:41:26
* @LastEditors: chen jing wu
- * @LastEditTime: 2023-09-27 17:36:59
+ * @LastEditTime: 2023-10-11 11:34:42
-->
<!-- Code by CafeForce || www.cafeforce.com || support@cafeforce.com || Mandatory Header -->
@@ -20,17 +20,17 @@
<div class="slds-combobox slds-dropdown-trigger slds-dropdown-trigger_click slds-is-open" aria-expanded="true" aria-haspopup="listbox" role="combobox">
<!-- Search Input -->
<div class="slds-combobox__form-element slds-input-has-icon slds-input-has-icon_right" role="none">
- <lightning-input data-id="myinput" disabled={disabled} class="inputBox" placeholder={placeholder} onblur={blurEvent} onclick={showOptions} onkeyup={filterOptions} value={searchString} auto-complete="off" variant="label-hidden" id="combobox-id-1"></lightning-input>
+ <lightning-input data-id="myinput" disabled={disabled} onblur={blurEvent} class="inputBox" placeholder={placeholder} onclick={showOptions} onkeyup={filterOptions} value={searchString} auto-complete="off" variant="label-hidden" id="combobox-id-1"></lightning-input>
<lightning-icon class="slds-input__icon slds-input__icon_right slds-icon-utility-down slds-icon_container" icon-name="utility:down" size="x-small" alternative-text="search"></lightning-icon>
</div>
<!-- Dropdown List -->
<template if:true={showDropdown}>
- <div id="listbox-id-1" class="slds-dropdown slds-dropdown_length-5 slds-dropdown_fluid" role="listbox"><!--style="{! 'max-height:' + (8 + (v.recordCount * 40)) + 'px' }""-->
+ <div onmousedown={dontClose} onopen={handlePayModeOpen} data-id=鈥渟crollSec鈥� id="listbox-id-1" class="slds-dropdown slds-dropdown_length-5 slds-dropdown_fluid" role="listbox"><!--style="{! 'max-height:' + (8 + (v.recordCount * 40)) + 'px' }""-->
<ul class="slds-listbox slds-listbox_vertical recordListBox" role="presentation">
<template if:false={message} >
<template for:each={optionData} for:item="option">
<template if:true={option.isVisible}>
- <li key={option.value} data-id={option.value} onmousedown={selectItem} class="slds-listbox__item eachItem">
+ <li key={option.value} data-id={option.value} onclick={selectItem} class="slds-listbox__item eachItem">
<div id="option724" class="slds-media slds-listbox__option slds-listbox__option_plain slds-media_small" role="option">
<template if:true={option.selected}>
<lightning-icon icon-name="utility:check" size="x-small" alternative-text="icon" ></lightning-icon>
diff --git a/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.js b/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.js
index 924fc87..725a643 100644
--- a/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.js
+++ b/force-app/main/default/lwc/multiSelectCombobox/multiSelectCombobox.js
@@ -1,6 +1,7 @@
/* Code by CafeForce || www.cafeforce.com || support@cafeforce.com || Mandatory Header */
import { LightningElement, track, api } from 'lwc';
-
+import lexHandCss from '@salesforce/resourceUrl/lexHandCss';
+import {loadStyle} from 'lightning/platformResourceLoader';
export default class MultiSelectCombobox extends LightningElement {
@api options;
@@ -21,6 +22,9 @@
@api placeholder = '--鏃�--';
@track errorFlag = false;
connectedCallback() {
+ Promise.all([
+ loadStyle(this, lexHandCss)
+ ]);
this.showDropdown = false;
var optionData = this.options ? (JSON.parse(JSON.stringify(this.options))) : null;
var value = this.selectedValue ? (JSON.parse(JSON.stringify(this.selectedValue))) : null;
@@ -52,6 +56,15 @@
get isRequired() {
return this.required;
+ }
+ closeAction(){
+ this.showDropdown = false;
+ }
+ handlePayModeOpen() {
+ setTimeout(() => {
+ const topDiv = this.template.querySelector('[data-id="scrollSec"]');
+ topDiv.scrollTop = topDiv.scrollHeight;
+ }, 20);
}
filterOptions(event) {
@@ -113,7 +126,20 @@
event.preventDefault();
else
this.showDropdown = false;
+ this.dispatchEvent(new CustomEvent('select', {
+ detail: {
+ 'payloadType' : 'multi-select',
+ 'payload' : {
+ 'value' : this.value,
+ 'values' : this.values
+ }
+ }
+ }));
}
+ }
+
+ dontClose(event){
+ event.preventDefault();
}
showOptions() {
@@ -178,15 +204,7 @@
this.showDropdown = false;
- this.dispatchEvent(new CustomEvent('select', {
- detail: {
- 'payloadType' : 'multi-select',
- 'payload' : {
- 'value' : this.value,
- 'values' : this.values
- }
- }
- }));
+
}
}
/*
diff --git a/force-app/main/default/lwc/tEnquiry/tEnquiry.html b/force-app/main/default/lwc/tEnquiry/tEnquiry.html
index 9407461..4baa3ac 100644
--- a/force-app/main/default/lwc/tEnquiry/tEnquiry.html
+++ b/force-app/main/default/lwc/tEnquiry/tEnquiry.html
@@ -1,67 +1,38 @@
-<!--
- * @Description:
- * @version:
- * @Author: chen jing wu
- * @Date: 2023-09-09 13:28:00
- * @LastEditors: chen jing wu
- * @LastEditTime: 2023-09-23 12:14:01
--->
<template>
<!-- <lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button> -->
<!-- 鎴愬姛 -->
<div>
</div>
- <div>
- <template if:true={visible}>
- <template if:true={isSuccess}>
- <div class="slds-notify_container slds-is-relative" style="position:absolute;top:1rem;left:1rem;right:1rem;position: fixed;z-index: 9999;">
- <div class="slds-notify slds-notify_toast slds-theme_success" role="status">
- <lightning-icon class="white" icon-name="utility:success" alternative-text="success" variant="inverse" size="small" ></lightning-icon>
- <div class="slds-notify__content" style="padding-left: 20px;">
- <h2 style="color:white;font-size:large">{message}</h2>
- </div>
- <div class="slds-notify__close">
- <lightning-button-icon icon-name="utility:close" variant="bare-inverse" size="large" onclick={closeAction}></lightning-button-icon>
- </div>
+ <div style="float:right">
+ <div class="demo-only demo-only_viewport" style="height:4.5rem;" if:true={Tongzhishow}>
+ <div class="slds-notification-container" style={IsLeftStyle}>
+ <div aria-live="assertive" aria-atomic="true" class="slds-assistive-text" style="color:#fff">鎻愮ず</div>
+ <section class="slds-notification" style="border: none;display:flex;width:auto;margin: 0 5px 0 10px;" role="dialog" aria-labelledby="noti77" aria-describedby="dialog-body-id-43">
+ <div class="slds-notification__body" style="min-width: 300px;" id="dialog-body-id-43">
+ <a class="slds-notification__target slds-media" href="#" style={BgColorStyle}>
+ <span class="slds-icon_container slds-media__figure" title="task">
+ <lightning-icon icon-name={TongzhiIcon} alternative-text="Account" variant="inverse" title="Account" size="small" ></lightning-icon>
+ </span>
+ <div class="slds-media__body">
+ <!-- <h2 class="slds-text-heading_small slds-m-bottom_xx-small" id="noti77">
+ <span class="slds-assistive-text" style="color:#fff">task notification:</span>鎻愮ず
+ </h2> -->
+ <p style="color:#fff;font-size:var(--lwc-fontSize5,1rem)">{SaveShowText}</p>
</div>
- </div>
- <!-- <div style="position:absolute;top:1rem;left:1rem;right:1rem;position: fixed;z-index: 9999;">
- <div class="slds-notify_container slds-is-relative">
- <div class="slds-notify slds-notify_toast slds-theme_default slds-box slds-box_small" style="background-color:rgb(46, 132, 74);" role="success">
- <div class="slds-align_absolute-center">
-
-
- </div>
- </div>
- </div>
- </div> -->
- </template>
- <template if:false={isSuccess}>
- <!-- <div style="position:absolute;top:1rem;left:1rem;right:1rem;position: fixed;z-index: 9999;">
- <div class="slds-notify_container slds-is-relative">
- <div class="slds-notify slds-notify_toast slds-theme_default slds-box slds-box_small" style="background-color:rgb(234, 0, 30);" role="success">
- <div class="slds-align_right">
-
-
-
- </div>
- </div>
- </div>
- </div> -->
- <div class="slds-notify_container slds-is-relative" style="position:absolute;top:1rem;left:1rem;right:1rem;position: fixed;z-index: 9999;">
- <div class="slds-notify slds-notify_toast slds-theme_error" role="status">
- <lightning-icon class="white" icon-name="utility:error" size="small" variant="inverse"></lightning-icon>
- <div class="slds-notify__content" style="padding-left: 20px;">
- <h2 style="color:white;font-size:large">{message}</h2>
- </div>
- <div class="slds-notify__close">
- <lightning-button-icon icon-name="utility:close" variant="bare-inverse" size="large" onclick={closeAction}></lightning-button-icon>
- </div>
- </div>
- </div>
- </template>
- </template>
+ <button class="slds-button slds-button_icon slds-button_icon-container" title="close" style="height: 100%;">
+ <lightning-icon icon-name="utility:close" alternative-text="close" variant="inverse" title="close" size="small" onclick={CloseAlert}></lightning-icon>
+ </button>
+ </a>
+
+ <!-- <button class="slds-button slds-button_icon slds-button_icon-container slds-notification__close"
+ title="close">
+ <div onclick={CloseAlert} style="color: #fff;">x</div>
+ </button> -->
+ </div>
+ </section>
+ </div>
+ </div>
</div>
<div class="exampleHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="large"></lightning-spinner>
diff --git a/force-app/main/default/lwc/tEnquiry/tEnquiry.js b/force-app/main/default/lwc/tEnquiry/tEnquiry.js
index 768845f..7aa4631 100644
--- a/force-app/main/default/lwc/tEnquiry/tEnquiry.js
+++ b/force-app/main/default/lwc/tEnquiry/tEnquiry.js
@@ -34,33 +34,7 @@
IsLeftStyle = "" //鎻愮ず妗嗙殑鏍峰紡
BgColorStyle = ""
toastTime = null;
- isSuccess = false;
- message;
- visible;
- closeAction(){
- this.visible = false;
- }
- showToast(msg,type) {
- try {
- if(type == 'success'){
- this.isSuccess = true;
- }else{
- this.isSuccess = false;
- }
- this.message = msg;
- this.visible = true;
- let delay = 5000;
- console.log(this.message);
- console.log('1');
- // setTimeout(() => {
- // this.visible = false;
- // }, delay );
- } catch (error) {
- console.log(error);
- }
-
-
- }
+ IsLeftStyle = "width: 100%;top: 14%;display: flex;justify-content: center;"
Alert(content,error = false,left = false){
this.Tongzhishow = false
clearTimeout(this.toastTime)
@@ -69,17 +43,16 @@
if (error) {
this.TongzhiIcon = "utility:error";
- this.BgColorStyle = "background-color:#ba0517 !important;padding: 9px 9px 9px 18px;";
+ this.BgColorStyle = "background-color:#ba0517 !important;padding:0.65rem 0.75rem 0.65rem 1.25rem;";
}else{
this.TongzhiIcon = "utility:success";
- this.BgColorStyle = "background-color:rgb(46, 132, 74)!important;padding: 9px 9px 9px 18px;";
- toastTime = setTimeout(() => {
- this.Tongzhishow = false
- },3000)
+ this.BgColorStyle = "background-color:rgb(46, 132, 74)!important;padding:0.65rem 0.75rem 0.65rem 1.25rem;";
+ // this.toastTime = setTimeout(() => {
+ // this.Tongzhishow = false
+ // },3000)
}
// if (left) {
// // this.IsLeftStyle = "left: 0.25rem;"
- this.IsLeftStyle = "width: 100%;top: 14%;display: flex;justify-content: center;"
// }else{
// this.IsLeftStyle = "color:#fff"
// }
@@ -181,8 +154,7 @@
if (isloading == 2) {
this.OnLoading(false);
if (flag) {
- // this.Alert("淇濆瓨鎴愬姛",false);
- this.showToast('淇濆瓨鎴愬姛','success');
+ this.Alert("淇濆瓨鎴愬姛",false);
}
}
})
@@ -202,8 +174,7 @@
if (isloading == 2) {
this.OnLoading(false);
if (flag) {
- // this.Alert("淇濆瓨鎴愬姛",false);
- this.showToast('淇濆瓨鎴愬姛','success');
+ this.Alert("淇濆瓨鎴愬姛",false);
}
}
@@ -343,8 +314,7 @@
isloading ++;
if (isloading == 2) {
this.OnLoading(false);
- // this.Alert("淇濆瓨鎴愬姛",false);
- this.showToast('淇濆瓨鎴愬姛','success');
+ this.Alert("淇濆瓨鎴愬姛",false);
}
})
@@ -356,8 +326,7 @@
isloading ++;
if (isloading == 2) {
this.OnLoading(false);
- // this.Alert("淇濆瓨鎴愬姛",false);
- this.showToast('淇濆瓨鎴愬姛','success');
+ this.Alert("淇濆瓨鎴愬姛",false);
}
})
}
@@ -371,8 +340,7 @@
var flag = this.compareSelected();
if (flag == false) {
this.OnLoading(false);
- // this.Alert("鍖婚櫌涓嶅尮閰嶏紝淇濆瓨澶辫触锛�",true);
- this.showToast('鍖婚櫌涓嶅尮閰嶏紝淇濆瓨澶辫触锛�','error');
+ this.Alert("鍖婚櫌涓嶅尮閰嶏紝淇濆瓨澶辫触锛�",true);
return;
}
debugger;
@@ -389,12 +357,10 @@
this.UpdateDatas(this.notselected);
window.location.hash = "Refresh"+"=="+this.ParamIdStr;
this.OnLoading(false);
- // this.Alert('淇濆瓨鎴愬姛',false);
- this.showToast('淇濆瓨鎴愬姛','success');
+ this.Alert('淇濆瓨鎴愬姛',false);
}else{
this.OnLoading(false);
- // this.Alert(response,true);
- this.showToast(response,'error');
+ this.Alert(response,true);
}
});
diff --git a/force-app/main/default/pages/searchAimsAccount.page b/force-app/main/default/pages/searchAimsAccount.page
index c9d1439..256456f 100644
--- a/force-app/main/default/pages/searchAimsAccount.page
+++ b/force-app/main/default/pages/searchAimsAccount.page
@@ -16,6 +16,14 @@
top.window.close();
}
</script>
+ <style>
+ .headerStyle{
+ border-right: ridge !important;
+ }
+ .headerStyle1{
+ font-weight: 600 !important;
+ }
+ </style>
<apex:outputPanel id="all">
<apex:outputPanel id="message1">
@@ -23,25 +31,25 @@
</apex:outputPanel>
<apex:form id="mainForm">
<apex:pageBlock id="idSearchSetProduct" title="鐗逛环鍖婚櫌閫夋嫨">
- <table width="750" style="background-color:#DCDCDC">
+ <apex:facet name="header">
+ <span style="font-size: initial;font-weight: 600;">鐗逛环鍖婚櫌閫夋嫨</span>
+ </apex:facet>
+ <table width="750" border="0" style="background-color:#DCDCDC">
<colgroup>
- <col width="12" />
- <col width="5" />
+ <col width="20" />
<col width="20" />
- <col width="200" />
+ <col width="300" />
<col width="20" />
<col width="428" />
</colgroup>
<tr>
<td> </td>
- <th style="width: 66px;">{!$Label.Search_Condition}</th>
- <td></td>
+ <th style="width:100px;">{!$Label.Search_Condition}</th>
<th>鍖婚櫌鍚嶇О</th>
<td> </td>
<td> </td>
</tr>
<tr>
- <td> </td>
<td> </td>
<td> </td>
<td><apex:inputText id="searchName" value="{!SearchName}" style="width:200px" required="false"/></td>
@@ -58,20 +66,20 @@
<th valign="top">{!$Label.Search_Result}</th>
<td width="20"> </td>
<td>
- <table border="0" style="border-left: 0px;border-right: 0px;">
+ <table class="slds-table" border="0" style="border-left: 0px;border-right: 0px;">
<tr>
<td>
<div id="iframelike" style="width:665px">
- <apex:pageBlockTable style="border-left: 0px;border-right: 0px;" id="idRezultVisitor" value="{!at}" var="c" border="1" columns="3" columnsWidth="200px,100px,350px">
- <apex:column >
+ <apex:pageBlockTable style="border-left: 1px;border-right: 1px;" id="idRezultVisitor" value="{!at}" var="c" border="1" columns="3" columnsWidth="200px,100px,350px">
+ <apex:column headerClass="headerStyle headerStyle1">
<apex:facet name="header">鍖婚櫌鍚嶇О</apex:facet>
<apex:outputLink id="contactName" value="{!c.Name}" onclick="setProductOne('{!c.Name}','{!c.Id}');return false;">{!c.Name}</apex:outputLink>
</apex:column>
- <apex:column >
+ <apex:column headerClass="headerStyle headerStyle1">
<apex:facet name="header">鐪佷唤</apex:facet>
<apex:outputField id="State_Master" value="{!c.State_Master__r.Name}" />
</apex:column>
- <apex:column >
+ <apex:column headerClass="headerStyle1">
<apex:facet name="header">鍦板潃</apex:facet>
<apex:outputField id="Alternative" value="{!c.Address__c}" />
</apex:column>
--
Gitblit v1.9.1