From 212967a5a65a12f9673170b80e3d8c766dcee5d0 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期四, 06 七月 2023 10:46:18 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/lwc/lexCustomAnewMaintenance/lexCustomAnewMaintenance.js | 20
force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.css | 22
force-app/main/default/pages/HPConfirmPage.page | 2
force-app/main/default/lwc/lexEquipmentRentalApply_FromSA/lexEquipmentRentalApply_FromSA.js-meta.xml | 20
force-app/main/default/lwc/lexApplyForRepair/lexApplyForRepair.js | 1
force-app/main/default/lwc/lexCreateInstructReport/lexCreateInstructReport.html | 10
force-app/main/default/lwc/lexCustomAnewMaintenance/lexCustomAnewMaintenance.html | 10
force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.css | 12
force-app/main/default/lwc/lexYanshoudanRequest/lexYanshoudanRequest.js | 7
force-app/main/default/lwc/lexSendQISToEtQ/lexSendQISToEtQ.html | 1
force-app/main/default/pages/EquipmentRentalExtend.page | 43
force-app/main/default/lwc/lexCancelSelect/lexCancelSelect.js | 50
force-app/main/default/lwc/lexCreateRepairFromQIS/lexCreateRepairFromQIS.html | 2
force-app/main/default/lwc/lexConsumApply_FromOPDPlan/lexConsumApply_FromOPDPlan.js-meta.xml | 20
force-app/main/default/pages/SetPersonalTarget.page | 141
force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.css | 12
force-app/main/default/lwc/lexCustomDelete/lexCustomDelete.js | 58
force-app/main/default/lwc/lexCreateRepairFromOnCall/lexCreateRepairFromOnCall.js-meta.xml | 7
force-app/main/default/lwc/lexCustomNewMaintenance/lexCustomNewMaintenance.js | 9
force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.html | 12
force-app/main/default/pages/RentalApplySequence.page | 156 -
force-app/main/default/lwc/lexInquiryFormCustomLink2/lexInquiryFormCustomLink2.js | 62
force-app/main/default/lwc/lexPreContractSubmit/lexPreContractSubmit.html | 1
force-app/main/default/lwc/lexcopyQIS/lexcopyQIS.html | 3
force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.js-meta.xml | 20
force-app/main/default/lwc/lexOCSMToReportRepair/lexOCSMToReportRepair.js | 54
force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.js | 27
force-app/main/default/lwc/lexCustomNewMaintenance/lexCustomNewMaintenance.css | 12
force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.html | 10
force-app/main/default/pages/RentalApplyMultiPostpone.page | 10
force-app/main/default/pages/AgencyConfirmPage.page | 2
force-app/main/default/lwc/lexCustomDelete/lexCustomDelete.html | 1
force-app/main/default/lwc/lexSCSubmit/lexSCSubmit.js | 49
force-app/main/default/lwc/lexInquiryFormCustomLink1/lexInquiryFormCustomLink1.html | 4
force-app/main/default/lwc/lexInquiryFormNoStatus/lexInquiryFormNoStatus.js | 65
force-app/main/default/lwc/lexcopyQIS/lexcopyQIS.js | 2
force-app/main/default/lwc/lexCreateRepairFromDepartment/lexCreateRepairFromDepartment.js-meta.xml | 7
force-app/main/default/lwc/lexSelectProduct2CIC/lexSelectProduct2CIC.js | 1
force-app/main/default/lwc/lexCreateRepairFromQIS/lexCreateRepairFromQIS.js | 181 +
force-app/main/default/lwc/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.js-meta.xml | 11
force-app/main/default/lwc/lexCreateInstructReport/lexCreateInstructReport.js | 9
force-app/main/default/pages/FollowPage.page | 2
force-app/main/default/lwc/lexOCSMNoToReportRepair/lexOCSMNoToReportRepair.js | 64
force-app/main/default/pages/StatusPage.page | 2
force-app/main/default/lwc/lexCreateNewServiceContract/lexCreateNewServiceContract.js-meta.xml | 6
force-app/main/default/staticresources/StyleUtilCss.resource-meta.xml | 5
force-app/main/default/pages/RentalFixtureSetSelect.page | 10
force-app/main/default/classes/lexNewSparePartsLoanApplicationCtl.cls | 143 +
force-app/main/default/lwc/lexInquiryFormCustomLink2/lexInquiryFormCustomLink2.js-meta.xml | 11
force-app/main/default/classes/InquiryFormController.cls | 124 +
force-app/main/default/lwc/lexSendRepairsToEtQ/lexSendRepairsToEtQ.js | 106
force-app/main/default/lwc/lexCreateAssessmentReport/lexCreateAssessmentReport.html | 10
force-app/main/default/lwc/lexMailMessege/lexMailMessege.js | 6
force-app/main/default/lwc/lexCustomNewMaintenance/lexCustomNewMaintenance.html | 8
force-app/main/default/classes/lexConsumApply_FromAccountCtl.cls | 71
force-app/main/default/components/RelationListPagingCmp.component | 64
force-app/main/default/staticresources/RelationListPagingCmpJS.js | 26
force-app/main/default/classes/buttonQISReportCtl.cls | 2
force-app/main/default/lwc/lexSendNFM103/lexSendNFM103.js | 585 +++-
force-app/main/default/classes/RentalApplyESetRefreshStatusController.cls | 3
force-app/main/default/lwc/lexConsumApply_FromOPDPlan/lexConsumApply_FromOPDPlan.html | 5
force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.js-meta.xml | 7
force-app/main/default/lwc/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.html | 5
force-app/main/default/pages/ServiceFollowPage.page | 2
force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.js | 44
force-app/main/default/lwc/lexQISMBCrequestNew/lexQISMBCrequestNew.html | 1
force-app/main/default/pages/AccessoryAdd.page | 217 +
force-app/main/default/lwc/lexCreateRepairFromDepartment/lexCreateRepairFromDepartment.js | 41
force-app/main/default/pages/SetProductTarget.page | 62
force-app/main/default/lwc/lexCreateAssessmentReport/lexCreateAssessmentReport.js | 9
force-app/main/default/lwc/lexRentalApplyDiscountApproval/lexRentalApplyDiscountApproval.js | 8
force-app/main/default/classes/InquiryFormController.cls-meta.xml | 5
force-app/main/default/lwc/lexSendQISToEtQ/lexSendQISToEtQ.js | 134
force-app/main/default/lwc/lexQISMBCrequestNew/lexQISMBCrequestNew.js-meta.xml | 6
force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.css | 20
force-app/main/default/lwc/lexCreateAssessmentReport/lexCreateAssessmentReport.css | 13
force-app/main/default/pages/RentalFixtureSetDetilSelect.page | 11
force-app/main/default/classes/lexConsumApply_FromOPDPlanCtl.cls-meta.xml | 5
force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.js | 297 +-
force-app/main/default/lwc/lexCustomAnewMaintenance/lexCustomAnewMaintenance.css | 12
force-app/main/default/lwc/lexInquiryFormServiceFollow/lexInquiryFormServiceFollow.js | 68
force-app/main/default/pages/RentalFixtureSetAssign.page | 493 +--
force-app/main/default/lwc/lexInquiryFormCustomLink2/lexInquiryFormCustomLink2.html | 4
force-app/main/default/lwc/lexUploadToRecognitionModel/lexUploadToRecognitionModel.js | 95
force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.js | 49
force-app/main/default/classes/LexConsumApply_FromQISCtl.cls | 90
force-app/main/default/pages/AccountTargetHospital.page | 14
force-app/main/default/classes/LightingButtonConstant.cls | 1
force-app/main/default/lwc/lexUploadToRecognitionModel/lexUploadToRecognitionModel.html | 1
force-app/main/default/pages/RentalApplyList.page | 52
force-app/main/default/pages/SetPersonalProductTarget.page | 65
force-app/main/default/pages/AccountTargetTab.page | 2
force-app/main/default/lwc/lexCopyRepair/lexCopyRepair.js | 147 +
force-app/main/default/lwc/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.js | 275 ++
force-app/main/default/lwc/lexESignAcceptanceHospital/lexESignAcceptanceHospital.js | 2
force-app/main/default/lwc/lexSCSubmit/lexSCSubmit.html | 1
force-app/main/default/lwc/lexAccessory_Select/lexAccessory_Select.js | 1
force-app/main/default/lwc/lexCreateRepairFromQIS/lexCreateRepairFromQIS.js-meta.xml | 7
force-app/main/default/lwc/lexConsumApply_FromOPDPlan/lexConsumApply_FromOPDPlan.js | 99
force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.js-meta.xml | 26
force-app/main/default/lwc/lexOSHNogoods/lexOSHNogoods.js | 6
force-app/main/default/classes/buttonAssetCtl.cls | 80
force-app/main/default/lwc/lexConsumApply_FromAccount/lexConsumApply_FromAccount.js | 97
force-app/main/default/pages/RentalApplyExtensions.page | 18
force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.js | 259 +
force-app/main/default/classes/otherButtonRepairController.cls | 5
force-app/main/default/classes/lexNewSparePartsLoanApplicationCtl.cls-meta.xml | 5
force-app/main/default/classes/lexConsumApply_FromOPDPlanCtl.cls | 81
force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.js-meta.xml | 28
force-app/main/default/lwc/lexAccessory_Select/lexAccessory_Select.js-meta.xml | 27
force-app/main/default/lwc/lexInquiryFormServiceFollow/lexInquiryFormServiceFollow.js-meta.xml | 11
force-app/main/default/lwc/lexOCSMNoToReportRepair/lexOCSMNoToReportRepair.html | 1
force-app/main/default/lwc/lexSendNFM103/lexSendNFM103.html | 3
force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.html | 1
force-app/main/default/lwc/lexEquipmentRentalApply_FromSA/lexEquipmentRentalApply_FromSA.js | 25
force-app/main/default/lwc/lexCreateNewServiceContract/lexCreateNewServiceContract.js | 44
force-app/main/default/lwc/lexInquiryFormCustomLink1/lexInquiryFormCustomLink1.js | 201 +
force-app/main/default/lwc/lexSendRepairsToEtQ/lexSendRepairsToEtQ.html | 1
force-app/main/default/pages/HpDirectSalesConfirmPage.page | 2
force-app/main/default/staticresources/RelationListPagingCmpCss.css | 4
force-app/main/default/lwc/lexInquiryFormNoStatus/lexInquiryFormNoStatus.js-meta.xml | 11
force-app/main/default/pages/AccessorySelect.page | 1
force-app/main/default/lwc/lexConsumApply_FromAccount/lexConsumApply_FromAccount.html | 5
force-app/main/default/lwc/lexOCSMToReportRepair/lexOCSMToReportRepair.html | 1
force-app/main/default/lwc/lexCreateInstructReport/lexCreateInstructReport.css | 12
force-app/main/default/lwc/lexProductRepairQuoteRepair/lexProductRepairQuoteRepair.js | 2
force-app/main/default/lwc/lexConsumApply_FromAccount/lexConsumApply_FromAccount.js-meta.xml | 20
force-app/main/default/lwc/lexQISMBCrequestNew/lexQISMBCrequestNew.js | 42
force-app/main/default/staticresources/AccessoryAddCss.css | 11
force-app/main/default/classes/LexConsumApply_FromQISCtl.cls-meta.xml | 5
force-app/main/default/pages/SetProvinceTarget.page | 57
force-app/main/default/lwc/lexConsumApply_FromQIS/lexConsumApply_FromQIS.js-meta.xml | 20
force-app/main/default/lwc/lexAddress/lexAddress.js | 4
force-app/main/default/lwc/lexInquiryFormNoStatus/lexInquiryFormNoStatus.html | 4
force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.html | 9
force-app/main/default/lwc/lexConsumApply_FromQIS/lexConsumApply_FromQIS.html | 5
force-app/main/default/lwc/lexOCSMNogoods/lexOCSMNogoods.js | 11
force-app/main/default/lwc/lexDiscountRequest/lexDiscountRequest.js | 9
force-app/main/default/pages/MainFixtureSelect.page | 205 +
force-app/main/default/staticresources/MainFixtureSelectCss.css | 19
force-app/main/default/lwc/lexInquiryFormServiceFollow/lexInquiryFormServiceFollow.html | 4
force-app/main/default/pages/RentalFixtureSetAssignAgency.page | 2
force-app/main/default/staticresources/StyleUtilCss.css | 39
force-app/main/default/lwc/lexConsumApply_FromQIS/lexConsumApply_FromQIS.js | 149 +
force-app/main/default/lwc/lexPreContractSubmit/lexPreContractSubmit.js | 52
force-app/main/default/classes/lexConsumApply_FromAccountCtl.cls-meta.xml | 5
force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.html | 12
force-app/main/default/lwc/lexServiceCutPriceApply/lexServiceCutPriceApply.js | 11
force-app/main/default/pages/RentalApplyList.page-meta.xml | 7
force-app/main/default/lwc/lexInquiryFormCustomLink1/lexInquiryFormCustomLink1.js-meta.xml | 11
150 files changed, 4,755 insertions(+), 1,679 deletions(-)
diff --git a/force-app/main/default/classes/InquiryFormController.cls b/force-app/main/default/classes/InquiryFormController.cls
new file mode 100644
index 0000000..9b46e45
--- /dev/null
+++ b/force-app/main/default/classes/InquiryFormController.cls
@@ -0,0 +1,124 @@
+public class InquiryFormController {
+ @AuraEnabled
+ public static InitData init(String recordId){
+ InitData res = new initData();
+ try{
+ Inquiry_form__c report = [SELECT Id,Name,Service_Status__c,FSE_Owner__c,FSE_Owner_id__c,Status__c,Lead_link__c,Opp_Name_Search__c,Contact_Name__c,Contact_Id__c,Hospital_Name__c,Hospital_ID__c,Department_Class__c,Department_ID__c,Opp_Name_Search_ID__c,Campaign__c,Campaign_ID__c,Cancel_Reason__c,Product_Owner__c,Phone__c,Email__c,Last_Name__c,LeadSource__c,Opportunity_Division__c,Request1__c,Urgent__c,Family_Name__c FROM Inquiry_form__c WHERE Id = :recordId LIMIT 1];
+ res.Id = report.Id;
+ res.Name = report.Name;
+ res.ServiceStatus = report.Service_Status__c;
+ res.Status = report.Status__c;
+ res.profileId = UserInfo.getProfileId();
+ res.userId = UserInfo.getUserId();
+ res.LeadLink= report.Lead_link__c;
+ res.OppNameSearch= report.Opp_Name_Search__c;
+ res.ContactName= report.Contact_Name__c;
+ res.ContactId = report.Contact_Id__c;
+ res.HospitalName = report.Hospital_Name__c;
+ res.HospitalID = report.Hospital_ID__c;
+ res.DepartmentClass= report.Department_Class__c;
+ res.DepartmentID = report.Department_ID__c;
+ res.OppNameSearchID= report.Opp_Name_Search_ID__c;
+ res.Campaign= report.Campaign__c;
+ res.CampaignID = report.Campaign_ID__c;
+ res.CancelReason= report.Cancel_Reason__c;
+ res.Phone = report.Phone__c;
+ res.Email= report.Email__c;
+ res.LastName = report.Last_Name__c;
+ res.LeadSource = report.LeadSource__c;
+ res.OpportunityDivision = report.Opportunity_Division__c;
+ res.Request1 = report.Request1__c;
+ res.Urgent = report.Urgent__c;
+ res.FSEOwner = report.FSE_Owner__c;
+ res.FSEOwnerId = report.FSE_Owner_id__c;
+ res.FamilyName = report.Family_Name__c;
+ res.JINGZHUOJISHU = getUserName(LightingButtonConstant.JINGZHUO_JISHU);
+ System.debug(LoggingLevel.INFO, '*** xu: ' + res);
+ }catch(Exception e){
+ System.debug(LoggingLevel.INFO, '*** exu: ' + e);
+ }
+ return res;
+ }
+ //鏂板缓涓�椤�
+ @AuraEnabled
+ public static List<Inquiry_form__c> sqlResult (String id) {
+ try {
+ List<Inquiry_form__c> records = [SELECT id,Request_Detail__c FROM Inquiry_form__c WHERE id = :id];
+ System.debug(LoggingLevel.INFO, '*** xu1: ' + records);
+ return records;
+ } catch (exception e) {
+ System.debug(LoggingLevel.INFO, '*** xu1111111: ' + e);
+ throw new AuraHandledException(e.getMessage());
+ }
+ }
+ @AuraEnabled
+ public static string getUserName(String name){
+ User user = null;
+ try {
+ user = [select Id from user where Name =:name];
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ return user.Id;
+ }
+ public class InitData{
+ @AuraEnabled
+ public String Id;
+ @AuraEnabled
+ public String ServiceStatus;
+ @AuraEnabled
+ public String profileId;
+ @AuraEnabled
+ public String userId;
+ @AuraEnabled
+ public String Status;
+ @AuraEnabled
+ public String LeadLink;
+ @AuraEnabled
+ public String OppNameSearch;
+ @AuraEnabled
+ public String ContactName;
+ @AuraEnabled
+ public String ContactId;
+ @AuraEnabled
+ public String HospitalName;
+ @AuraEnabled
+ public String HospitalID;
+ @AuraEnabled
+ public String DepartmentClass;
+ @AuraEnabled
+ public String DepartmentID;
+ @AuraEnabled
+ public String OppNameSearchID;
+ @AuraEnabled
+ public String Campaign;
+ @AuraEnabled
+ public String CampaignID;
+ @AuraEnabled
+ public String Name;
+ @AuraEnabled
+ public String CancelReason;
+ @AuraEnabled
+ public String Phone;
+ @AuraEnabled
+ public String Email;
+ @AuraEnabled
+ public String LastName;
+ @AuraEnabled
+ public String LeadSource;
+ @AuraEnabled
+ public String OpportunityDivision;
+ @AuraEnabled
+ public String Request1;
+ @AuraEnabled
+ public Boolean Urgent;
+ @AuraEnabled
+ public String FSEOwner;
+ @AuraEnabled
+ public String FSEOwnerId;
+ @AuraEnabled
+ public String FamilyName;
+ @AuraEnabled
+ public String JINGZHUOJISHU;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/InquiryFormController.cls-meta.xml b/force-app/main/default/classes/InquiryFormController.cls-meta.xml
new file mode 100644
index 0000000..fbbad0a
--- /dev/null
+++ b/force-app/main/default/classes/InquiryFormController.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>56.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
diff --git a/force-app/main/default/classes/LexConsumApply_FromQISCtl.cls b/force-app/main/default/classes/LexConsumApply_FromQISCtl.cls
new file mode 100644
index 0000000..a0478b2
--- /dev/null
+++ b/force-app/main/default/classes/LexConsumApply_FromQISCtl.cls
@@ -0,0 +1,90 @@
+public with sharing class LexConsumApply_FromQISCtl {
+ public LexConsumApply_FromQISCtl() {
+
+ }
+ @AuraEnabled
+ public static List<Consum_Apply__c> rentalApp(String recordId){
+ try {
+ List<Consum_Apply__c> rep = [select Id from Consum_Apply__c where QIS_number__c =: recordId and Status__c <> '鍙栨秷' and Status__c <> '鍒犻櫎'];
+ return rep;
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ }
+
+ @AuraEnabled
+ public static List<FieldDefinition> fieldDefineApp(){
+ try {
+ List<FieldDefinition> rep = [Select QualifiedApiName, EntityDefinition.KeyPrefix, DurableId From FieldDefinition WHERE EntityDefinition.QualifiedApiName = 'Consum_Apply__c'];
+ return rep;
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ }
+
+ //鑾峰彇褰撳墠鐧诲綍浜虹殑 id
+ @AuraEnabled
+ public static UserResult UserInfo_Owner() {
+ UserResult result = new UserResult();
+ ID myUserID = UserInfo.getUserId();
+ try {
+ User tempUser =
+ [select Id,isFormal_Stuff__c,FirstName,LastName from user where id = : myUserID ];
+ result.id = tempUser.Id;
+ result.isFormalStuff = tempUser.isFormal_Stuff__c;
+ result.firstName = tempUser.FirstName;
+ result.lastName = tempUser.LastName;
+ } catch (exception e) {
+
+ result.result = e.getMessage();
+ }
+ return result;
+ }
+
+ @AuraEnabled
+ public static InitData init(String recordId){
+ InitData res = new initData();
+ try {
+ QIS_Report__c rep = [select Id,next_action__c,QIS_Status__c,Hospital__c,Department_Class__c,Hospital_Department__c,Name from QIS_Report__c where Id =: recordId];
+ res.nextAction = rep.next_action__c;
+ res.qISStatus = rep.QIS_Status__c;
+ res.hospital = rep.Hospital__c;
+ res.departmentClass = rep.Department_Class__c;
+ res.hospitalDepartment = rep.Hospital_Department__c;
+ res.name = rep.Name;
+ return res;
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ }
+ public class InitData{
+ @AuraEnabled
+ public String nextAction;
+ @AuraEnabled
+ public String qISStatus;
+ @AuraEnabled
+ public String hospital;
+ @AuraEnabled
+ public String departmentClass;
+ @AuraEnabled
+ public String hospitalDepartment;
+ @AuraEnabled
+ public String name;
+ }
+
+ public class UserResult {
+ @AuraEnabled
+ public string result;
+ public UserResult( ) {
+ result = 'Success';
+ }
+ @AuraEnabled
+ public string id;
+ @AuraEnabled
+ public Boolean isFormalStuff;
+ @AuraEnabled
+ public string firstName;
+ @AuraEnabled
+ public string lastName;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LexConsumApply_FromQISCtl.cls-meta.xml b/force-app/main/default/classes/LexConsumApply_FromQISCtl.cls-meta.xml
new file mode 100644
index 0000000..9bbf7b4
--- /dev/null
+++ b/force-app/main/default/classes/LexConsumApply_FromQISCtl.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>56.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/LightingButtonConstant.cls b/force-app/main/default/classes/LightingButtonConstant.cls
index 0fe95d4..1aa96de 100644
--- a/force-app/main/default/classes/LightingButtonConstant.cls
+++ b/force-app/main/default/classes/LightingButtonConstant.cls
@@ -90,6 +90,7 @@
public static final String CN_NO = '鍚�';
public static final String VOC_NAME = 'VOC';
public static final String OK = 'OK';
+ public static final String JINGZHUO_JISHU = '绮剧悽 鎶�鏈�';
public static final String LU_SHENG_NAME = '闄� 鑳�';
public static final String HU_DI_AN_NAME = '鑳� 杩畨';
public static final String SYSTEM_PROFILE_NAME = '绯荤粺绠＄悊鍛�';
diff --git a/force-app/main/default/classes/RentalApplyESetRefreshStatusController.cls b/force-app/main/default/classes/RentalApplyESetRefreshStatusController.cls
index d809cbf..046d92e 100644
--- a/force-app/main/default/classes/RentalApplyESetRefreshStatusController.cls
+++ b/force-app/main/default/classes/RentalApplyESetRefreshStatusController.cls
@@ -1,7 +1,4 @@
public with sharing class RentalApplyESetRefreshStatusController {
- public RentalApplyESetRefreshStatusController() {
-
- }
@AuraEnabled
public static String eSetRefreshStatus(String raeSetId) {
return eSetRefreshStatusBatch(new List<String> {raeSetId});
diff --git a/force-app/main/default/classes/buttonAssetCtl.cls b/force-app/main/default/classes/buttonAssetCtl.cls
index 8e8152d..97e170d 100644
--- a/force-app/main/default/classes/buttonAssetCtl.cls
+++ b/force-app/main/default/classes/buttonAssetCtl.cls
@@ -7,8 +7,18 @@
public static InitData init(String recordId){
InitData res = new initData();
try{
- Asset report = [SELECT Id,NoPartRiskDate_F__c,Product_ID__c,AccountId,HP_Id__c,Hospital__c,Hospital__r.Id,Department_Class__c,Department_Class__r.Id,Name FROM Asset WHERE Id =: recordId LIMIT 1];
+ Asset report = [SELECT Order_No__c,SerialNumber,Asset_day__c,Posting_Date__c,InstallDate,Asset_Owner__c,AssetMark__c,Id,NoPartRiskDate_F__c,Product_ID__c,AccountId,HP_Id__c,Hospital__c,Hospital__r.Id,Department_Class__c,Department_Class__r.Id,Name FROM Asset WHERE Id =: recordId LIMIT 1];
System.debug(LoggingLevel.INFO, '*** opp: ' + report);
+
+ res.AssetMarkC = report.AssetMark__c;
+ res.AssetOwnerC = report.Asset_Owner__c;
+ res.InstallDate = report.InstallDate;
+ res.PostingDateC = report.Posting_Date__c;
+ res.AssetDayC = report.Asset_day__c;
+ res.SerialNumber = report.SerialNumber;
+ res.OrderNoC = report.Order_No__c;
+
+
res.Id = report.Id;
res.Name = report.Name;
res.NoPartRiskDateFC = report.NoPartRiskDate_F__c;
@@ -91,6 +101,16 @@
}
}
+ @AuraEnabled
+ public static List<QIS_Report__c> selecctQISReportrByFomatToday(String AssetId, Date fomatToday){
+ try {
+ List<QIS_Report__c> accounts = [SELECT id,QIS_Submit_day__c from QIS_Report__c where nonyushohin__c=:AssetId and QIS_Submit_day__c != null and QIS_Submit_day__c >=: fomatToday];
+ return accounts;
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ }
+
//鏌ヨRepair__c
@AuraEnabled
public static List<Account> selecctAccountByAccountId(String AccountId){
@@ -102,8 +122,66 @@
}
}
+ @AuraEnabled
+ public static String selectCASE(String AssetOwnerC){
+ String res='';
+ if(AssetOwnerC.equals('鐥呴櫌璩囩敚')){
+ res='鐥呴櫌璩囩敚';
+ }else if(AssetOwnerC.equals('璐拱')){
+ res='璐拱';
+ }
+ else if(AssetOwnerC.equals('Olympus')){
+ res='Olympus';
+ }
+ else if(AssetOwnerC.equals('澶囧搧')){
+ res='澶囧搧';
+ }
+ else if(AssetOwnerC.equals('銉兗銈逛細绀�')){
+ res='銉兗銈逛細绀�';
+ }
+ else if(AssetOwnerC.equals('鍏朵粬')){
+ res='鍏朵粬';
+ }
+ else if(AssetOwnerC.equals('缁忛攢鍟嗚祫浜�')){
+ res='缁忛攢鍟嗚祫浜�';
+ }else{
+ res='';
+ }
+ return res;
+ }
+
+ @AuraEnabled
+ public static String selectNullvalue(String InstallDate,String PostingDateC,String AssetDayC){
+ String res='';
+ if(InstallDate!=null){
+ res=InstallDate;
+ }else {
+ if(PostingDateC!=null){
+ res=PostingDateC;
+ }else {
+ res=AssetDayC;
+ }
+ }
+ return res;
+ }
+
public class InitData{
@AuraEnabled
+ public String AssetMarkC;
+ @AuraEnabled
+ public String AssetOwnerC;
+ @AuraEnabled
+ public Date InstallDate;
+ @AuraEnabled
+ public Date PostingDateC;
+ @AuraEnabled
+ public Date AssetDayC;
+ @AuraEnabled
+ public String SerialNumber;
+ @AuraEnabled
+ public String OrderNoC;
+
+ @AuraEnabled
public String Id;
@AuraEnabled
public String userID;
diff --git a/force-app/main/default/classes/buttonQISReportCtl.cls b/force-app/main/default/classes/buttonQISReportCtl.cls
index 56d8075..6836d25 100644
--- a/force-app/main/default/classes/buttonQISReportCtl.cls
+++ b/force-app/main/default/classes/buttonQISReportCtl.cls
@@ -164,6 +164,8 @@
List<User> user = new List<User>();
user = [SELECT Id,Alias,Alias__c from User];
+ System.debug('The value of user is: ' + user);
+
QIS_Report__c rac = new QIS_Report__c();
rac.Id = QId;
rac.QIS_Status__c = 'RC妫�娴嬩腑';
diff --git a/force-app/main/default/classes/lexConsumApply_FromAccountCtl.cls b/force-app/main/default/classes/lexConsumApply_FromAccountCtl.cls
new file mode 100644
index 0000000..d360ecb
--- /dev/null
+++ b/force-app/main/default/classes/lexConsumApply_FromAccountCtl.cls
@@ -0,0 +1,71 @@
+public with sharing class lexConsumApply_FromAccountCtl {
+ public lexConsumApply_FromAccountCtl() {
+
+ }
+ @AuraEnabled
+ public static List<FieldDefinition> fieldDefineApp(){
+ try {
+ List<FieldDefinition> rep = [Select QualifiedApiName, EntityDefinition.KeyPrefix, DurableId From FieldDefinition WHERE EntityDefinition.QualifiedApiName = 'Consum_Apply__c'];
+ return rep;
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ }
+
+ //鑾峰彇褰撳墠鐧诲綍浜虹殑 id
+ @AuraEnabled
+ public static UserResult UserInfo_Owner() {
+ UserResult result = new UserResult();
+ ID myUserID = UserInfo.getUserId();
+ try {
+ User tempUser =
+ [select Id,isFormal_Stuff__c,FirstName,LastName from user where id = : myUserID ];
+ result.id = tempUser.Id;
+ result.isFormalStuff = tempUser.isFormal_Stuff__c;
+ result.firstName = tempUser.FirstName;
+ result.lastName = tempUser.LastName;
+ } catch (exception e) {
+
+ result.result = e.getMessage();
+ }
+ return result;
+ }
+
+ @AuraEnabled
+ public static InitData init(String recordId){
+ InitData res = new initData();
+ try {
+ Account rep = [select Id,Name,Hospital__c,Department_Class__c from Account where Id =: recordId];
+ res.name = rep.Name;
+ res.hospitalName = rep.Hospital__c;
+ res.departClass = rep.Department_Class__c;
+ return res;
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ }
+ public class InitData{
+ @AuraEnabled
+ public String hospitalName;
+ @AuraEnabled
+ public String departClass;
+ @AuraEnabled
+ public String name;
+ }
+
+ public class UserResult {
+ @AuraEnabled
+ public string result;
+ public UserResult( ) {
+ result = 'Success';
+ }
+ @AuraEnabled
+ public string id;
+ @AuraEnabled
+ public Boolean isFormalStuff;
+ @AuraEnabled
+ public string firstName;
+ @AuraEnabled
+ public string lastName;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexConsumApply_FromAccountCtl.cls-meta.xml b/force-app/main/default/classes/lexConsumApply_FromAccountCtl.cls-meta.xml
new file mode 100644
index 0000000..45cccbd
--- /dev/null
+++ b/force-app/main/default/classes/lexConsumApply_FromAccountCtl.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>57.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexConsumApply_FromOPDPlanCtl.cls b/force-app/main/default/classes/lexConsumApply_FromOPDPlanCtl.cls
new file mode 100644
index 0000000..f13a3f6
--- /dev/null
+++ b/force-app/main/default/classes/lexConsumApply_FromOPDPlanCtl.cls
@@ -0,0 +1,81 @@
+public with sharing class lexConsumApply_FromOPDPlanCtl {
+ public lexConsumApply_FromOPDPlanCtl() {
+
+ }
+
+ @AuraEnabled
+ public static List<FieldDefinition> fieldDefineApp(){
+ try {
+ List<FieldDefinition> rep = [Select QualifiedApiName, EntityDefinition.KeyPrefix, DurableId From FieldDefinition WHERE EntityDefinition.QualifiedApiName = 'Consum_Apply__c'];
+ return rep;
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ }
+
+ //鑾峰彇褰撳墠鐧诲綍浜虹殑 id
+ @AuraEnabled
+ public static UserResult UserInfo_Owner() {
+ UserResult result = new UserResult();
+ ID myUserID = UserInfo.getUserId();
+ try {
+ User tempUser =
+ [select Id,isFormal_Stuff__c,FirstName,LastName from user where id = : myUserID ];
+ result.id = tempUser.Id;
+ result.isFormalStuff = tempUser.isFormal_Stuff__c;
+ result.firstName = tempUser.FirstName;
+ result.lastName = tempUser.LastName;
+ } catch (exception e) {
+
+ result.result = e.getMessage();
+ }
+ return result;
+ }
+
+ @AuraEnabled
+ public static InitData init(String recordId){
+ InitData res = new initData();
+ try {
+ OPDPlan__c rep = [select Id,OPDPlan_Report__c,Name,Rental_Apply2__c,HospitalName__c,OCM_category_Name__c,Account_Laboratory__c from OPDPlan__c where Id =: recordId];
+ res.opdPlan = rep.OPDPlan_Report__c;
+ res.name = rep.Name;
+ res.rentalApply2 = rep.Rental_Apply2__c;
+ res.hospitalName = rep.HospitalName__c;
+ res.ocmCategoryName = rep.OCM_category_Name__c;
+ res.accountLab = rep.Account_Laboratory__c;
+ return res;
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ }
+ public class InitData{
+ @AuraEnabled
+ public String opdPlan;
+ @AuraEnabled
+ public String rentalApply2;
+ @AuraEnabled
+ public String hospitalName;
+ @AuraEnabled
+ public String ocmCategoryName;
+ @AuraEnabled
+ public String accountLab;
+ @AuraEnabled
+ public String name;
+ }
+
+ public class UserResult {
+ @AuraEnabled
+ public string result;
+ public UserResult( ) {
+ result = 'Success';
+ }
+ @AuraEnabled
+ public string id;
+ @AuraEnabled
+ public Boolean isFormalStuff;
+ @AuraEnabled
+ public string firstName;
+ @AuraEnabled
+ public string lastName;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexConsumApply_FromOPDPlanCtl.cls-meta.xml b/force-app/main/default/classes/lexConsumApply_FromOPDPlanCtl.cls-meta.xml
new file mode 100644
index 0000000..45cccbd
--- /dev/null
+++ b/force-app/main/default/classes/lexConsumApply_FromOPDPlanCtl.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>57.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexNewSparePartsLoanApplicationCtl.cls b/force-app/main/default/classes/lexNewSparePartsLoanApplicationCtl.cls
new file mode 100644
index 0000000..0783ac8
--- /dev/null
+++ b/force-app/main/default/classes/lexNewSparePartsLoanApplicationCtl.cls
@@ -0,0 +1,143 @@
+public with sharing class lexNewSparePartsLoanApplicationCtl {
+ public lexNewSparePartsLoanApplicationCtl() {
+
+ }
+
+ //鑾峰彇褰撳墠鐧诲綍浜虹殑 id
+ @AuraEnabled
+ public static UserResult UserInfo_Owner() {
+ UserResult result = new UserResult();
+ ID myUserID = UserInfo.getUserId();
+ try {
+ User tempUser =
+ [select Id,Job_Category__c,isFormal_Stuff__c,FirstName,LastName,Province__c from user where id = : myUserID ];
+ result.id = tempUser.Id;
+ result.isFormalStuff = tempUser.isFormal_Stuff__c;
+ result.firstName = tempUser.FirstName;
+ result.lastName = tempUser.LastName;
+ result.userProvince = tempUser.Province__c;
+ result.userJobCategory = tempUser.Job_Category__c;
+ } catch (exception e) {
+
+ result.result = e.getMessage();
+ }
+ return result;
+ }
+
+ @AuraEnabled
+ public static InitData init(String recordId){
+ InitData res = new initData();
+ try {
+ OPDPlan__c rep = [select Id,Related_Opportunity1_ID__r.Id,Campaign__r.Id,Status__c,Rental_Apply_Flag__c,OPDType__c,CampaignStatus__c,CampaignRecodeTypeId__c,Internal_in_charge_province__c,StayOrNot__c,OriginalOpdPlanApplication__c,IF_Approved__c,Approved_No__c,Approved_Status__c,Rental_Apply2__c,OriginalOpdPlan__c,CampaignName__c,Related_Opportunity1_Name__c,NoOpp_Reason__c,Account_Laboratory__c,OCM_category_Name__c,HospitalName__c,Name,IsJump__c,JumpCause__c,originalOpdRentalApply__c,RentalApplyName__c from OPDPlan__c where Id =: recordId];
+ res.opdPlanId = rep.Id;
+ res.opdCampaignId = rep.Campaign__r.Id == null ? '' : rep.Campaign__r.Id;
+ res.opdOpportunityId = rep.Related_Opportunity1_ID__r.Id == null ? '' : rep.Related_Opportunity1_ID__r.Id;
+ res.opdStatus = rep.Status__c == null ? '' : rep.Status__c;
+ res.opdRentalApplyFlag = rep.Rental_Apply_Flag__c;
+ res.opdType = rep.OPDType__c == null ? '' : rep.OPDType__c;
+ res.opdCampaignStatus = rep.CampaignStatus__c == null ? '' : rep.CampaignStatus__c;
+ res.opdCampaignRecodeTypeId = rep.CampaignRecodeTypeId__c == null ? '' : rep.CampaignRecodeTypeId__c;
+ res.opdInternalinchargeprovince = rep.Internal_in_charge_province__c == null ? '' : rep.Internal_in_charge_province__c;
+ res.opdStayOrNot = rep.StayOrNot__c == null ? '' : rep.StayOrNot__c;
+ res.opdOriginalOpdPlanApplication = rep.OriginalOpdPlanApplication__c== null ? '' : rep.OriginalOpdPlanApplication__c;
+ res.opdIFApproved = rep.IF_Approved__c;
+ res.opdApprovedNo = rep.Approved_No__c == null ? '' : rep.Approved_No__c;
+ res.opdApprovedStatus = rep.Approved_Status__c == null ? '' : rep.Approved_Status__c;
+ res.opdRentalApply2 = rep.Rental_Apply2__c == null ? '' : rep.Rental_Apply2__c;
+ res.opdOriginalOpdPlan = rep.OriginalOpdPlan__c == null ? '' : rep.OriginalOpdPlan__c;
+ res.opdCampaignName = rep.CampaignName__c == null ? '' : rep.CampaignName__c;
+ res.opdRelatedOpportunity1Name = rep.Related_Opportunity1_Name__c == null ? '' : rep.Related_Opportunity1_Name__c;
+ res.opdNoOppReason = rep.NoOpp_Reason__c == null ? '' : rep.NoOpp_Reason__c;
+ res.opdAccountLaboratory = rep.Account_Laboratory__c == null ? '' : rep.Account_Laboratory__c;
+ res.opdOCMcategoryName = rep.OCM_category_Name__c == null ? '' : rep.OCM_category_Name__c;
+ res.opdHospitalName = rep.HospitalName__c == null ? '' : rep.HospitalName__c;
+ res.opdName = rep.Name == null ? '' : rep.Name;
+ res.opdIsJump = rep.IsJump__c;
+ res.opdJumpCause = rep.JumpCause__c == null ? '' : rep.JumpCause__c;
+ res.opdoriginalOpdRentalApply = rep.originalOpdRentalApply__c == null ? '' : rep.originalOpdRentalApply__c;
+ res.opdRentalApplyName = rep.RentalApplyName__c == null ? '' : rep.RentalApplyName__c;
+ res.opdStatusProcessState = System.Label.StatusProcessState;
+ return res;
+ } catch (Exception e) {
+ throw new AuraHandledException(e.getMessage());
+ }
+ }
+ public class InitData{
+ @AuraEnabled
+ public String opdPlanId;
+ @AuraEnabled
+ public String opdCampaignId;
+ @AuraEnabled
+ public String opdOpportunityId;
+ @AuraEnabled
+ public String opdStatus;
+ @AuraEnabled
+ public Decimal opdRentalApplyFlag;
+ @AuraEnabled
+ public String opdType;
+ @AuraEnabled
+ public String opdCampaignStatus;
+ @AuraEnabled
+ public String opdCampaignRecodeTypeId;
+ @AuraEnabled
+ public String opdInternalinchargeprovince;
+ @AuraEnabled
+ public String opdStayOrNot;
+ @AuraEnabled
+ public String opdOriginalOpdPlanApplication;
+ @AuraEnabled
+ public Boolean opdIFApproved;
+ @AuraEnabled
+ public String opdApprovedNo;
+ @AuraEnabled
+ public String opdApprovedStatus;
+ @AuraEnabled
+ public String opdRentalApply2;
+ @AuraEnabled
+ public String opdOriginalOpdPlan;
+ @AuraEnabled
+ public String opdCampaignName;
+ @AuraEnabled
+ public String opdRelatedOpportunity1Name;
+ @AuraEnabled
+ public String opdNoOppReason;
+ @AuraEnabled
+ public String opdAccountLaboratory;
+ @AuraEnabled
+ public String opdOCMcategoryName;
+ @AuraEnabled
+ public String opdHospitalName;
+ @AuraEnabled
+ public String opdName;
+ @AuraEnabled
+ public Boolean opdIsJump;
+ @AuraEnabled
+ public String opdJumpCause;
+ @AuraEnabled
+ public String opdoriginalOpdRentalApply;
+ @AuraEnabled
+ public String opdRentalApplyName;
+ @AuraEnabled
+ public String opdStatusProcessState;
+ }
+
+ public class UserResult {
+ @AuraEnabled
+ public string result;
+ public UserResult( ) {
+ result = 'Success';
+ }
+ @AuraEnabled
+ public string id;
+ @AuraEnabled
+ public Boolean isFormalStuff;
+ @AuraEnabled
+ public string firstName;
+ @AuraEnabled
+ public string lastName;
+ @AuraEnabled
+ public string userProvince;
+ @AuraEnabled
+ public string userJobCategory;
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/lexNewSparePartsLoanApplicationCtl.cls-meta.xml b/force-app/main/default/classes/lexNewSparePartsLoanApplicationCtl.cls-meta.xml
new file mode 100644
index 0000000..45cccbd
--- /dev/null
+++ b/force-app/main/default/classes/lexNewSparePartsLoanApplicationCtl.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>57.0</apiVersion>
+ <status>Active</status>
+</ApexClass>
\ No newline at end of file
diff --git a/force-app/main/default/classes/otherButtonRepairController.cls b/force-app/main/default/classes/otherButtonRepairController.cls
index 1907e8d..9e58449 100644
--- a/force-app/main/default/classes/otherButtonRepairController.cls
+++ b/force-app/main/default/classes/otherButtonRepairController.cls
@@ -7,12 +7,13 @@
public static InitData init(String recordId){
InitData res = new initData();
try{
- Repair__c report = [SELECT AWS_Data_Id__c,SAP_condition__c,DOJ_Status__c,DW_Sign__c,Incharge_Staff__r.Id,URF_Reapir__c,Recall_Correspondence__c,Day_later_30__c,Dealer__r.Id,Status__c,URFLimitSerial__c,Maintenance_Contract__r.Id,FSE_ApplyForRepair_time__c,Delivered_Product__r.Id,Asset_Owner__c,State_Hospital__c,is_aohui_product__c,Sales_Dept_HP__c,RCCD__c,Quick_Repair_Sign__c,RepairSource__c,FSE_State__c,VM_Maintenance_Contract__c,Maintenance_Contract__c,NewProductGuarante_Txt__c,Number_of_EffectiveContract__c,Detailed_Address__c,Status1__c,Rental_Apply_Equipment_Set_Detail__c,Rental_Apply_Equipment_Set_Detail_Id__c,Latest_Collect_Date_Priority__c,if_Rental_Apply__c,Offer_Rental_New__c,ProduceCompany_hand__c,CFDA_No_Hand__c,MBC_AwareDate__c,InsReport__c,QIS_ID__c,On_Call_ID__c,RepairSubOrder__c,ProductFailureRelated__c,Delay15Min__c,ProblemOccurredSelect__c,Repair_Source__c ,Failure_Occurrence_Date__c ,MaintenanceContractType__c ,OperationOrExaminationName__c ,WhatProject__c ,FailureQInHospital__c ,ReportAdverseEvents__c ,InformationFrom__c ,AfterFailureInformation__c ,ProblemOccurred__c ,SupportingProducts__c ,ifDeadHurt__c ,UseFailProductFinish__c ,DelayReportReason__c ,BreakORFallOff__c ,DateReceiptQuestions__c ,DeliveryLogisticsAnnotation__c ,DeliveryLogisticsNo__c ,engineerSendDate__c ,DeliveryLogisticsMode__c ,RepairApplicantDepartment__c ,RepairApplicantHospital__c ,RepairApplicant__c ,Repair_Detail__c ,Returns_Product_way__c ,work_location_select__c ,On_site_repair__c ,SalesOfficeCode_selection__c ,Incharge_Staff_Contact__c ,Incharge_Staff__c ,Dealer__c ,RepairCostType__c ,Account__c,Department_Class__c ,Hospital__c ,PaperRepairRequestNo__c ,part_arrangement_complete__c,Repair_Shipped_Date__c,OCSMAdministrativeReportStatus__c,Incharge_Staff_Email__c,Name,HP_Name__c,Delivered_Product__c,
+ Repair__c report = [SELECT HP_active__c,AWS_Data_Id__c,SAP_condition__c,DOJ_Status__c,DW_Sign__c,Incharge_Staff__r.Id,URF_Reapir__c,Recall_Correspondence__c,Day_later_30__c,Dealer__r.Id,Status__c,URFLimitSerial__c,Maintenance_Contract__r.Id,FSE_ApplyForRepair_time__c,Delivered_Product__r.Id,Asset_Owner__c,State_Hospital__c,is_aohui_product__c,Sales_Dept_HP__c,RCCD__c,Quick_Repair_Sign__c,RepairSource__c,FSE_State__c,VM_Maintenance_Contract__c,Maintenance_Contract__c,NewProductGuarante_Txt__c,Number_of_EffectiveContract__c,Detailed_Address__c,Status1__c,Rental_Apply_Equipment_Set_Detail__c,Rental_Apply_Equipment_Set_Detail_Id__c,Latest_Collect_Date_Priority__c,if_Rental_Apply__c,Offer_Rental_New__c,ProduceCompany_hand__c,CFDA_No_Hand__c,MBC_AwareDate__c,InsReport__c,QIS_ID__c,On_Call_ID__c,RepairSubOrder__c,ProductFailureRelated__c,Delay15Min__c,ProblemOccurredSelect__c,Repair_Source__c ,Failure_Occurrence_Date__c ,MaintenanceContractType__c ,OperationOrExaminationName__c ,WhatProject__c ,FailureQInHospital__c ,ReportAdverseEvents__c ,InformationFrom__c ,AfterFailureInformation__c ,ProblemOccurred__c ,SupportingProducts__c ,ifDeadHurt__c ,UseFailProductFinish__c ,DelayReportReason__c ,BreakORFallOff__c ,DateReceiptQuestions__c ,DeliveryLogisticsAnnotation__c ,DeliveryLogisticsNo__c ,engineerSendDate__c ,DeliveryLogisticsMode__c ,RepairApplicantDepartment__c ,RepairApplicantHospital__c ,RepairApplicant__c ,Repair_Detail__c ,Returns_Product_way__c ,work_location_select__c ,On_site_repair__c ,SalesOfficeCode_selection__c ,Incharge_Staff_Contact__c ,Incharge_Staff__c ,Dealer__c ,RepairCostType__c ,Account__c,Department_Class__c ,Hospital__c ,PaperRepairRequestNo__c ,part_arrangement_complete__c,Repair_Shipped_Date__c,OCSMAdministrativeReportStatus__c,Incharge_Staff_Email__c,Name,HP_Name__c,Delivered_Product__c,
Repair_Product_Serial_No__c,Service_Repair_No__c,Repair_Firstestimated_Date__c,
Repair_Estimated_Date__c,RC_information__c,Id,OCSMAdministrativeReportNumber__c,
OCSMAdministrativeReportDate__c,Aware_date__c,PAE_Determine__c,ETQ_UPLOAD_STATUS__c,
AE_DetermineResult__c,PAE_DetermineAC__c,Repair_Inspection_Date__c,Contain_UseRSA__c FROM Repair__c WHERE Id =: recordId LIMIT 1];
System.debug(LoggingLevel.INFO, '*** opp: ' + report);
+ res.HPActiveC = report.HP_active__c;
res.detailedAddress = report.Detailed_Address__c;
res.numberofEffectiveContract = report.Number_of_EffectiveContract__c;
res.newProductGuaranteTxt = report.NewProductGuarante_Txt__c;
@@ -430,6 +431,8 @@
public class InitData{
@AuraEnabled
+ public String HPActiveC;
+ @AuraEnabled
public String detailedAddress;
@AuraEnabled
public String numberofEffectiveContract;
diff --git a/force-app/main/default/components/RelationListPagingCmp.component b/force-app/main/default/components/RelationListPagingCmp.component
index b37cf06..fe2b49f 100644
--- a/force-app/main/default/components/RelationListPagingCmp.component
+++ b/force-app/main/default/components/RelationListPagingCmp.component
@@ -160,7 +160,7 @@
<apex:repeat value="{!titleRight}" var="t">
<!-- 20230511 ljh lightning start -->
<!-- <td class="col_{!columnRightCss[cnt]} "> -->
- <td class="col_{!columnRightCss[cnt]} colViewing" onclick ="test(this);return false;">
+ <td class="col_{!columnRightCss[cnt]} colViewing" onclick ="ToggleWidth(this);return false;">
<!-- 20230511 ljh lightning end -->
<apex:outputPanel layout="none" rendered="{!Not(noSortHeader)}">
<a href="#" name="out_Div_a" onclick="sortTableJs('{!cnt + titleLeft.size}');return false;" style="text-decoration: underline;">
@@ -187,14 +187,14 @@
<!--銆�宸� 銉囥兗銈裤儶銈广儓 -->
<div id="in_Div_L">
<!-- 20230512 ljh lightning add table-layout:fixed" -->
- <table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;table-layout:fixed" border="" id="tableData_L">
+ <table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;table-layout:fixed;" border="" id="tableData_L">
<apex:variable value="{!1}" var="cnt" />
<apex:repeat value="{!pageController.viewList}" var="or" id="oppTable_L">
<tr class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}" onmouseover="if (window.hiOn){hiOn(this);} " onmouseout="if (window.hiOff){hiOff(this);} " onblur="if (window.hiOff){hiOff(this);}" onfocus="if (window.hiOn){hiOn(this);}">
<apex:outputPanel layout="none" rendered="{!hasChkBox}">
<!-- 20230512 ljh lightning add style="width:32px;" -->
- <td class="dataCellBorder1" style="width:32px;" align="center">
+ <td class="dataCellBorder1" style="width:32px;height:38px;" align="center">
<apex:outputPanel layout="none" rendered="{!Not(isRadioBox)}">
<apex:inputCheckbox value="{!or.check}" id="rowCheck" styleClass="rowchkcls" disabled="{!!or.canEdit}" onchange="setChangeFlg('{!or.lineNo}')"/>
</apex:outputPanel>
@@ -206,7 +206,8 @@
</td>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!Not(hasChkBox)}">
- <td class="col_noChk">
+ <!-- 20230602 ljh 楂樺害鍥哄畾 38px; -->
+ <td class="col_noChk" style="height: 38px;">
<apex:inputCheckbox value="{!or.check}" styleClass="rowchkcls" style="display:none"/>
<apex:inputText value="{!or.orderNo}" styleClass="ordernocls" style="display:none"/>
</td>
@@ -214,7 +215,8 @@
<apex:variable value="{!0}" var="cnt_2" />
<apex:repeat value="{!columnsLeftApi}" var="c">
- <td class="dataCellBorder1 col_{!columnLeftCss[cnt_2]}">
+ <!-- 20230602 ljh 楂樺害鍥哄畾 38px; -->
+ <td class="dataCellBorder1 col_{!columnLeftCss[cnt_2]}" style="height: 38px;">
<apex:outputPanel rendered="{!(c.size==1 && columnLeftRW[c[0]]=='r')}" layout="none">
<!-- in_Div_L銇瓵ccount鍚嶃伅鐗规畩瀵惧繙銆併儶銉炽偗銇仚銈� -->
<apex:outputPanel rendered="{!c[0]=='Name'}" layout="none">
@@ -250,7 +252,7 @@
<tr class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}" onmouseover="if (window.hiOn){hiOn(this);} " onmouseout="if (window.hiOff){hiOff(this);} " onblur="if (window.hiOff){hiOff(this);}" onfocus="if (window.hiOn){hiOn(this);}">
<apex:variable value="{!0}" var="cnt_3" />
<apex:repeat value="{!columnsRightApi}" var="c">
- <td class="dataCellBorder1 col_{!columnRightCss[cnt_3]}">
+ <td class="dataCellBorder1 col_{!columnRightCss[cnt_3]}" style="height: 38px;">
<apex:outputPanel rendered="{!(c.size==1 && columnRightRW[c[0]]=='r')}" layout="none">
<apex:outputField value="{!or.sobj[c[0]]}"/>
</apex:outputPanel>
@@ -374,28 +376,52 @@
}
// 20230523 ljh lightning start
if(i == 0){
+ sbwidth = scrollbarWidth();
+ i++;
tableWidth = j$('body .pbBody table#tableHeader').width();
+ // var widthTemp = 0;
j$('body .pbBody table#tableHeader tr.headerRow td').each(function() {
var colClass = getColClassName(this);
if (colClass != 'col_Scroll') {
- listColClassWidthMap[colClass] = j$('body .pbBody table.list tr.headerRow td.' + colClass).width();
+ var temp = j$('body .pbBody table.list tr.headerRow td.' + colClass).width();
+ listColClassWidthMap[colClass] = temp;
+ //widthTemp += temp;
}
});
- i++;
+ var blockWidthNew = j$(escapeVfId('allPage:allForm:searchBlock')).width() - j$('div#out_Div_L').width()-sbwidth;
+ // console.log(widthTemp+'~'+blockWidthNew+'~'+tableWidth);
+ var tableHeader_L = j$(escapeVfId('tableHeader_L')).width();
+ j$('div#in_Div_L').css('width', tableHeader_L+ 'px');
+ j$('table#tableData_L').css('width', tableHeader_L + 'px');
+ // j$('table#tableHeader').css('width', (tableWidth + 2) + 'px');
+ if(tableWidth > blockWidthNew){
+ j$('div#in_Div').css('width', blockWidthNew + 'px'); // 20230519 ljh
+ j$('div#out_Div').css('width', blockWidthNew + 'px'); // 20230519 ljh
+ }
+ j$('div#in_Div').scroll(function() {
+ j$('div#out_Div').scrollLeft(j$(this).scrollLeft());
+ j$('div#in_Div_L').scrollTop(j$(this).scrollTop());
+ });
+ j$('div#out_Div').scroll(function() {
+ j$('div#in_Div').scrollLeft(j$(this).scrollLeft());
+ });
+ j$('div#in_Div_L').scroll(function() {
+ j$('div#in_Div').scrollTop(j$(this).scrollTop());
+ });
+
}
// windowResize();
-
// 銈广偗銉兗銉�ｅ嫊
- j$('div#in_Div').scroll(function() {
- j$('div#out_Div').scrollLeft(j$(this).scrollLeft());
- j$('div#in_Div_L').scrollTop(j$(this).scrollTop());
- });
- j$('div#out_Div').scroll(function() {
- j$('div#in_Div').scrollLeft(j$(this).scrollLeft());
- });
- j$('div#in_Div_L').scroll(function() {
- j$('div#in_Div').scrollTop(j$(this).scrollTop());
- });
+ // j$('div#in_Div').scroll(function() {
+ // j$('div#out_Div').scrollLeft(j$(this).scrollLeft());
+ // j$('div#in_Div_L').scrollTop(j$(this).scrollTop());
+ // });
+ // j$('div#out_Div').scroll(function() {
+ // j$('div#in_Div').scrollLeft(j$(this).scrollLeft());
+ // });
+ // j$('div#in_Div_L').scroll(function() {
+ // j$('div#in_Div').scrollTop(j$(this).scrollTop());
+ // });
// 20230523 ljh lightning end
});
diff --git a/force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.css b/force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.css
new file mode 100644
index 0000000..95c1c55
--- /dev/null
+++ b/force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.css
@@ -0,0 +1,22 @@
+.holder{
+ position: relative;
+ display: inline-block;
+ width: 80px;
+ height: 80px;
+ text-align: center;
+}
+
+.container .uiContainerManager{
+ display : none !important;
+}
+.toast{
+ border: 1px solid #c9c9c9;
+ border-radius: 10px;
+ width: 50%;
+ margin: 0 auto;
+ font-size: 18px;
+ font-weight: bold;
+ padding: 10px 20px;
+ background: #feb75d;
+ display: flex;
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.html b/force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.html
index d044dbb..7c59830 100644
--- a/force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.html
+++ b/force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.html
@@ -1,5 +1,13 @@
<template>
- <div class="exampleHolder" if:true={IsLoading}>
+ <div class="holder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
</div>
-</template>
\ No newline at end of file
+ <div if:false={IsLoading} class="toast">
+ <span style="padding: 10px;">{msg}</span>
+ <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse" onclick={closeAction} title="Close" style="background-color: #e5e4e2;margin-top: 15px;">
+ <lightning-icon class="greyIcon" icon-name="utility:close" alternative-text="Connected" variant="inverse" size="small"
+ title="Close" style="color: black;"></lightning-icon>
+ <span class="slds-assistive-text">Close</span>
+ </button>
+ </div>
+ </template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.js b/force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.js
index 1ac6018..5f363ea 100644
--- a/force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.js
+++ b/force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.js
@@ -11,35 +11,36 @@
export default class LexAccessory_Add extends LightningElement {
@api recordId;
IsLoading = true;
+ @api rentalApplyEquipmentSetDetailIds;
+ msg;
@wire(CurrentPageReference)
getStateParameters(currentPageReference) {
+ console.log(111);
+ console.log(currentPageReference);
if (currentPageReference) {
const urlValue = currentPageReference.state.recordId;
if (urlValue) {
let str = `${urlValue}`;
this.recordId = str;
+ this.connectedCallback();
}
}
}
connectedCallback(){
this.IsLoading = false;
- if (this.recordId.length == 0) {
- this.ShowToastEvent("璇烽�夋嫨涓�涓�熷嚭澶囧搧閰嶅涓�瑙堟槑缁嗕俊鎭�", "warning");
+ if (this.rentalApplyEquipmentSetDetailIds == undefined || this.rentalApplyEquipmentSetDetailIds.length == 0) {
+ this.msg = "璇烽�夋嫨涓�涓�熷嚭澶囧搧閰嶅涓�瑙堟槑缁嗕俊鎭�";
+ return;
} else {
- window.open("/apex/AccessoryAdd?recid=" + this.recordId, "_top");
+ window.open("/apex/AccessoryAdd?recid=" + this.rentalApplyEquipmentSetDetailIds, "_top");
+ this.closeAction();
}
}
- //寮规
- ShowToastEvent(msg,type) {
- const event = new ShowToastEvent({
- title: '',
- message: msg,
- variant: type
- });
- this.dispatchEvent(event);
+ closeAction() {
+ //杩斿洖褰撳墠鐨勫鍝佺敵璇�
+ window.open("/"+this.recordId,'_self');
}
-
-}
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.js-meta.xml b/force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.js-meta.xml
index 3392981..3a0a2c6 100644
--- a/force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.js-meta.xml
+++ b/force-app/main/default/lwc/lexAccessory_Add/lexAccessory_Add.js-meta.xml
@@ -1,11 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
-<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
- <apiVersion>54.0</apiVersion>
- <isExposed>true</isExposed>
- <targets>
- <target>lightning__RecordPage</target>
- <target>lightning__AppPage</target>
- <target>lightning__HomePage</target>
- <target>lightning__RecordAction</target>
- </targets>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexEquipmentRentalApply_FromSA">
+ <apiVersion>56.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>
+ <!-- 瀹氫箟鍙橀噺 -->
+ <targetConfigs>
+ <targetConfig targets="lightning__FlowScreen">
+ <!-- name js涓娇鐢ㄧ殑鍙橀噺锛屼粠灞忓箷娴佷腑鑾峰彇鍙傛暟 label 鍦ㄥ睆骞曟祦鐨勮LWC鐨勮缃腑鏄剧ず -->
+ <property name="recordId" type="String" label="recordId"/>
+ <property name="rentalApplyEquipmentSetDetailIds" type="String[]" label="rentalApplyEquipmentSetDetailIds"/>
+ </targetConfig>
+ </targetConfigs>
</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexAccessory_Select/lexAccessory_Select.js b/force-app/main/default/lwc/lexAccessory_Select/lexAccessory_Select.js
index ddd6f9c..71c0086 100644
--- a/force-app/main/default/lwc/lexAccessory_Select/lexAccessory_Select.js
+++ b/force-app/main/default/lwc/lexAccessory_Select/lexAccessory_Select.js
@@ -24,6 +24,7 @@
}
connectedCallback(){
+ console.log("---------------id-------",this.recordId);
this.IsLoading = false;
if(this.recordId){
window.open("/apex/AccessorySelect?pt_recid="+this.recordId, "_top");
diff --git a/force-app/main/default/lwc/lexAccessory_Select/lexAccessory_Select.js-meta.xml b/force-app/main/default/lwc/lexAccessory_Select/lexAccessory_Select.js-meta.xml
index 3392981..622f243 100644
--- a/force-app/main/default/lwc/lexAccessory_Select/lexAccessory_Select.js-meta.xml
+++ b/force-app/main/default/lwc/lexAccessory_Select/lexAccessory_Select.js-meta.xml
@@ -1,11 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
- <apiVersion>54.0</apiVersion>
- <isExposed>true</isExposed>
- <targets>
- <target>lightning__RecordPage</target>
- <target>lightning__AppPage</target>
- <target>lightning__HomePage</target>
- <target>lightning__RecordAction</target>
- </targets>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexEquipmentRentalApply_FromSA">
+ <apiVersion>56.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>
+ <!-- 瀹氫箟鍙橀噺 -->
+ <targetConfigs>
+ <targetConfig targets="lightning__FlowScreen">
+ <!-- name js涓娇鐢ㄧ殑鍙橀噺锛屼粠灞忓箷娴佷腑鑾峰彇鍙傛暟 label 鍦ㄥ睆骞曟祦鐨勮LWC鐨勮缃腑鏄剧ず -->
+ <property name="recordId" type="String" label="recordId"/>
+ </targetConfig>
+ </targetConfigs>
</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexAddress/lexAddress.js b/force-app/main/default/lwc/lexAddress/lexAddress.js
index 33a766b..dbc0d28 100644
--- a/force-app/main/default/lwc/lexAddress/lexAddress.js
+++ b/force-app/main/default/lwc/lexAddress/lexAddress.js
@@ -50,9 +50,7 @@
}
}).catch(error => {
console.log(error);
- }).finally(() => {
-
- });
+ })
}
//鐩磋繑鏀惰揣鍦板潃
diff --git a/force-app/main/default/lwc/lexApplyForRepair/lexApplyForRepair.js b/force-app/main/default/lwc/lexApplyForRepair/lexApplyForRepair.js
index 3cc9064..fd53bdb 100644
--- a/force-app/main/default/lwc/lexApplyForRepair/lexApplyForRepair.js
+++ b/force-app/main/default/lwc/lexApplyForRepair/lexApplyForRepair.js
@@ -55,7 +55,6 @@
var status = this.StatusC;
if (status != '寰呭鐞�') {
this.ShowToastEvent("鎶ヤ慨瀛愬崟鐨勭姸鎬佷笉鏄� 寰呭鐞� 鏃犳硶鐢宠淇悊", "error")
- // alert('鎶ヤ慨瀛愬崟鐨勭姸鎬佷笉鏄� 寰呭鐞� 鏃犳硶鐢宠淇悊');
return;
}
var url = '/apex/ChoiceAsset?Id=' + this.Id + '&Type=Repair';
diff --git a/force-app/main/default/lwc/lexCancelSelect/lexCancelSelect.js b/force-app/main/default/lwc/lexCancelSelect/lexCancelSelect.js
index e8fe447..c2ff279 100644
--- a/force-app/main/default/lwc/lexCancelSelect/lexCancelSelect.js
+++ b/force-app/main/default/lwc/lexCancelSelect/lexCancelSelect.js
@@ -1,3 +1,10 @@
+/*
+ * @Description:
+ * @Author: [lijinhuan]
+ * @Date: 2023-04-26 14:14:37
+ * @LastEditors: [lijinhuan]
+ * @LastEditTime: 2023-06-24 18:04:14
+ */
import { LightningElement,api, track, wire } from 'lwc';
import {CurrentPageReference} from 'lightning/navigation';
import { CloseActionScreenEvent } from 'lightning/actions';
@@ -9,45 +16,14 @@
id;
RentalApplyId;
Status;
- @wire(CurrentPageReference)
- getStateParameters(currentPageReference){
- console.log("杩涘叆椤甸潰");
- console.log(currentPageReference);
- if(currentPageReference){
- const urvalue=currentPageReference.state.recordId;
- if(urvalue){
- let str=`${urvalue}`;
- console.log('str');
- console.log(str);
- this.recordId=str;
- }
- }
- }
-
-
-
connectedCallback(){
console.log(this.recordId);
- init({recordId:this.recordId}).then(result=>{
- console.log(result);
- if(result!=null){
- this.id=result.id;
- this.RentalApplyId=result.RentalApplyId;
- this.Status=result.Status;
- this.cancelSubmit().then(res=>{
- this.IsLoading=false;
- this.dispatchEvent(new CloseActionScreenEvent());
- });
- }
- }).catch(err=>{
- console.log("error:");
- console.log(err);
- }).finally(()=>{
-
- });
+ // window.open("/apex/EquipmentRentalCancel?raid="+this.recordId,'cancelSelect','width=500,height=250');
+ window.open("/apex/EquipmentRentalCancel?raid="+this.recordId);
+ this.closeAction();
}
-
- async cancelSubmit(){
- window.open("/apex/EquipmentRentalCancel?raid="+this.RentalApplyId,'cancelSelect','width=500,height=250');
+ closeAction() {
+ //杩斿洖褰撳墠鐨勫鍝佺敵璇�
+ window.open("/"+this.recordId,'_self');
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexConsumApply_FromAccount/lexConsumApply_FromAccount.html b/force-app/main/default/lwc/lexConsumApply_FromAccount/lexConsumApply_FromAccount.html
new file mode 100644
index 0000000..ae58c6c
--- /dev/null
+++ b/force-app/main/default/lwc/lexConsumApply_FromAccount/lexConsumApply_FromAccount.html
@@ -0,0 +1,5 @@
+<template>
+ <div class="dispatchOCSMQARAHolder" 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/lexConsumApply_FromAccount/lexConsumApply_FromAccount.js b/force-app/main/default/lwc/lexConsumApply_FromAccount/lexConsumApply_FromAccount.js
new file mode 100644
index 0000000..161d51d
--- /dev/null
+++ b/force-app/main/default/lwc/lexConsumApply_FromAccount/lexConsumApply_FromAccount.js
@@ -0,0 +1,97 @@
+import { LightningElement,wire,track,api} from 'lwc';
+import { CurrentPageReference, NavigationMixin} from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import init from '@salesforce/apex/lexConsumApply_FromAccountCtl.init';
+import fieldDefineApp from '@salesforce/apex/lexConsumApply_FromAccountCtl.fieldDefineApp';
+import UserInfo_Owner from '@salesforce/apex/lexConsumApply_FromAccountCtl.UserInfo_Owner';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
+
+export default class LexConsumApply_FromAccount extends LightningElement {
+
+ @api recordId;
+ IsLoading = true;
+
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ console.log(111);
+ console.log(currentPageReference);
+
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ console.log("str");
+ console.log(str);
+ this.recordId = str;
+ }
+ }
+ }
+
+ connectedCallback(){
+ console.log(this.recordId);
+ init({
+ recordId: this.recordId
+ }).then(result=>{
+ UserInfo_Owner({}).then(res=>{
+ if(res.isFormalStuff == 'true'){
+ this.showToast('璇曠敤鏈熷唴锛屼笉鑳界敵璇�','warning');
+ return;
+ }else{
+
+ fieldDefineApp({}).then(resp=>{
+ var fieldmap = new Map();
+ for (var i=0; i< resp.length; i++) {
+ var record = resp[i];
+ fieldmap.set(record.QualifiedApiName,record.DurableId.toString().split('.')[1]);
+ }
+
+ })
+ .catch(e=>{console.log(e)})
+
+ const defaultValues = encodeDefaultFieldValues({
+ Hospital__c:result.hospitalName,
+ Strategic_dept__c:result.departClass,
+ Account__c:result.name,
+ Name:'*',
+ demo_purpose2__c:'OPD璇曠敤',
+ Person_In_Charge__c:res.lastName + res.firstName,
+ applyUser__c:res.lastName + res.firstName
+ });
+
+ this[NavigationMixin.Navigate]({
+ type: 'standard__objectPage',
+ attributes: {
+ objectApiName: 'Consum_Apply__c',
+ actionName: 'new'
+ },
+ state:{
+ defaultFieldValues: this.defaultValues
+ }
+ })
+ }
+ })
+ .catch(error => {
+ console.log("error");
+ console.log(error);
+ })
+ })
+
+ .catch(error => {
+ console.log("error");
+ console.log(error);
+ }).finally(() => {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ });
+ }
+
+ showToast(message, type) {
+ const evt = new ShowToastEvent({
+ title: '',
+ message: message,
+ variant: type
+ });
+ this.dispatchEvent(evt);
+ }
+
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexConsumApply_FromAccount/lexConsumApply_FromAccount.js-meta.xml b/force-app/main/default/lwc/lexConsumApply_FromAccount/lexConsumApply_FromAccount.js-meta.xml
new file mode 100644
index 0000000..622f243
--- /dev/null
+++ b/force-app/main/default/lwc/lexConsumApply_FromAccount/lexConsumApply_FromAccount.js-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexEquipmentRentalApply_FromSA">
+ <apiVersion>56.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>
+ <!-- 瀹氫箟鍙橀噺 -->
+ <targetConfigs>
+ <targetConfig targets="lightning__FlowScreen">
+ <!-- name js涓娇鐢ㄧ殑鍙橀噺锛屼粠灞忓箷娴佷腑鑾峰彇鍙傛暟 label 鍦ㄥ睆骞曟祦鐨勮LWC鐨勮缃腑鏄剧ず -->
+ <property name="recordId" type="String" label="recordId"/>
+ </targetConfig>
+ </targetConfigs>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexConsumApply_FromOPDPlan/lexConsumApply_FromOPDPlan.html b/force-app/main/default/lwc/lexConsumApply_FromOPDPlan/lexConsumApply_FromOPDPlan.html
new file mode 100644
index 0000000..ae58c6c
--- /dev/null
+++ b/force-app/main/default/lwc/lexConsumApply_FromOPDPlan/lexConsumApply_FromOPDPlan.html
@@ -0,0 +1,5 @@
+<template>
+ <div class="dispatchOCSMQARAHolder" 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/lexConsumApply_FromOPDPlan/lexConsumApply_FromOPDPlan.js b/force-app/main/default/lwc/lexConsumApply_FromOPDPlan/lexConsumApply_FromOPDPlan.js
new file mode 100644
index 0000000..7e07b03
--- /dev/null
+++ b/force-app/main/default/lwc/lexConsumApply_FromOPDPlan/lexConsumApply_FromOPDPlan.js
@@ -0,0 +1,99 @@
+import { LightningElement,wire,track,api} from 'lwc';
+import { CurrentPageReference, NavigationMixin} from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import init from '@salesforce/apex/lexConsumApply_FromOPDPlanCtl.init';
+import fieldDefineApp from '@salesforce/apex/lexConsumApply_FromOPDPlanCtl.fieldDefineApp';
+import UserInfo_Owner from '@salesforce/apex/lexConsumApply_FromOPDPlanCtl.UserInfo_Owner';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
+
+export default class LexConsumApply_FromOPDPlan extends LightningElement {
+ @api recordId;
+ IsLoading = true;
+
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ console.log(111);
+ console.log(currentPageReference);
+
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ console.log("str");
+ console.log(str);
+ this.recordId = str;
+ }
+ }
+ }
+
+ connectedCallback(){
+ console.log(this.recordId);
+ init({
+ recordId: this.recordId
+ }).then(result=>{
+ UserInfo_Owner({}).then(res=>{
+ if(res.isFormalStuff == 'true'){
+ this.showToast('璇曠敤鏈熷唴锛屼笉鑳界敵璇�','warning');
+ return;
+ }else{
+
+ fieldDefineApp({}).then(resp=>{
+ var fieldmap = new Map();
+ for (var i=0; i< resp.length; i++) {
+ var record = resp[i];
+ fieldmap.set(record.QualifiedApiName,record.DurableId.toString().split('.')[1]);
+ }
+
+ })
+ .catch(e=>{console.log(e)})
+
+ const defaultValues = encodeDefaultFieldValues({
+ OPD__c: result.opdPlan,
+ OPDPlan__c: result.name,
+ Rental_Apply__c:result.rentalApply2,
+ Hospital__c:result.hospitalName,
+ Strategic_dept__c:result.ocmCategoryName,
+ Account__c:result.accountLab,
+ Name:'*',
+ demo_purpose2__c:'OPD璇曠敤',
+ Person_In_Charge__c:res.lastName + res.firstName,
+ applyUser__c:res.lastName + res.firstName
+ });
+
+ this[NavigationMixin.Navigate]({
+ type: 'standard__objectPage',
+ attributes: {
+ objectApiName: 'Consum_Apply__c',
+ actionName: 'new'
+ },
+ state:{
+ defaultFieldValues: this.defaultValues
+ }
+ })
+ }
+ })
+ .catch(error => {
+ console.log("error");
+ console.log(error);
+ })
+ })
+
+ .catch(error => {
+ console.log("error");
+ console.log(error);
+ }).finally(() => {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ });
+ }
+
+ showToast(message, type) {
+ const evt = new ShowToastEvent({
+ title: '',
+ message: message,
+ variant: type
+ });
+ this.dispatchEvent(evt);
+ }
+
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexConsumApply_FromOPDPlan/lexConsumApply_FromOPDPlan.js-meta.xml b/force-app/main/default/lwc/lexConsumApply_FromOPDPlan/lexConsumApply_FromOPDPlan.js-meta.xml
new file mode 100644
index 0000000..622f243
--- /dev/null
+++ b/force-app/main/default/lwc/lexConsumApply_FromOPDPlan/lexConsumApply_FromOPDPlan.js-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexEquipmentRentalApply_FromSA">
+ <apiVersion>56.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>
+ <!-- 瀹氫箟鍙橀噺 -->
+ <targetConfigs>
+ <targetConfig targets="lightning__FlowScreen">
+ <!-- name js涓娇鐢ㄧ殑鍙橀噺锛屼粠灞忓箷娴佷腑鑾峰彇鍙傛暟 label 鍦ㄥ睆骞曟祦鐨勮LWC鐨勮缃腑鏄剧ず -->
+ <property name="recordId" type="String" label="recordId"/>
+ </targetConfig>
+ </targetConfigs>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexConsumApply_FromQIS/lexConsumApply_FromQIS.html b/force-app/main/default/lwc/lexConsumApply_FromQIS/lexConsumApply_FromQIS.html
new file mode 100644
index 0000000..ae58c6c
--- /dev/null
+++ b/force-app/main/default/lwc/lexConsumApply_FromQIS/lexConsumApply_FromQIS.html
@@ -0,0 +1,5 @@
+<template>
+ <div class="dispatchOCSMQARAHolder" 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/lexConsumApply_FromQIS/lexConsumApply_FromQIS.js b/force-app/main/default/lwc/lexConsumApply_FromQIS/lexConsumApply_FromQIS.js
new file mode 100644
index 0000000..237f4b1
--- /dev/null
+++ b/force-app/main/default/lwc/lexConsumApply_FromQIS/lexConsumApply_FromQIS.js
@@ -0,0 +1,149 @@
+import { LightningElement,wire,track,api} from 'lwc';
+import { CurrentPageReference, NavigationMixin} from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import init from '@salesforce/apex/LexConsumApply_FromQISCtl.init';
+import rentalApp from '@salesforce/apex/LexConsumApply_FromQISCtl.rentalApp';
+import fieldDefineApp from '@salesforce/apex/LexConsumApply_FromQISCtl.fieldDefineApp';
+import UserInfo_Owner from '@salesforce/apex/LexConsumApply_FromQISCtl.UserInfo_Owner';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
+
+export default class LexConsumApply_FromQIS extends LightningElement {
+
+ @api recordId;
+ IsLoading = true;
+
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ console.log(111);
+ console.log(currentPageReference);
+
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ console.log("str");
+ console.log(str);
+ this.recordId = str;
+ }
+ }
+ }
+
+ connectedCallback(){
+ console.log(this.recordId);
+ rentalApp({
+ recordId: this.recordId
+ }).then(result => {
+ console.log('rentalApp============' + result);
+ if(result.lenth > 0){
+ const evt = new ShowToastEvent({
+ title : 'Error',
+ message : '鍚屼竴涓猀IS璁板綍涓嶈兘閲嶅鐢宠澶囧搧',
+ variant : 'error'
+ });
+ this.dispatchEvent(evt);
+ return;
+ }
+ init({
+ recordId: this.recordId
+ }).then(result => {
+ this.IsLoading = false;
+ if (result != null) {
+ if(result.nextAction=='閫佸洖'){
+ this.showToast('QIS瀵瑰簲鏂规硶涓衡�滈�佸洖鈥濓紝涓嶈兘鐢宠','warning');
+ return;
+ }
+ if(result.qISStatus=='鑽夋涓�'){
+ this.showToast('QIS鐘舵�佷负鑽夋涓紝涓嶈兘鐢宠','warning');
+ return;
+ }
+ if(result.qISStatus=='FSE濉啓瀹屾瘯'){
+ this.showToast('QIS鐘舵�佷负FSE濉啓瀹屾瘯锛屼笉鑳界敵璇�','warning');
+ return;
+ }
+ if(result.qISStatus=='鍙栨秷'){
+ this.showToast('QIS鐘舵�佷负鍙栨秷锛屼笉鑳界敵璇�','warning');
+ return;
+ }
+ // if('{!$User.isFormal_Stuff__c}'=='true'){
+ // alert('璇曠敤鏈熷唴锛屼笉鑳界敵璇�');
+ // }else{
+ // var url = "/a0t/e?retURL=%2F{!URLENCODE(QIS_Report__c.Id)}&CF00N10000003Mp1d={!URLENCODE(QIS_Report__c.Hospital__c)}&CF00N10000003Mp1d_lkid={!URLENCODE(QIS_Report__c.HospitalId__c)}&CF00N10000003O3V6={!URLENCODE(QIS_Report__c.Department_Class__c)}&CF00N10000003O3V6_lkid={!URLENCODE(QIS_Report__c.Department_ClassId__c)}&CF00N10000003Mp2R={!URLENCODE(QIS_Report__c.Hospital_Department__c)}&CF00N10000003Mp2R_lkid={!URLENCODE(QIS_Report__c.Hospital_DepartmentId__c)}&00N10000003Msk0={!URLENCODE('缁翠慨浠ｇ敤')}&00N10000003Msk5={!URLENCODE('绱㈣禂QIS')}&Name={!URLENCODE('*')}&CF00N10000005HzRr={!URLENCODE($User.LastName&' '&$User.FirstName)}&CF00N10000005HzRr_lkid={!URLENCODE($User.Id)}&CF00N10000005HzRz={!URLENCODE($User.LastName&' '&$User.FirstName)}&CF00N10000005HzRz_lkid={!URLENCODE($User.Id)}&00N10000003OJzc={!URLENCODE($User.LastName&' '&$User.FirstName)}&CF00N10000004o2Mg={!URLENCODE(QIS_Report__c.Name)}&CF00N10000004o2Mg_lkid={!URLENCODE(QIS_Report__c.Id)}&CF00N10000008r73m={!URLENCODE( QIS_Report__c.Repair__c)}&CF00N10000008r73m_lkid={!URLENCODE( QIS_Report__c.RepairId__c )}&";
+ // window.top.location.href=url;
+ // }
+ UserInfo_Owner({}).then(res=>{
+ if(res.isFormalStuff == 'true'){
+ this.showToast('璇曠敤鏈熷唴锛屼笉鑳界敵璇�','warning');
+ return;
+ }else{
+ // var query = "Select QualifiedApiName, EntityDefinition.KeyPrefix, DurableId From FieldDefinition WHERE EntityDefinition.QualifiedApiName = 'Consum_Apply__c'";
+ // var records = sforce.connection.query(query).getArray('records');
+ // var prefix = records[0].EntityDefinition.KeyPrefix.toString();
+ // var fieldmap = new Map();
+
+ // for (var i=0; i< records.length; i++) {
+ // var record = records[i];
+ // fieldmap.set(record.QualifiedApiName,record.DurableId.toString().split('.')[1]);
+ // }
+
+ fieldDefineApp({}).then(resp=>{
+ var fieldmap = new Map();
+ for (var i=0; i< resp.length; i++) {
+ var record = resp[i];
+ fieldmap.set(record.QualifiedApiName,record.DurableId.toString().split('.')[1]);
+ }
+
+ })
+ .catch(e=>{console.log(e)})
+
+ const defaultValues = encodeDefaultFieldValues({
+ QIS_Report__c: this.recordId,
+ Hospital: result.hospital,
+ Strategic_dept: result.departmentClass,
+ Account:result.hospitalDepartment,
+ demo_purpose2:'绱㈣禂QIS',
+ Name:'*',
+ Person_In_Charge:res.lastName + res.firstName,
+ applyUser:res.lastName + res.firstName,
+ QIS_number:result.name
+ });
+
+ this[NavigationMixin.Navigate]({
+ type: 'standard__objectPage',
+ attributes: {
+ objectApiName: 'Consum_Apply__c',
+ actionName: 'new'
+ },
+ state:{
+ defaultFieldValues: this.defaultValues
+ }
+ })
+ }
+ })
+ this.dispatchEvent(new CloseActionScreenEvent());
+ // window.location.reload();
+ }
+ }).catch(error => {
+ console.log("error");
+ console.log(error);
+ }).finally(() => {
+
+ });
+ }).catch(error => {
+ console.log("error");
+ console.log(error);
+ }).finally(() => {
+
+ });
+ }
+
+ showToast(message, type) {
+ const evt = new ShowToastEvent({
+ title: '',
+ message: message,
+ variant: type
+ });
+ this.dispatchEvent(evt);
+ }
+
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexConsumApply_FromQIS/lexConsumApply_FromQIS.js-meta.xml b/force-app/main/default/lwc/lexConsumApply_FromQIS/lexConsumApply_FromQIS.js-meta.xml
new file mode 100644
index 0000000..622f243
--- /dev/null
+++ b/force-app/main/default/lwc/lexConsumApply_FromQIS/lexConsumApply_FromQIS.js-meta.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexEquipmentRentalApply_FromSA">
+ <apiVersion>56.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>
+ <!-- 瀹氫箟鍙橀噺 -->
+ <targetConfigs>
+ <targetConfig targets="lightning__FlowScreen">
+ <!-- name js涓娇鐢ㄧ殑鍙橀噺锛屼粠灞忓箷娴佷腑鑾峰彇鍙傛暟 label 鍦ㄥ睆骞曟祦鐨勮LWC鐨勮缃腑鏄剧ず -->
+ <property name="recordId" type="String" label="recordId"/>
+ </targetConfig>
+ </targetConfigs>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCopyRepair/lexCopyRepair.js b/force-app/main/default/lwc/lexCopyRepair/lexCopyRepair.js
index 954826c..d1a046a 100644
--- a/force-app/main/default/lwc/lexCopyRepair/lexCopyRepair.js
+++ b/force-app/main/default/lwc/lexCopyRepair/lexCopyRepair.js
@@ -11,8 +11,14 @@
} from 'lightning/actions';
import init from '@salesforce/apex/otherButtonRepairController.init';
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import {
+ NavigationMixin
+} from 'lightning/navigation';
+import {
+ encodeDefaultFieldValues
+} from 'lightning/pageReferenceUtils';
-export default class LexCopyRepair extends LightningElement {
+export default class LexCopyRepair extends NavigationMixin(LightningElement) {
@api recordId;
str;
IsLoading = true;
@@ -157,7 +163,6 @@
this.Status1C = result.Status1C;
this.CopyRepair();
- this.dispatchEvent(new CloseActionScreenEvent());
}
}).catch(error => {
console.log(error);
@@ -168,40 +173,112 @@
CopyRepair() {
var Status = this.Status1C;
if (Status == '0.鍒犻櫎' || Status == '0.鍙栨秷') {
- var url = "/a0J/e?00N10000009H2fa=" + this.Name + "&CF00N10000002Dx1X=" + this.DeliveredProductC +
- "&CF00N10000002Dx1X_lkid=" + this.DeliveredProductC + "&00N10000006P1dw=" + this.PaperRepairRequestNoC +
- "&CF00N10000002Dx66=" + this.HospitalC + "&CF00N10000002Dx5t=" + this.DepartmentClassC +
- "&CF00N10000002Dx5n=" + this.AccountC + "&00N10000008rG4p=" + this.RepairCostTypeC +
- "&CF00N10000006P1eV=" + this.DealerC + "&CF00N10000002EMHw=" + this.InchargeStaffC +
- "&CF00N10000005HDvq=" + this.InchargeStaffContactC + "&00N10000006P6SM=" + this.SalesOfficeCodeSelectionC +
- "&00N10000002F6dW=" + this.OnSiteRepairC + "&00N10000006P6Rn=" + this.workLocationSelectC +
- "&00N10000009i1Z2=" + this.ReturnsProductWayC + "&00N10000002Dx6I=" + this.RepairDetailC +
- "&00N10000009H1rQ=" + this.RepairApplicantC + "&00N10000009H1rP=" + this.RepairApplicantHospitalC +
- "&00N10000009H1rO=" + this.RepairApplicantDepartmentC + "&00N10000009H1rB=" + this.DeliveryLogisticsModeC +
- "&00N10000009H1rk=" + this.engineerSendDateC + "&00N10000009H1rC=" + this.DeliveryLogisticsNoC +
- "&00N10000009H1rA=" + this.DeliveryLogisticsAnnotationC + "&00N10000008rsVQ=" + this.DateReceiptQuestionsC +
- "&00N10000008rsVN=" + this.BreakORFallOffC + "&00N10000008rsVS=" + this.DelayReportReasonC +
- "&00N10000008rsW5=" + this.UseFailProductFinishC + "&00N10000008rsW7=" + this.ifDeadHurtC +
- "&00N10000008rsW4=" + this.SupportingProductsC + "&00N10000008rsVv=" + this.ProblemOccurredC +
- "&00N10000008rsVL=" + this.AfterFailureInformationC + "&00N10000009hsvI=" + this.ProblemOccurredSelectC +
- "&00N10000008rsVR=" + this.Delay15MinC + "&00N10000008rsVw=" + this.ProductFailureRelatedC +
- "&00N10000008rsVZ=" + this.InformationFromC + "&00N10000008rsW2=" + this.ReportAdverseEventsC +
- "&00N10000008rsVT=" + this.FailureQInHospitalC + "&00N10000008rsW6=" + this.WhatProjectC +
- "&00N10000008rsVk=" + this.OperationOrExaminationNameC + "&00N10000008rWce=" + this.MaintenanceContractTypeC +
- "&00N10000002Dx5y=" + this.FailureOccurrenceDateC + "&00N10000002FH86=" + this.RepairSourceC +
- "&CF00N10000009H1rR=" + this.RepairSubOrderC + "&CF00N10000002FIJU=" + this.OnCallIDC +
- "&CF00N10000002FIJZ=" + this.QISIDC + "&CF00N10000006PRCp=" + this.InsReportC +
- "&00N10000008rsVM=" + this.AwareDateC + "&00N10000009GmI6=" + this.OCSMAdministrativeReportNumberC +
- "&00N10000009GmI4=" + this.MBCAwareDateC + "&00N10000009GmI5=" + this.OCSMAdministrativeReportDateC +
- "&00N10000009GmI7=" + this.OCSMAdministrativeReportStatusC + "&00N100000095siE=" + this.CFDANoHandC +
- "&00N100000095shz=" + this.ProduceCompanyHandC + "&00N100000098PV9=" + this.OfferRentalNewC +
- "&00N100000098PVA=" + this.ifRentalApplyC + "&00N10000006gZ4g=" + this.LatestCollectDatePriorityC +
- "&00N10000007MNFW=" + this.RentalApplyEquipmentSetDetailIdC +
- "&CF00N10000007MNFX=" + this.RentalApplyEquipmentSetDetailC + "&retURL=%2F" + this.Id;
- window.open(url);
+ const url = encodeDefaultFieldValues({
+ Old_Name__c: this.Name,
+ Delivered_Product__c: this.DeliveredProductC,
+ PaperRepairRequestNo__c: this.PaperRepairRequestNoC,
+ Hospital__c: this.HospitalC,
+ Department_Class__c: this.DepartmentClassC,
+ Account__c: this.AccountC,
+ RepairCostType__c: this.RepairCostTypeC,
+ Dealer__c: this.DealerC,
+ Incharge_Staff__c: this.InchargeStaffC,
+ Incharge_Staff_Contact__c: this.InchargeStaffContactC,
+ SalesOfficeCode_selection__c: this.SalesOfficeCodeSelectionC,
+ On_site_repair__c: this.OnSiteRepairC,
+ work_location_select__c : this.workLocationSelectC,
+ Returns_Product_way__c : this.ReturnsProductWayC,
+ Repair_Detail__c : this.RepairDetailC,
+ RepairApplicant__c : this.RepairApplicantC,
+ RepairApplicantHospital__c : this.RepairApplicantHospitalC,
+ RepairApplicantDepartment__c : this.RepairApplicantDepartmentC,
+ DeliveryLogisticsMode__c : this.DeliveryLogisticsModeC,
+ engineerSendDate__c : this.engineerSendDateC,
+ DeliveryLogisticsNo__c : this.DeliveryLogisticsNoC,
+ DeliveryLogisticsAnnotation__c : this.DeliveryLogisticsAnnotationC,
+ DateReceiptQuestions__c : this.DateReceiptQuestionsC,
+ BreakORFallOff__c : this.BreakORFallOffC,
+ DelayReportReason__c : this.DelayReportReasonC,
+ UseFailProductFinish__c : this.UseFailProductFinishC,
+ ifDeadHurt__c : this.ifDeadHurtC,
+ SupportingProducts__c : this.SupportingProductsC,
+ ProblemOccurred__c : this.ProblemOccurredC,
+ AfterFailureInformation__c : this.AfterFailureInformationC,
+ ProblemOccurredSelect__c : this.ProblemOccurredSelectC,
+ Delay15Min__c: this.Delay15MinC,
+ ProductFailureRelated__c : this.ProductFailureRelatedC,
+ InformationFrom__c : this.InformationFromC,
+ ReportAdverseEvents__c : this.ReportAdverseEventsC,
+ FailureQInHospital__c : this.FailureQInHospitalC,
+ WhatProject__c : this.WhatProjectC,
+ OperationOrExaminationName__c : this.OperationOrExaminationNameC,
+ MaintenanceContractType__c : this.MaintenanceContractTypeC,
+ Failure_Occurrence_Date__c : this.FailureOccurrenceDateC,
+ Repair_Source__c : this.RepairSourceC,
+ RepairSubOrder__c : this.RepairSubOrderC,
+ On_Call_ID__c : this.OnCallIDC,
+ QIS_ID__c : this.QISIDC,
+ InsReport__c : this.InsReportC,
+ Aware_date__c : this.AwareDateC,
+ OCSMAdministrativeReportNumber__c : this.OCSMAdministrativeReportNumberC,
+ MBC_AwareDate__c : this.MBCAwareDateC,
+ OCSMAdministrativeReportDate__c : this.OCSMAdministrativeReportDateC,
+ OCSMAdministrativeReportStatus__c : this.OCSMAdministrativeReportStatusC,
+ CFDA_No_Hand__c : this.CFDANoHandC,
+ ProduceCompany_hand__c : this.ProduceCompanyHandC,
+ Offer_Rental_New__c : this.OfferRentalNewC,
+ if_Rental_Apply__c : this.ifRentalApplyC,
+ Latest_Collect_Date_Priority__c : this.LatestCollectDatePriorityC,
+ Rental_Apply_Equipment_Set_Detail_Id__c : this.RentalApplyEquipmentSetDetailIdC,
+ Rental_Apply_Equipment_Set_Detail__c : this.RentalApplyEquipmentSetDetailC,
+ });
+ this[NavigationMixin.Navigate]({
+ type: 'standard__objectPage',
+ attributes: {
+ objectApiName: 'Repair__c',
+ actionName: 'new'
+ },
+ state: {
+ nooverride: '1',
+ defaultFieldValues: url
+ }
+ });
+ this.dispatchEvent(new CloseActionScreenEvent());
+
+ // var url = "/a0J/e?00N10000009H2fa=" + this.Name + "&CF00N10000002Dx1X=" + this.DeliveredProductC +
+ // "&CF00N10000002Dx1X_lkid=" + this.DeliveredProductC + "&00N10000006P1dw=" + this.PaperRepairRequestNoC +
+ // "&CF00N10000002Dx66=" + this.HospitalC + "&CF00N10000002Dx5t=" + this.DepartmentClassC +
+ // "&CF00N10000002Dx5n=" + this.AccountC + "&00N10000008rG4p=" + this.RepairCostTypeC +
+ // "&CF00N10000006P1eV=" + this.DealerC + "&CF00N10000002EMHw=" + this.InchargeStaffC +
+ // "&CF00N10000005HDvq=" + this.InchargeStaffContactC + "&00N10000006P6SM=" + this.SalesOfficeCodeSelectionC +
+ // "&00N10000002F6dW=" + this.OnSiteRepairC + "&00N10000006P6Rn=" + this.workLocationSelectC +
+ // "&00N10000009i1Z2=" + this.ReturnsProductWayC + "&00N10000002Dx6I=" + this.RepairDetailC +
+ // "&00N10000009H1rQ=" + this.RepairApplicantC + "&00N10000009H1rP=" + this.RepairApplicantHospitalC +
+ // "&00N10000009H1rO=" + this.RepairApplicantDepartmentC + "&00N10000009H1rB=" + this.DeliveryLogisticsModeC +
+ // "&00N10000009H1rk=" + this.engineerSendDateC + "&00N10000009H1rC=" + this.DeliveryLogisticsNoC +
+ // "&00N10000009H1rA=" + this.DeliveryLogisticsAnnotationC + "&00N10000008rsVQ=" + this.DateReceiptQuestionsC +
+ // "&00N10000008rsVN=" + this.BreakORFallOffC + "&00N10000008rsVS=" + this.DelayReportReasonC +
+ // "&00N10000008rsW5=" + this.UseFailProductFinishC + "&00N10000008rsW7=" + this.ifDeadHurtC +
+ // "&00N10000008rsW4=" + this.SupportingProductsC + "&00N10000008rsVv=" + this.ProblemOccurredC +
+ // "&00N10000008rsVL=" + this.AfterFailureInformationC + "&00N10000009hsvI=" + this.ProblemOccurredSelectC +
+ // "&00N10000008rsVR=" + this.Delay15MinC + "&00N10000008rsVw=" + this.ProductFailureRelatedC +
+ // "&00N10000008rsVZ=" + this.InformationFromC + "&00N10000008rsW2=" + this.ReportAdverseEventsC +
+ // "&00N10000008rsVT=" + this.FailureQInHospitalC + "&00N10000008rsW6=" + this.WhatProjectC +
+ // "&00N10000008rsVk=" + this.OperationOrExaminationNameC + "&00N10000008rWce=" + this.MaintenanceContractTypeC +
+ // "&00N10000002Dx5y=" + this.FailureOccurrenceDateC + "&00N10000002FH86=" + this.RepairSourceC +
+ // "&CF00N10000009H1rR=" + this.RepairSubOrderC + "&CF00N10000002FIJU=" + this.OnCallIDC +
+ // "&CF00N10000002FIJZ=" + this.QISIDC + "&CF00N10000006PRCp=" + this.InsReportC +
+ // "&00N10000008rsVM=" + this.AwareDateC + "&00N10000009GmI6=" + this.OCSMAdministrativeReportNumberC +
+ // "&00N10000009GmI4=" + this.MBCAwareDateC + "&00N10000009GmI5=" + this.OCSMAdministrativeReportDateC +
+ // "&00N10000009GmI7=" + this.OCSMAdministrativeReportStatusC + "&00N100000095siE=" + this.CFDANoHandC +
+ // "&00N100000095shz=" + this.ProduceCompanyHandC + "&00N100000098PV9=" + this.OfferRentalNewC +
+ // "&00N100000098PVA=" + this.ifRentalApplyC + "&00N10000006gZ4g=" + this.LatestCollectDatePriorityC +
+ // "&00N10000007MNFW=" + this.RentalApplyEquipmentSetDetailIdC +
+ // "&CF00N10000007MNFX=" + this.RentalApplyEquipmentSetDetailC + "&retURL=%2F" + this.Id;
+ // window.open(url);
} else {
- this.ShowToastEvent("璇ョ姸鎬佷笅涓嶈兘澶嶅埗", "error")
- // alert("璇ョ姸鎬佷笅涓嶈兘澶嶅埗");
+ this.ShowToastEvent("璇ョ姸鎬佷笅涓嶈兘澶嶅埗", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
}
}
diff --git a/force-app/main/default/lwc/lexCreateAssessmentReport/lexCreateAssessmentReport.css b/force-app/main/default/lwc/lexCreateAssessmentReport/lexCreateAssessmentReport.css
new file mode 100644
index 0000000..abf7b01
--- /dev/null
+++ b/force-app/main/default/lwc/lexCreateAssessmentReport/lexCreateAssessmentReport.css
@@ -0,0 +1,13 @@
+
+.toast{
+ border: 1px solid #c9c9c9;
+ border-radius: 10px;
+ width: 50%;
+ margin: 0 auto;
+ font-size: 18px;
+ font-weight: bold;
+ padding: 10px 20px;
+ background: #EA001E;
+ display: flex;
+ color: white;
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateAssessmentReport/lexCreateAssessmentReport.html b/force-app/main/default/lwc/lexCreateAssessmentReport/lexCreateAssessmentReport.html
index d044dbb..05d41a6 100644
--- a/force-app/main/default/lwc/lexCreateAssessmentReport/lexCreateAssessmentReport.html
+++ b/force-app/main/default/lwc/lexCreateAssessmentReport/lexCreateAssessmentReport.html
@@ -2,4 +2,12 @@
<div class="exampleHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
</div>
-</template>
\ No newline at end of file
+ <div if:false={IsLoading} class="toast">
+ <span style="padding: 10px;">{msg}</span>
+ <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse" onclick={closeAction} title="Close" style="background-color: #e5e4e2;margin-top: 15px;">
+ <lightning-icon class="greyIcon" icon-name="utility:close" alternative-text="Connected" variant="inverse" size="small"
+ title="Close" style="color: black;"></lightning-icon>
+ <span class="slds-assistive-text">Close</span>
+ </button>
+ </div>
+</template>
diff --git a/force-app/main/default/lwc/lexCreateAssessmentReport/lexCreateAssessmentReport.js b/force-app/main/default/lwc/lexCreateAssessmentReport/lexCreateAssessmentReport.js
index fbf624c..762c054 100644
--- a/force-app/main/default/lwc/lexCreateAssessmentReport/lexCreateAssessmentReport.js
+++ b/force-app/main/default/lwc/lexCreateAssessmentReport/lexCreateAssessmentReport.js
@@ -17,6 +17,7 @@
IsLoading = true;
Id;
Status;
+ msg;
@wire(CurrentPageReference)
getStateParameters(currentPageReference) {
@@ -35,7 +36,6 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.Id = result.Id;
this.Status = result.Status;
@@ -53,7 +53,12 @@
if (status == '鍏紑涓�') {
window.open("/apex/AssessmentReport?camid=" + this.Id, "_top");
} else {
- alert("鍙湁鎵瑰噯鍚庢墠鑳藉垱寤烘姤鍛�!");
+ this.msg = '鍙湁鎵瑰噯鍚庢墠鑳藉垱寤烘姤鍛�!';
+ this.IsLoading = false;
}
}
+
+ closeAction() {
+ window.history.go(-1);
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateInstructReport/lexCreateInstructReport.css b/force-app/main/default/lwc/lexCreateInstructReport/lexCreateInstructReport.css
new file mode 100644
index 0000000..e9fe316
--- /dev/null
+++ b/force-app/main/default/lwc/lexCreateInstructReport/lexCreateInstructReport.css
@@ -0,0 +1,12 @@
+.toast{
+ border: 1px solid #c9c9c9;
+ border-radius: 10px;
+ width: 50%;
+ margin: 0 auto;
+ font-size: 18px;
+ font-weight: bold;
+ padding: 10px 20px;
+ background: #EA001E;
+ display: flex;
+ color: white;
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateInstructReport/lexCreateInstructReport.html b/force-app/main/default/lwc/lexCreateInstructReport/lexCreateInstructReport.html
index d044dbb..05d41a6 100644
--- a/force-app/main/default/lwc/lexCreateInstructReport/lexCreateInstructReport.html
+++ b/force-app/main/default/lwc/lexCreateInstructReport/lexCreateInstructReport.html
@@ -2,4 +2,12 @@
<div class="exampleHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
</div>
-</template>
\ No newline at end of file
+ <div if:false={IsLoading} class="toast">
+ <span style="padding: 10px;">{msg}</span>
+ <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse" onclick={closeAction} title="Close" style="background-color: #e5e4e2;margin-top: 15px;">
+ <lightning-icon class="greyIcon" icon-name="utility:close" alternative-text="Connected" variant="inverse" size="small"
+ title="Close" style="color: black;"></lightning-icon>
+ <span class="slds-assistive-text">Close</span>
+ </button>
+ </div>
+</template>
diff --git a/force-app/main/default/lwc/lexCreateInstructReport/lexCreateInstructReport.js b/force-app/main/default/lwc/lexCreateInstructReport/lexCreateInstructReport.js
index df27f2b..a1fe2e8 100644
--- a/force-app/main/default/lwc/lexCreateInstructReport/lexCreateInstructReport.js
+++ b/force-app/main/default/lwc/lexCreateInstructReport/lexCreateInstructReport.js
@@ -17,6 +17,7 @@
IsLoading = true;
Id;
Status;
+ msg;
@wire(CurrentPageReference)
getStateParameters(currentPageReference) {
@@ -35,7 +36,6 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.Id = result.Id;
this.Status = result.Status;
@@ -53,7 +53,12 @@
if (status == '鍏紑涓�') {
window.open("/apex/InstructReport?camid=" + this.Id, "_top");
} else {
- alert("鍙湁鎵瑰噯鍚庢墠鑳藉垱寤烘姤鍛�!")
+ this.msg = '鍙湁鎵瑰噯鍚庢墠鑳藉垱寤烘姤鍛�!';
+ this.IsLoading = false;
}
}
+
+ closeAction() {
+ window.history.go(-1);
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateNewServiceContract/lexCreateNewServiceContract.js b/force-app/main/default/lwc/lexCreateNewServiceContract/lexCreateNewServiceContract.js
index 0f54a7c..e49d936 100644
--- a/force-app/main/default/lwc/lexCreateNewServiceContract/lexCreateNewServiceContract.js
+++ b/force-app/main/default/lwc/lexCreateNewServiceContract/lexCreateNewServiceContract.js
@@ -10,8 +10,14 @@
CloseActionScreenEvent
} from 'lightning/actions';
import init from '@salesforce/apex/buttonAccountCtl.init';
+import {
+ NavigationMixin
+} from 'lightning/navigation';
+import {
+ encodeDefaultFieldValues
+} from 'lightning/pageReferenceUtils';
-export default class LexCreateNewServiceContract extends LightningElement {
+export default class LexCreateNewServiceContract extends NavigationMixin(LightningElement) {
@api recordId;
str;
IsLoading = true;
@@ -57,21 +63,31 @@
// 鏂板缓鏂版湇鍔″悎鍚�
CreateNewServiceContract() {
- var Hospital = this.HospitalC;
- var Hospitalid = this.HospitalIdC;
- var Department = this.DepartmentClassC;
- var Departmentid = this.DepartmentClassIdC;
- var accountname = this.Name;
- var accountid = this.Id;
+ const url = encodeDefaultFieldValues({
+ Hospital__c: this.HospitalC,
+ Department_Class__c: this.DepartmentClassC,
+ Department__c: this.Id
+ });
+ this[NavigationMixin.Navigate]({
+ type: 'standard__objectPage',
+ attributes: {
+ objectApiName: 'Maintenance_Contract__c',
+ actionName: 'new'
+ },
+ state: {
+ nooverride: '1',
+ defaultFieldValues: url
+ }
+ });
+ this.dispatchEvent(new CloseActionScreenEvent());
+ // var url = 'a0H/e?CF00N10000002Dx56=' + Hospital + '&CF00N10000002Dx56_lkid=' +
+ // Hospitalid + '&CF00N10000002Dx4p=' + Department + '&CF00N10000002Dx4p_lkid=' +
+ // Departmentid + '&CF00N10000002Dx4q=' + accountname + '&CF00N10000002Dx4q_lkid=' +
+ // accountid + '&RecordType=01210000000gTYq';
- var url = 'a0H/e?CF00N10000002Dx56=' + Hospital + '&CF00N10000002Dx56_lkid=' +
- Hospitalid + '&CF00N10000002Dx4p=' + Department + '&CF00N10000002Dx4p_lkid=' +
- Departmentid + '&CF00N10000002Dx4q=' + accountname + '&CF00N10000002Dx4q_lkid=' +
- accountid + '&RecordType=01210000000gTYq';
+ // console.log(url);
- console.log(url);
-
- window.top.location.href = url;
+ // window.top.location.href = url;
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateNewServiceContract/lexCreateNewServiceContract.js-meta.xml b/force-app/main/default/lwc/lexCreateNewServiceContract/lexCreateNewServiceContract.js-meta.xml
index 3da8f7a..12078fb 100644
--- a/force-app/main/default/lwc/lexCreateNewServiceContract/lexCreateNewServiceContract.js-meta.xml
+++ b/force-app/main/default/lwc/lexCreateNewServiceContract/lexCreateNewServiceContract.js-meta.xml
@@ -9,10 +9,4 @@
<target>lightning__RecordAction</target>
<target>lightning__FlowScreen</target>
</targets>
- <!-- 瀹氫箟鍙橀噺 -->
- <targetConfigs>
- <targetConfig targets="lightning__FlowScreen">
- <property name="recordId" type="String" label="recordId"/>
- </targetConfig>
- </targetConfigs>
</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.css b/force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.css
index 8d634cd..e9fe316 100644
--- a/force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.css
+++ b/force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.css
@@ -1,10 +1,12 @@
-.createEmailHolder{
- position: relative;
- display: inline-block;
- width: 80px;
- height: 80px;
- text-align: center;
-}
-.container .uiContainerManager{
- display: none !important;
+.toast{
+ border: 1px solid #c9c9c9;
+ border-radius: 10px;
+ width: 50%;
+ margin: 0 auto;
+ font-size: 18px;
+ font-weight: bold;
+ padding: 10px 20px;
+ background: #EA001E;
+ display: flex;
+ color: white;
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.html b/force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.html
index 61d9b05..0c84cf0 100644
--- a/force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.html
+++ b/force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.html
@@ -1,5 +1,15 @@
<template>
- <div class="createEmailHolder" if:true={IsLoading}>
+ <div class="exampleHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ <lightning-button onclick={handleConfirmClick} label="Open Confirm Modal"></lightning-button>
+ <lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button> </div>
</div>
+ <div if:false={IsLoading} class="toast">
+ <span style="padding: 10px;">{msg}</span>
+ <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse" onclick={closeAction} title="Close" style="background-color: #e5e4e2;margin-top: 15px;">
+ <lightning-icon class="greyIcon" icon-name="utility:close" alternative-text="Connected" variant="inverse" size="small"
+ title="Close" style="color: black;"></lightning-icon>
+ <span class="slds-assistive-text">Close</span>
+ </button>
+ </div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.js b/force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.js
index e27813d..2bab6b2 100644
--- a/force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.js
+++ b/force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.js
@@ -1,60 +1,219 @@
-import { LightningElement,wire,track,api} from 'lwc';
-import { CurrentPageReference } from "lightning/navigation";
-import { CloseActionScreenEvent } from 'lightning/actions';
-import { NavigationMixin } from 'lightning/navigation';
-import { ShowToastEvent } from 'lightning/platformShowToastEvent';
-import init from '@salesforce/apex/QISReportController.initForlexCreateQISFromAssetButton';
-import UserInfo_Owner from '@salesforce/apex/TaskFeedbackController.UserInfo_Owner';
-import { updateRecord } from 'lightning/uiRecordApi';
+import {
+ LightningElement,
+ wire,
+ api
+} from 'lwc';
+import {
+ CurrentPageReference
+} from "lightning/navigation";
+import {
+ CloseActionScreenEvent
+} from 'lightning/actions';
+import init from '@salesforce/apex/buttonAssetCtl.init';
+import selecctRepairByFomatToday from '@salesforce/apex/buttonAssetCtl.selecctRepairByFomatToday';
+import selecctQISReportrByFomatToday from '@salesforce/apex/buttonAssetCtl.selecctQISReportrByFomatToday';
+import selectCASE from '@salesforce/apex/buttonAssetCtl.selectCASE';
+import selectNullvalue from '@salesforce/apex/buttonAssetCtl.selectNullvalue';
+import LightningConfirm from 'lightning/confirm';
+import {
+ NavigationMixin
+} from 'lightning/navigation';
+import {
+ encodeDefaultFieldValues
+} from 'lightning/pageReferenceUtils';
+import {
+ ShowToastEvent
+} from 'lightning/platformShowToastEvent';
-export default class lexCreateQISFromAsset extends LightningElement {
+export default class lexCreateQISFromAsset extends NavigationMixin(LightningElement) {
@api recordId;
+ str;
IsLoading = true;
- Old_Repair_Name;
+ Id;
+ day1;
+ AssetMarkC;
+ AssetOwnerC;
+ InstallDate;
+ PostingDateC;
+ AssetDayC;
+ SerialNumber;
+ OrderNoC;
+ ProductIDC;
+ HospitalId;
+ HospitalC;
+ DepartmentClassId;
+ DepartmentClassC;
+ Name;
+ AccountId;
+ msg;
+ Old_Repair_Name = '';
+ Instration_date_consumable = null;
+ Customer_asset_or_loaner = '';
+ fomatToday;
@wire(CurrentPageReference)
- getStateParameters(currentPageReference) {
- console.log(111);
- console.log(currentPageReference);
-
- if (currentPageReference) {
- const urlValue = currentPageReference.state.recordId;
- if (urlValue) {
- let str = `${urlValue}`;
- console.log("str");
- console.log(str);
- this.recordId = str;
- }
- }
- }
-
-
- connectedCallback(){
- console.log(this.recordId);
- init({recordId:this.recordId}).then(result=>{
- console.log(result);
- if(result!=null){
- if (result.id!=null) {
- var boolday=confirm('璇风‘璁ゆ浠舵槸鍚﹀睘浜�10澶╁唴閲嶅鎶ュ憡锛屽鏋滄槸锛岃浣跨敤鍘烸IS閲岀殑澶嶅埗鍔熻兘閲嶆柊鎻愪氦銆�');
- if(!boolday){
- return;
- }
- }
- if (result.repId!=null) {
- var boolday=confirm('璇风‘璁ゆ浠舵槸鍚﹀睘浜�10澶╁唴閲嶅鎶ュ憡锛屽鏋滄槸锛岄渶鎸夌収鍘熷厛鐨勭淮淇俊鎭～鍐欍��');
- if(!boolday){
- return;
- }
- }
-
+ getStateParameters(currentPageReference) {
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ this.recordId = str;
}
- }).catch(err=>{
- console.log("error:");
- console.log(err);
- }).finally(()=>{
-
- });
+ }
}
+ connectedCallback() {
+ init({
+ recordId: this.recordId
+ }).then(result => {
+ console.log(result);
+ if (result != null) {
+ this.Id = result.Id;
+ this.day1 = result.day1;
+ this.AssetMarkC = result.AssetMarkC;
+ this.AssetOwnerC = result.AssetOwnerC;
+ this.InstallDate = result.InstallDate;
+ this.PostingDateC = result.PostingDateC;
+ this.AssetDayC = result.AssetDayC;
+ this.SerialNumber = result.SerialNumber;
+ this.OrderNoC = result.OrderNoC;
+ this.ProductIDC = result.ProductIDC;
+ this.HospitalId = result.HospitalId;
+ this.HospitalC = result.HospitalC;
+ this.DepartmentClassId = result.DepartmentClassId;
+ this.DepartmentClassC = result.DepartmentClassC;
+ this.Name = result.Name;
+ this.AccountId = result.AccountId;
+
+ this.CreateQISFromAsset();
+ }
+ }).catch(error => {
+ console.log(error);
+ })
+ }
+
+ // 鏂板缓鎺堣/鑰冩牳鎶ュ憡
+ CreateQISFromAsset() {
+ this.fomatToday = this.day1;
+ selecctQISReportrByFomatToday({
+ AssetId: this.Id,
+ fomatToday: this.fomatToday
+ }).then(records => {
+ console.log(records);
+ if (this.AssetMarkC == null || this.AssetMarkC == undefined) {
+ this.ShowToastEvent('淇濇湁璁惧鏍囪涓虹┖锛岃鑱旂郴绠＄悊鍛樿ˉ鍏呫��!', "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ if (records.length >= 1) {
+ this.handleConfirmClick01('璇风‘璁ゆ浠舵槸鍚﹀睘浜�10澶╁唴閲嶅鎶ュ憡锛屽鏋滄槸锛岃浣跨敤鍘烸IS閲岀殑澶嶅埗鍔熻兘閲嶆柊鎻愪氦銆�');
+ } else {
+ this.ss();
+ }
+ })
+ }
+
+ ss() {
+ selecctRepairByFomatToday({
+ AssetId: this.Id,
+ fomatToday: this.fomatToday
+ }).then(records2 => {
+ if (this.AssetMarkC == '鑰楁潗') {
+ selectCASE({
+ AssetOwnerC: this.AssetOwnerC
+ }).then(result => {
+ console.log(result);
+ this.Customer_asset_or_loaner = result;
+ })
+
+ selectNullvalue({
+ InstallDate: this.InstallDate,
+ PostingDateC: this.PostingDateC,
+ AssetDayC: this.AssetDayC
+ }).then(result => {
+ console.log(result);
+ this.Instration_date_consumable = result;
+
+ })
+ }
+ if (records2.length >= 1) {
+ this.Old_Repair_Name = records2[0].Name;
+ }
+ if (records2.length >= 1) {
+ this.handleConfirmClick02('璇风‘璁ゆ浠舵槸鍚﹀睘浜�10澶╁唴閲嶅鎶ュ憡锛屽鏋滄槸锛岄渶鎸夌収鍘熷厛鐨勭淮淇俊鎭～鍐欍��');
+ } else {
+ this.ll();
+ }
+ })
+ }
+
+ ll() {
+
+ const url = encodeDefaultFieldValues({
+ Name: "*",
+ Hospital__c: this.HospitalId,
+ Department_Class__c: this.DepartmentClassId,
+ nonyushohin__c: this.Id,
+ Generation_Source__c: "淇濇湁璁惧",
+ Lots_No__c: this.SerialNumber,
+ sell__c: this.Customer_asset_or_loaner,
+ Instration_date_consumable__c: this.Instration_date_consumable,
+ consumable__c: this.ProductIDC,
+ contract_number_ET__c: this.OrderNoC,
+ Hospital_Department__c: this.AccountId,
+ Old_Repair_Name__c: this.Old_Repair_Name
+ });
+ this[NavigationMixin.Navigate]({
+ type: 'standard__objectPage',
+ attributes: {
+ objectApiName: 'QIS_Report__c',
+ actionName: 'new'
+ },
+ state: {
+ nooverride: '1',
+ defaultFieldValues: url
+ }
+ });
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+
+ async handleConfirmClick01(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+ if (result) {
+ this.ss();
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
+
+ async handleConfirmClick02(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+ if (result) {
+ this.ll();
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
+
+ ShowToastEvent(msg, type) {
+ const event = new ShowToastEvent({
+ title: '',
+ message: msg,
+ variant: type
+ });
+ this.dispatchEvent(event);
+ }
+
+ closeAction() {
+ location.reload();
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.js-meta.xml b/force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.js-meta.xml
index 03722c3..3392981 100644
--- a/force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.js-meta.xml
+++ b/force-app/main/default/lwc/lexCreateQISFromAsset/lexCreateQISFromAsset.js-meta.xml
@@ -1,19 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexCreateQISFromAsset">
- <apiVersion>51.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>
- <targetConfigs>
- <targetConfig targets="lightning__FlowScreen">
- <!-- name js涓娇鐢ㄧ殑鍙橀噺锛屼粠灞忓箷娴佷腑鑾峰彇鍙傛暟 label 鍦ㄥ睆骞曟祦鐨勮LWC鐨勮缃腑鏄剧ず -->
- <property name="recordId" type="String" label="recordId"/>
- </targetConfig>
- </targetConfigs>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>54.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__RecordPage</target>
+ <target>lightning__AppPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.css b/force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.css
new file mode 100644
index 0000000..e9fe316
--- /dev/null
+++ b/force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.css
@@ -0,0 +1,12 @@
+.toast{
+ border: 1px solid #c9c9c9;
+ border-radius: 10px;
+ width: 50%;
+ margin: 0 auto;
+ font-size: 18px;
+ font-weight: bold;
+ padding: 10px 20px;
+ background: #EA001E;
+ display: flex;
+ color: white;
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.html b/force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.html
index d044dbb..0c84cf0 100644
--- a/force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.html
+++ b/force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.html
@@ -1,5 +1,15 @@
<template>
<div class="exampleHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ <lightning-button onclick={handleConfirmClick} label="Open Confirm Modal"></lightning-button>
+ <lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button> </div>
</div>
+ <div if:false={IsLoading} class="toast">
+ <span style="padding: 10px;">{msg}</span>
+ <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse" onclick={closeAction} title="Close" style="background-color: #e5e4e2;margin-top: 15px;">
+ <lightning-icon class="greyIcon" icon-name="utility:close" alternative-text="Connected" variant="inverse" size="small"
+ title="Close" style="color: black;"></lightning-icon>
+ <span class="slds-assistive-text">Close</span>
+ </button>
+ </div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.js b/force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.js
index 7b58902..97ec5dd 100644
--- a/force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.js
+++ b/force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.js
@@ -15,8 +15,18 @@
import selecctProduct2ById from '@salesforce/apex/buttonAssetCtl.selecctProduct2ById';
import selecctRepairByFomatToday from '@salesforce/apex/buttonAssetCtl.selecctRepairByFomatToday';
import selecctQISReportByFomatToday from '@salesforce/apex/buttonAssetCtl.selecctQISReportByFomatToday';
+import {
+ NavigationMixin
+} from 'lightning/navigation';
+import {
+ encodeDefaultFieldValues
+} from 'lightning/pageReferenceUtils';
+import LightningConfirm from 'lightning/confirm';
+import {
+ ShowToastEvent
+} from 'lightning/platformShowToastEvent';
-export default class LexCreateRepairFromAsset extends LightningElement {
+export default class LexCreateRepairFromAsset extends NavigationMixin(LightningElement) {
@api recordId;
str;
IsLoading = true;
@@ -38,6 +48,20 @@
RepairSalesPointProvinceChinaC;
notCreateRepairFromAssetButton;
notCreateRepairFromAssetButton02;
+ msg;
+ flag = false;
+ fomatToday;
+ QIS_Name = '';
+ QIS_Id = '';
+ Old_Repair_Name = '';
+ Work_Location = '';
+ FSE_GI_Main_Leader__id = '';
+ FSE_GI_Main_Leader__name = '';
+ FSE_SP_Main_Leader__id = '';
+ FSE_SP_Main_Leader__name = '';
+ Incharge_Staff = '';
+ Incharge_Staff_id = '';
+
@wire(CurrentPageReference)
getStateParameters(currentPageReference) {
@@ -56,7 +80,6 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.Id = result.Id;
this.userID = result.userID;
this.day = result.day;
@@ -84,9 +107,6 @@
}
this.CreateRepairFromAsset();
})
-
-
- this.dispatchEvent(new CloseActionScreenEvent());
}
}).catch(error => {
console.log(error);
@@ -102,61 +122,61 @@
var EmployeeNo = this.EmployeeNoC;
if (nCRepairFromAssetBList.indexOf(EmployeeNo) != -1) {
- alert("瀵逛笉璧凤紝鎮ㄦ棤鏉冧娇鐢ㄦ鎸夐挳鍒涘缓淇悊锛�");
+ this.ShowToastEvent("瀵逛笉璧凤紝鎮ㄦ棤鏉冧娇鐢ㄦ鎸夐挳鍒涘缓淇悊锛�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
- var fomatToday = this.day1;
- var QIS_Name = '';
- var QIS_Id = '';
- var url1 = "";
- var FSE_GI_Main_Leader__id = '';
- var FSE_GI_Main_Leader__name = '';
- var FSE_SP_Main_Leader__id = '';
- var FSE_SP_Main_Leader__name = '';
- var Incharge_Staff = '';
- var Incharge_Staff_id = '';
- var Work_Location = '';
- var Old_Repair_Name = '';
+ this.fomatToday = this.day1;
+
selecctQISReportByFomatToday({
AssetId: this.Id,
- fomatToday: fomatToday
+ fomatToday: this.fomatToday
}).then(records => {
- console.log(records);
if (records.length >= 1) {
- var boolday = confirm('璇风‘璁ゆ浠舵槸鍚﹀睘浜�10澶╁唴閲嶅鎶ュ憡锛屽鏋滄槸锛岃浣跨敤鍘烸IS淇℃伅濉啓銆�');
- if (!boolday) {
- return;
- }
+ this.QIS_Name = records[0].Name;
+ this.QIS_Id = records[0].Id;
}
if (records.length >= 1) {
- QIS_Name = records[0].Name;
- QIS_Id = records[0].Id;
+ this.handleConfirmClick01('璇风‘璁ゆ浠舵槸鍚﹀睘浜�10澶╁唴閲嶅鎶ュ憡锛屽鏋滄槸锛岃浣跨敤鍘烸IS淇℃伅濉啓銆�');
+ } else {
+ this.ss();
}
+
})
+ }
+
+ ss() {
selecctRepairByFomatToday({
AssetId: this.Id,
- fomatToday: fomatToday
+ fomatToday: this.fomatToday
}).then(records2 => {
console.log(records2);
- if (records2.length >= 1) {
- var boolday = confirm('姝や欢璁惧濡備负10澶╁唴閲嶅鎶ュ憡锛屽缓璁洖鍒板師淇悊鍗曚娇鐢ㄥ鍒跺姛鑳芥彁浜ゃ�傝纭鏄惁缁х画鏂板缓淇悊锛� ');
- if (!boolday) {
- return;
- }
+
+ var partSupplyFinishDate = this.NoPartRiskDateFC;
+ if (this.day < this.NoPartRiskDateFC && this.NoPartRiskDateFC <= this.day2) {
+ this.ShowToastEvent('棰勮' + partSupplyFinishDate + '闆朵欢鍗冲皢鍋滀骇锛岃閫佷慨鍓嶄笌宸ュ巶鍙奟C鑱旂粶', "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ if (this.NoPartRiskDateFC != null && this.NoPartRiskDateFC != undefined && this.NoPartRiskDateFC <= this.day) {
+ this.ShowToastEvent('璇ュ瀷鍙烽浂浠跺凡缁忓仠浜э紝鏈夌壒娈婇渶姹傦紝璇烽�佷慨鍓嶄笌宸ュ巶RC鑱旂粶', "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
}
if (records2.length >= 1) {
- Old_Repair_Name = records2[0].Name;
+ this.Old_Repair_Name = records2[0].Name;
+ }
+ if (records2.length >= 1) {
+ this.handleConfirmClick02('姝や欢璁惧濡備负10澶╁唴閲嶅鎶ュ憡锛屽缓璁洖鍒板師淇悊鍗曚娇鐢ㄥ鍒跺姛鑳芥彁浜ゃ�傝纭鏄惁缁х画鏂板缓淇悊锛� ');
+ } else {
+ this.ll();
}
})
- var partSupplyFinishDate = this.NoPartRiskDateFC;
- if (this.day < this.NoPartRiskDateFC && this.NoPartRiskDateFC <= this.day2) {
- alert('棰勮' + partSupplyFinishDate + '闆朵欢鍗冲皢鍋滀骇锛岃閫佷慨鍓嶄笌宸ュ巶鍙奟C鑱旂粶');
- }
- if (this.NoPartRiskDateFC != null && this.NoPartRiskDateFC != undefined && this.NoPartRiskDateFC <= this.day) {
- alert('璇ュ瀷鍙烽浂浠跺凡缁忓仠浜э紝鏈夌壒娈婇渶姹傦紝璇烽�佷慨鍓嶄笌宸ュ巶RC鑱旂粶');
- }
+ }
+
+ ll() {
selecctProduct2ById({
Id: this.ProductIDC
}).then(recordP => {
@@ -165,87 +185,146 @@
if (recordP != null && recordP.length > 0) {
var canRepair = recordP[0].Can_Repair__c;
if (canRepair == '绗笁鏂�') {
- alert('闈炴垜鍙镐慨鐞嗗璞★紝鏃犳硶鏂板缓淇悊锛屽鏈変笉鏄庤鍜ㄨCIC');
+ this.ShowToastEvent('闈炴垜鍙镐慨鐞嗗璞★紝鏃犳硶鏂板缓淇悊锛屽鏈変笉鏄庤鍜ㄨCIC', "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
if (canRepair == '涓�' || canRepair == null) {
- alert('鏈澶囨棤娉曟柊寤轰慨鐞�');
+ this.ShowToastEvent('鏈澶囨棤娉曟柊寤轰慨鐞�', "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
if (canRepair == 'RC閫佷慨') {
- url1 = "&00N10000009HAJl=TRUE"
+ this.flag = true;
}
}
- })
- selecctAccountByAccountId({
- AccountId: this.AccountId
- }).then(List => {
- console.log(List);
- if (List != null) {
- var RecordTypeId = List[0]['Parent']['RecordType_DeveloperName__c'].substring(0, 15);
- console.log(RecordTypeId);
- if (RecordTypeId != 'Agency') {
- if (List[0]['Parent']['Parent']['FSE_GI_Main_Leader__c'] != null) {
- FSE_GI_Main_Leader__id = List[0]['Parent']['Parent']['FSE_GI_Main_Leader__c'].substring(0, 15);
- FSE_GI_Main_Leader__name = List[0]['Parent']['Parent']['FSE_GI_Main_Leader__r']['Name'];
- }
- if (List[0]['Parent']['Parent']['FSE_SP_Main_Leader__c'] != null) {
- FSE_SP_Main_Leader__id = List[0]['Parent']['Parent']['FSE_SP_Main_Leader__c'].substring(0, 15);
- FSE_SP_Main_Leader__name = List[0]['Parent']['Parent']['FSE_SP_Main_Leader__r']['Name'];
- }
- if (List[0]['Parent']['RecordType_DeveloperName__c'] != null || List[0]['Parent']['RecordType_DeveloperName__c'] != undefined) {
- var recordId = List[0]['Parent']['RecordType_DeveloperName__c'].substring(0, 15);
- if (recordId == 'Department_Class_GI' || recordId == 'Department_Class_BF' || recordId == 'Department_Class_ET') {
- if (List[0]['Parent']['Parent']['FSE_GI_Main_Leader__c'] != null) {
- Work_Location = List[0]['Parent']['Parent']['FSE_GI_Main_Leader__r']['Work_Location__c'];
- }
- } else if (recordId == 'Department_Class_GS' || recordId == 'Department_Class_URO' || recordId == 'Department_Class_ENT' || recordId == 'Department_Class_GYN' || recordId == 'Department_Class_OTH') {
- if (List[0]['Parent']['Parent']['FSE_SP_Main_Leader__c'] != null) {
- Work_Location = List[0]['Parent']['Parent']['FSE_SP_Main_Leader__r']['Work_Location__c'];
- }
+ selecctAccountByAccountId({
+ AccountId: this.AccountId
+ }).then(List => {
+ console.log(List);
+ if (List != null) {
+ var RecordTypeId = List[0]['Parent']['RecordType_DeveloperName__c'].substring(0, 15);
+ console.log(RecordTypeId);
+ if (RecordTypeId != 'Agency') {
+ if (List[0]['Parent']['Parent']['FSE_GI_Main_Leader__c'] != null) {
+ this.FSE_GI_Main_Leader__id = List[0]['Parent']['Parent']['FSE_GI_Main_Leader__c'].substring(0, 15);
+ this.FSE_GI_Main_Leader__name = List[0]['Parent']['Parent']['FSE_GI_Main_Leader__r']['Name'];
+ }
+ if (List[0]['Parent']['Parent']['FSE_SP_Main_Leader__c'] != null) {
+ this.FSE_SP_Main_Leader__id = List[0]['Parent']['Parent']['FSE_SP_Main_Leader__c'].substring(0, 15);
+ this.FSE_SP_Main_Leader__name = List[0]['Parent']['Parent']['FSE_SP_Main_Leader__r']['Name'];
+ }
+ if (List[0]['Parent']['RecordType_DeveloperName__c'] != null || List[0]['Parent']['RecordType_DeveloperName__c'] != undefined) {
+ var recordId = List[0]['Parent']['RecordType_DeveloperName__c'].substring(0, 15);
+ if (recordId == 'Department_Class_GI' || recordId == 'Department_Class_BF' || recordId == 'Department_Class_ET') {
+ if (List[0]['Parent']['Parent']['FSE_GI_Main_Leader__c'] != null) {
+ this.Work_Location = List[0]['Parent']['Parent']['FSE_GI_Main_Leader__r']['this.Work_Location__c'];
+ }
+ } else if (recordId == 'Department_Class_GS' || recordId == 'Department_Class_URO' || recordId == 'Department_Class_ENT' || recordId == 'Department_Class_GYN' || recordId == 'Department_Class_OTH') {
+ if (List[0]['Parent']['Parent']['FSE_SP_Main_Leader__c'] != null) {
+ this.Work_Location = List[0]['Parent']['Parent']['FSE_SP_Main_Leader__r']['this.Work_Location__c'];
+ }
+ }
+ }
+ if (RecordTypeId == 'Department_Class_GI') {
+ this.Incharge_Staff = this.FSE_GI_Main_Leader__name;
+ this.Incharge_Staff_id = this.FSE_GI_Main_Leader__id;
+ }
+ if (RecordTypeId == 'Department_Class_BF') {
+ this.Incharge_Staff = this.FSE_GI_Main_Leader__name;
+ this.Incharge_Staff_id = this.FSE_GI_Main_Leader__id;
+ }
+ if (RecordTypeId == 'Department_Class_ET') {
+ this.Incharge_Staff = this.FSE_GI_Main_Leader__name;
+ this.Incharge_Staff_id = this.FSE_GI_Main_Leader__id;
+ }
+ if (RecordTypeId == 'Department_Class_GS') {
+ this.Incharge_Staff = this.FSE_SP_Main_Leader__name;
+ this.Incharge_Staff_id = this.FSE_SP_Main_Leader__id;
+ }
+ if (RecordTypeId == 'Department_Class_URO') {
+ this.Incharge_Staff = this.FSE_SP_Main_Leader__name;
+ this.Incharge_Staff_id = this.FSE_SP_Main_Leader__id;
+ }
+ if (RecordTypeId == 'Department_Class_ENT') {
+ this.Incharge_Staff = this.FSE_SP_Main_Leader__name;
+ this.Incharge_Staff_id = this.FSE_SP_Main_Leader__id;
+ }
+ if (RecordTypeId == 'Department_Class_GYN') {
+ this.Incharge_Staff = this.FSE_SP_Main_Leader__name;
+ this.Incharge_Staff_id = this.FSE_SP_Main_Leader__id;
+ }
+ if (RecordTypeId == 'Department_Class_OTH') {
+ this.Incharge_Staff = this.FSE_SP_Main_Leader__name;
+ this.Incharge_Staff_id = this.FSE_SP_Main_Leader__id;
}
}
- if (RecordTypeId == 'Department_Class_GI') {
- Incharge_Staff = FSE_GI_Main_Leader__name;
- Incharge_Staff_id = FSE_GI_Main_Leader__id;
- }
- if (RecordTypeId == 'Department_Class_BF') {
- Incharge_Staff = FSE_GI_Main_Leader__name;
- Incharge_Staff_id = FSE_GI_Main_Leader__id;
- }
- if (RecordTypeId == 'Department_Class_ET') {
- Incharge_Staff = FSE_GI_Main_Leader__name;
- Incharge_Staff_id = FSE_GI_Main_Leader__id;
- }
- if (RecordTypeId == 'Department_Class_GS') {
- Incharge_Staff = FSE_SP_Main_Leader__name;
- Incharge_Staff_id = FSE_SP_Main_Leader__id;
- }
- if (RecordTypeId == 'Department_Class_URO') {
- Incharge_Staff = FSE_SP_Main_Leader__name;
- Incharge_Staff_id = FSE_SP_Main_Leader__id;
- }
- if (RecordTypeId == 'Department_Class_ENT') {
- Incharge_Staff = FSE_SP_Main_Leader__name;
- Incharge_Staff_id = FSE_SP_Main_Leader__id;
- }
- if (RecordTypeId == 'Department_Class_GYN') {
- Incharge_Staff = FSE_SP_Main_Leader__name;
- Incharge_Staff_id = FSE_SP_Main_Leader__id;
- }
- if (RecordTypeId == 'Department_Class_OTH') {
- Incharge_Staff = FSE_SP_Main_Leader__name;
- Incharge_Staff_id = FSE_SP_Main_Leader__id;
- }
}
-
- }
- var url = "/a0J/e?CF00N10000002Dx66_lkid=" + this.HospitalId + "&CF00N10000002Dx66=" + this.HospitalC + "&CF00N10000002Dx5t_lkid=" + this.DepartmentClassId + "&CF00N10000002Dx5t=" + this.DepartmentClassC + "&CF00N10000002Dx5n_lkid=" + this.Id + "&CF00N10000002Dx5n=" + this.Name + "&CF00N10000002Dx1X_lkid=" + this.Id + "&CF00N10000002Dx1X=" + this.Name + "&CF00N10000002EMHw_lkid=" + Incharge_Staff_id + "&CF00N10000002EMHw=" + Incharge_Staff + "&00N10000002FH86=%e5%8f%aa%e4%bf%ae%e7%90%86&00N10000006P6Rn=" + this.RepairSalesPointProvinceChinaC + "&00N10000006P6SM=" + encodeURI(Work_Location) + "&CF00N10000009H7yM=" + QIS_Name + "&CF00N10000009H7yM_lkid=" + QIS_Id + "&00N10000009H2fa=" + Old_Repair_Name + "&retURL=%2F" + this.Id;
- if (url1 != undefined) {
- url = url + url1;
- }
- window.open(url);
+ const url = encodeDefaultFieldValues({
+ Hospital__c: this.HospitalId,
+ Department_Class__c: this.DepartmentClassId,
+ Account__c: this.AccountId,
+ Delivered_Product__c: this.Id,
+ Incharge_Staff__c: this.Incharge_Staff_id,
+ Work_Location_select__c: this.RepairSalesPointProvinceChinaC,
+ SalesOfficeCode_selection__c: encodeURI(this.Work_Location),
+ Source_QIS__c: this.QIS_Id,
+ Old_Name__c: this.Old_Repair_Name,
+ Exc_Work_Location__c: this.flag
+ });
+ this[NavigationMixin.Navigate]({
+ type: 'standard__objectPage',
+ attributes: {
+ objectApiName: 'Repair__c',
+ actionName: 'new'
+ },
+ state: {
+ nooverride: '1',
+ defaultFieldValues: url
+ }
+ });
+ this.dispatchEvent(new CloseActionScreenEvent());
+ })
})
}
+
+ async handleConfirmClick01(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+ if (result) {
+ this.ss();
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
+
+ async handleConfirmClick02(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+ if (result) {
+ this.ll();
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
+
+ ShowToastEvent(msg, type) {
+ const event = new ShowToastEvent({
+ title: '',
+ message: msg,
+ variant: type
+ });
+ this.dispatchEvent(event);
+ }
+
+ closeAction() {
+ location.reload();
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.js-meta.xml b/force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.js-meta.xml
index 3da8f7a..3392981 100644
--- a/force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.js-meta.xml
+++ b/force-app/main/default/lwc/lexCreateRepairFromAsset/lexCreateRepairFromAsset.js-meta.xml
@@ -7,12 +7,5 @@
<target>lightning__AppPage</target>
<target>lightning__HomePage</target>
<target>lightning__RecordAction</target>
- <target>lightning__FlowScreen</target>
</targets>
- <!-- 瀹氫箟鍙橀噺 -->
- <targetConfigs>
- <targetConfig targets="lightning__FlowScreen">
- <property name="recordId" type="String" label="recordId"/>
- </targetConfig>
- </targetConfigs>
</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateRepairFromDepartment/lexCreateRepairFromDepartment.js b/force-app/main/default/lwc/lexCreateRepairFromDepartment/lexCreateRepairFromDepartment.js
index 3e6e2aa..a4febf0 100644
--- a/force-app/main/default/lwc/lexCreateRepairFromDepartment/lexCreateRepairFromDepartment.js
+++ b/force-app/main/default/lwc/lexCreateRepairFromDepartment/lexCreateRepairFromDepartment.js
@@ -12,8 +12,14 @@
import init from '@salesforce/apex/buttonAccountCtl.init';
import initUserName from '@salesforce/apex/buttonAccountCtl.initUserName';
import selecctAccountByAccountId from '@salesforce/apex/buttonAccountCtl.selecctAccountByAccountId';
+import {
+ NavigationMixin
+} from 'lightning/navigation';
+import {
+ encodeDefaultFieldValues
+} from 'lightning/pageReferenceUtils';
-export default class LexCreateRepairFromDepartment extends LightningElement {
+export default class LexCreateRepairFromDepartment extends NavigationMixin(LightningElement) {
@api recordId;
str;
IsLoading = true;
@@ -43,7 +49,6 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.Id = result.Id;
this.HospitalC = result.HospitalC == undefined ? "" : result.HospitalC;;
this.HospitalId = result.HospitalId == undefined ? "" : result.HospitalId;;
@@ -61,7 +66,6 @@
}
this.CreateRepairFromDepartment();
})
- this.dispatchEvent(new CloseActionScreenEvent());
}
}).catch(error => {
console.log(error);
@@ -142,8 +146,35 @@
Incharge_Staff_id = FSE_SP_Main_Leader__id;
}
}
- var url = "/a0J/e?CF00N10000002Dx66_lkid=" + this.HospitalId + "&CF00N10000002Dx66=" + this.HospitalC + "&CF00N10000002Dx5t_lkid=" + this.DepartmentClassId + "&CF00N10000002Dx5t=" + this.DepartmentClassC + "&CF00N10000002Dx5n_lkid=" + this.Id + "&CF00N10000002Dx5n=" + this.Name + "&CF00N10000002EMHw_lkid=" + Incharge_Staff_id + "&CF00N10000002EMHw=" + Incharge_Staff + "&00N10000002FH86=%e5%8f%aa%e4%bf%ae%e7%90%86&00N10000006P6Rn=" + this.RepairSalesPointProvinceChinaC + "&00N10000006P6SM=" + encodeURI(Work_Location) + "&retURL=%2F" + this.Id;
- window.open(url);
+ const url = encodeDefaultFieldValues({
+ Hospital__c: this.HospitalC,
+ Department_Class__c: this.DepartmentClassC,
+ Account__c: this.Id,
+ Incharge_Staff__c: Incharge_Staff_id,
+ SalesOfficeCode_selection__c: encodeURI(Work_Location),
+ work_location_select__c: this.RepairSalesPointProvinceChinaC
+ });
+ this[NavigationMixin.Navigate]({
+ type: 'standard__objectPage',
+ attributes: {
+ objectApiName: 'Repair__c',
+ actionName: 'new'
+ },
+ state: {
+ nooverride: '1',
+ defaultFieldValues: url
+ }
+ });
+ this.dispatchEvent(new CloseActionScreenEvent());
+
+ // var url = "/a0J/e?CF00N10000002Dx66_lkid=" + this.HospitalId + "&CF00N10000002Dx66=" + this.HospitalC +
+ // "&CF00N10000002Dx5t_lkid=" + this.DepartmentClassId + "&CF00N10000002Dx5t=" + this.DepartmentClassC +
+ // "&CF00N10000002Dx5n_lkid=" + this.Id + "&CF00N10000002Dx5n=" + this.Name +
+ // "&CF00N10000002EMHw_lkid=" + Incharge_Staff_id + "&CF00N10000002EMHw=" + Incharge_Staff +
+ // "&00N10000002FH86=%e5%8f%aa%e4%bf%ae%e7%90%86&00N10000006P6Rn=" + this.RepairSalesPointProvinceChinaC +
+ // "&00N10000006P6SM=" + encodeURI(Work_Location) + "&retURL=%2F" + this.Id;
+
+ // window.open(url);
})
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateRepairFromDepartment/lexCreateRepairFromDepartment.js-meta.xml b/force-app/main/default/lwc/lexCreateRepairFromDepartment/lexCreateRepairFromDepartment.js-meta.xml
index 3da8f7a..3392981 100644
--- a/force-app/main/default/lwc/lexCreateRepairFromDepartment/lexCreateRepairFromDepartment.js-meta.xml
+++ b/force-app/main/default/lwc/lexCreateRepairFromDepartment/lexCreateRepairFromDepartment.js-meta.xml
@@ -7,12 +7,5 @@
<target>lightning__AppPage</target>
<target>lightning__HomePage</target>
<target>lightning__RecordAction</target>
- <target>lightning__FlowScreen</target>
</targets>
- <!-- 瀹氫箟鍙橀噺 -->
- <targetConfigs>
- <targetConfig targets="lightning__FlowScreen">
- <property name="recordId" type="String" label="recordId"/>
- </targetConfig>
- </targetConfigs>
</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateRepairFromOnCall/lexCreateRepairFromOnCall.js-meta.xml b/force-app/main/default/lwc/lexCreateRepairFromOnCall/lexCreateRepairFromOnCall.js-meta.xml
index 3da8f7a..3392981 100644
--- a/force-app/main/default/lwc/lexCreateRepairFromOnCall/lexCreateRepairFromOnCall.js-meta.xml
+++ b/force-app/main/default/lwc/lexCreateRepairFromOnCall/lexCreateRepairFromOnCall.js-meta.xml
@@ -7,12 +7,5 @@
<target>lightning__AppPage</target>
<target>lightning__HomePage</target>
<target>lightning__RecordAction</target>
- <target>lightning__FlowScreen</target>
</targets>
- <!-- 瀹氫箟鍙橀噺 -->
- <targetConfigs>
- <targetConfig targets="lightning__FlowScreen">
- <property name="recordId" type="String" label="recordId"/>
- </targetConfig>
- </targetConfigs>
</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateRepairFromQIS/lexCreateRepairFromQIS.html b/force-app/main/default/lwc/lexCreateRepairFromQIS/lexCreateRepairFromQIS.html
index d044dbb..6a4719c 100644
--- a/force-app/main/default/lwc/lexCreateRepairFromQIS/lexCreateRepairFromQIS.html
+++ b/force-app/main/default/lwc/lexCreateRepairFromQIS/lexCreateRepairFromQIS.html
@@ -1,5 +1,5 @@
<template>
<div class="exampleHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
- </div>
+ <lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button> </div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateRepairFromQIS/lexCreateRepairFromQIS.js b/force-app/main/default/lwc/lexCreateRepairFromQIS/lexCreateRepairFromQIS.js
index 69ef0be..a290a88 100644
--- a/force-app/main/default/lwc/lexCreateRepairFromQIS/lexCreateRepairFromQIS.js
+++ b/force-app/main/default/lwc/lexCreateRepairFromQIS/lexCreateRepairFromQIS.js
@@ -12,8 +12,17 @@
import init from '@salesforce/apex/buttonQISReportCtl.init';
import initUserName from '@salesforce/apex/buttonQISReportCtl.initUserName';
import selecctAccountByAccountId from '@salesforce/apex/buttonQISReportCtl.selecctAccountByAccountId';
+import {
+ NavigationMixin
+} from 'lightning/navigation';
+import {
+ encodeDefaultFieldValues
+} from 'lightning/pageReferenceUtils';
+import {
+ ShowToastEvent
+} from 'lightning/platformShowToastEvent';
-export default class LexCreateRepairFromQIS extends LightningElement {
+export default class LexCreateRepairFromQIS extends NavigationMixin(LightningElement) {
@api recordId;
str;
IsLoading = true;
@@ -55,7 +64,6 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.Id = result.Id;
this.Name = result.Name;
this.SourceOnCallId = result.SourceOnCallId == undefined ? "" : result.SourceOnCallId;
@@ -86,7 +94,6 @@
this.CreateRepairFromQIS();
})
- this.dispatchEvent(new CloseActionScreenEvent());
}
}).catch(error => {
console.log(error);
@@ -95,7 +102,6 @@
//鏂板缓淇悊QIS
CreateRepairFromQIS() {
- console.log("寮�濮�");
var newflag = false;
if ((this.OCMJudgementC == '璐ㄩ噺闂' && this.nextAction == '鏃犲伩缁翠慨' && this.SpecialFollow == '0') || (this.OCMJudgementC == '闈炶川閲忛棶棰�' && this.nextAction == '鏃犲伩缁翠慨' && this.SpecialFollow == '1') || (this.OCMJudgementC == '闈炶川閲忛棶棰�' && this.nextAction == '鏈夊伩缁翠慨' && this.SpecialFollow == '0') || (this.OCMJudgementC == '璐ㄩ噺闂+闈炶川閲忛棶棰�' && this.nextAction == '鏃犲伩缁翠慨' && this.SpecialFollow == '1') || (this.OCMJudgementC == '璐ㄩ噺闂+闈炶川閲忛棶棰�' && this.nextAction == '鏈夊伩缁翠慨+鏃犲伩缁翠慨' && this.SpecialFollow == '0')) {
newflag = true;
@@ -110,73 +116,120 @@
var Incharge_Staff = '';
var Incharge_Staff_id = '';
var Work_Location = '';
- if (List[0]['ParentId'] != null) {
- RecordTypeId = List[0]['Parent']['RecordType_DeveloperName__c'].substring(0, 15);
- console.log(RecordTypeId);
- var FSE_GI_Main_Leader__id = '';
- var FSE_GI_Main_Leader__name = '';
- var FSE_SP_Main_Leader__id = '';
- var FSE_SP_Main_Leader__name = '';
- if (List[0]['Parent']['Parent']['FSE_GI_Main_Leader__c'] != null) {
- FSE_GI_Main_Leader__id = List[0]['Parent']['Parent']['FSE_GI_Main_Leader__c'].substring(0, 15);
- FSE_GI_Main_Leader__name = List[0]['Parent']['Parent']['FSE_GI_Main_Leader__r']['Name'];
- }
- if (List[0]['Parent']['Parent']['FSE_SP_Main_Leader__c'] != null) {
- FSE_SP_Main_Leader__id = List[0]['Parent']['Parent']['FSE_SP_Main_Leader__c'].substring(0, 15);
- FSE_SP_Main_Leader__name = List[0]['Parent']['Parent']['FSE_SP_Main_Leader__r']['Name'];
- }
- if (List[0]['Parent']['RecordType_DeveloperName__c'] != null || List[0]['Parent']['RecordType_DeveloperName__c'] != undefined) {
- var recordId = List[0]['Parent']['RecordType_DeveloperName__c'].substring(0, 15);
- if (recordId == 'Department_Class_GI' || recordId == 'Department_Class_BF' || recordId == 'Department_Class_ET') {
- if (List[0]['Parent']['Parent']['FSE_GI_Main_Leader__c'] != null) {
- Work_Location = List[0]['Parent']['Parent']['FSE_GI_Main_Leader__r']['Work_Location__c'];
- }
- } else if (recordId == 'Department_Class_GS' || recordId == 'Department_Class_URO' || recordId == 'Department_Class_ENT' || recordId == 'Department_Class_GYN' || recordId == 'Department_Class_OTH') {
- if (List[0]['Parent']['Parent']['FSE_SP_Main_Leader__c'] != null) {
- Work_Location = List[0]['Parent']['Parent']['FSE_SP_Main_Leader__r']['Work_Location__c'];
- }
-
+ if (List.length > 0) {
+ if (List[0]['ParentId'] != null) {
+ RecordTypeId = List[0]['Parent']['RecordType_DeveloperName__c'].substring(0, 15);
+ console.log(RecordTypeId);
+ var FSE_GI_Main_Leader__id = '';
+ var FSE_GI_Main_Leader__name = '';
+ var FSE_SP_Main_Leader__id = '';
+ var FSE_SP_Main_Leader__name = '';
+ if (List[0]['Parent']['Parent']['FSE_GI_Main_Leader__c'] != null) {
+ FSE_GI_Main_Leader__id = List[0]['Parent']['Parent']['FSE_GI_Main_Leader__c'].substring(0, 15);
+ FSE_GI_Main_Leader__name = List[0]['Parent']['Parent']['FSE_GI_Main_Leader__r']['Name'];
}
- }
- if (RecordTypeId == 'Department_Class_GI') {
- Incharge_Staff = FSE_GI_Main_Leader__name;
- Incharge_Staff_id = FSE_GI_Main_Leader__id;
- }
- if (RecordTypeId == 'Department_Class_BF') {
- Incharge_Staff = FSE_GI_Main_Leader__name;
- Incharge_Staff_id = FSE_GI_Main_Leader__id;
- }
- if (RecordTypeId == 'Department_Class_ET') {
- Incharge_Staff = FSE_GI_Main_Leader__name;
- Incharge_Staff_id = FSE_GI_Main_Leader__id;
- }
- if (RecordTypeId == 'Department_Class_GS') {
- Incharge_Staff = FSE_SP_Main_Leader__name;
- Incharge_Staff_id = FSE_SP_Main_Leader__id;
- }
- if (RecordTypeId == 'Department_Class_URO') {
- Incharge_Staff = FSE_SP_Main_Leader__name;
- Incharge_Staff_id = FSE_SP_Main_Leader__id;
- }
- if (RecordTypeId == 'Department_Class_ENT') {
- Incharge_Staff = FSE_SP_Main_Leader__name;
- Incharge_Staff_id = FSE_SP_Main_Leader__id;
- }
- if (RecordTypeId == 'Department_Class_GYN') {
- Incharge_Staff = FSE_SP_Main_Leader__name;
- Incharge_Staff_id = FSE_SP_Main_Leader__id;
- }
- if (RecordTypeId == 'Department_Class_OTH') {
- Incharge_Staff = FSE_SP_Main_Leader__name;
- Incharge_Staff_id = FSE_SP_Main_Leader__id;
+ if (List[0]['Parent']['Parent']['FSE_SP_Main_Leader__c'] != null) {
+ FSE_SP_Main_Leader__id = List[0]['Parent']['Parent']['FSE_SP_Main_Leader__c'].substring(0, 15);
+ FSE_SP_Main_Leader__name = List[0]['Parent']['Parent']['FSE_SP_Main_Leader__r']['Name'];
+ }
+ if (List[0]['Parent']['RecordType_DeveloperName__c'] != null || List[0]['Parent']['RecordType_DeveloperName__c'] != undefined) {
+ var recordId = List[0]['Parent']['RecordType_DeveloperName__c'].substring(0, 15);
+ if (recordId == 'Department_Class_GI' || recordId == 'Department_Class_BF' || recordId == 'Department_Class_ET') {
+ if (List[0]['Parent']['Parent']['FSE_GI_Main_Leader__c'] != null) {
+ Work_Location = List[0]['Parent']['Parent']['FSE_GI_Main_Leader__r']['Work_Location__c'];
+ }
+ } else if (recordId == 'Department_Class_GS' || recordId == 'Department_Class_URO' || recordId == 'Department_Class_ENT' || recordId == 'Department_Class_GYN' || recordId == 'Department_Class_OTH') {
+ if (List[0]['Parent']['Parent']['FSE_SP_Main_Leader__c'] != null) {
+ Work_Location = List[0]['Parent']['Parent']['FSE_SP_Main_Leader__r']['Work_Location__c'];
+ }
+
+ }
+ }
+ if (RecordTypeId == 'Department_Class_GI') {
+ Incharge_Staff = FSE_GI_Main_Leader__name;
+ Incharge_Staff_id = FSE_GI_Main_Leader__id;
+ }
+ if (RecordTypeId == 'Department_Class_BF') {
+ Incharge_Staff = FSE_GI_Main_Leader__name;
+ Incharge_Staff_id = FSE_GI_Main_Leader__id;
+ }
+ if (RecordTypeId == 'Department_Class_ET') {
+ Incharge_Staff = FSE_GI_Main_Leader__name;
+ Incharge_Staff_id = FSE_GI_Main_Leader__id;
+ }
+ if (RecordTypeId == 'Department_Class_GS') {
+ Incharge_Staff = FSE_SP_Main_Leader__name;
+ Incharge_Staff_id = FSE_SP_Main_Leader__id;
+ }
+ if (RecordTypeId == 'Department_Class_URO') {
+ Incharge_Staff = FSE_SP_Main_Leader__name;
+ Incharge_Staff_id = FSE_SP_Main_Leader__id;
+ }
+ if (RecordTypeId == 'Department_Class_ENT') {
+ Incharge_Staff = FSE_SP_Main_Leader__name;
+ Incharge_Staff_id = FSE_SP_Main_Leader__id;
+ }
+ if (RecordTypeId == 'Department_Class_GYN') {
+ Incharge_Staff = FSE_SP_Main_Leader__name;
+ Incharge_Staff_id = FSE_SP_Main_Leader__id;
+ }
+ if (RecordTypeId == 'Department_Class_OTH') {
+ Incharge_Staff = FSE_SP_Main_Leader__name;
+ Incharge_Staff_id = FSE_SP_Main_Leader__id;
+ }
}
}
- window.open("/a0J/e?CF00N10000002FIJU_lkid=" + this.SourceOnCallId + "&CF00N10000002FIJU=" + this.SourceOnCall + "&CF00N10000002FIJZ_lkid=" + this.Id + "&CF00N10000002FIJZ=" + this.Name + "&CF00N10000002Dx66_lkid=" + this.HospitalId + "&CF00N10000002Dx66=" + this.Hospital + "&CF00N10000002Dx5t_lkid=" + this.DepartmentClassId + "&CF00N10000002Dx5t=" + this.DepartmentClass + "&CF00N10000002Dx5n_lkid=" + this.HospitalDepartmentId + "&CF00N10000002Dx5n=" + this.HospitalDepartment + "&CF00N10000002Dx1X_lkid=" + this.nonyushohinId + "&CF00N10000002Dx1X=" + this.nonyushohin + "&CF00N10000002EMHw_lkid=" + Incharge_Staff_id + "&CF00N10000002EMHw=" + Incharge_Staff + "&00N10000002Dx5y=" + this.TrableOccurDaYCollect + "&00N10000006P6SM=" + encodeURI(Work_Location) + "&00N10000002FH86=" + this.sourceForRepair + "&00N10000006P6Rn=" + this.RepairSalesPointProvinceChinaC + "&retURL=%2F" + this.Id);
+ const url = encodeDefaultFieldValues({
+ On_Call_ID__c: this.SourceOnCall,
+ QIS_ID__c: this.Id,
+ Hospital__c: this.Hospital,
+ Department_Class__c: this.DepartmentClass,
+ Account__c: this.HospitalDepartment,
+ Delivered_Product__c: this.nonyushohin,
+ Incharge_Staff__c: Incharge_Staff_id,
+ Failure_Occurrence_Date__c: this.TrableOccurDaYCollect,
+ SalesOfficeCode_selection__c: encodeURI(Work_Location),
+ Repair_Source__c: this.sourceForRepair,
+ work_location_select__c: this.RepairSalesPointProvinceChinaC
+ });
+ this[NavigationMixin.Navigate]({
+ type: 'standard__objectPage',
+ attributes: {
+ objectApiName: 'Repair__c',
+ actionName: 'new'
+ },
+ state: {
+ nooverride: '1',
+ defaultFieldValues: url
+ }
+ });
+ this.dispatchEvent(new CloseActionScreenEvent());
+
+ // window.open("/a0J/e?CF00N10000002FIJU_lkid=" + this.SourceOnCallId + "&CF00N10000002FIJU=" + this.SourceOnCall +
+ // "&CF00N10000002FIJZ_lkid=" + this.Id + "&CF00N10000002FIJZ=" + this.Name +
+ // "&CF00N10000002Dx66_lkid=" + this.HospitalId + "&CF00N10000002Dx66=" + this.Hospital +
+ // "&CF00N10000002Dx5t_lkid=" + this.DepartmentClassId + "&CF00N10000002Dx5t=" + this.DepartmentClass +
+ // "&CF00N10000002Dx5n_lkid=" + this.HospitalDepartmentId + "&CF00N10000002Dx5n=" + this.HospitalDepartment +
+ // "&CF00N10000002Dx1X_lkid=" + this.nonyushohinId + "&CF00N10000002Dx1X=" + this.nonyushohin +
+ // "&CF00N10000002EMHw_lkid=" + Incharge_Staff_id + "&CF00N10000002EMHw=" + Incharge_Staff +
+ // "&00N10000002Dx5y=" + this.TrableOccurDaYCollect + "&00N10000006P6SM=" + encodeURI(Work_Location) +
+ // "&00N10000002FH86=" + this.sourceForRepair + "&00N10000006P6Rn=" + this.RepairSalesPointProvinceChinaC +
+ // "&retURL=%2F" + this.Id);
})
} else {
- alert("涓嶈兘鏂板缓淇悊");
+ this.ShowToastEvent("涓嶈兘鏂板缓淇悊", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
}
}
+
+ ShowToastEvent(msg, type) {
+ const event = new ShowToastEvent({
+ title: '',
+ message: msg,
+ variant: type
+ });
+ this.dispatchEvent(event);
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateRepairFromQIS/lexCreateRepairFromQIS.js-meta.xml b/force-app/main/default/lwc/lexCreateRepairFromQIS/lexCreateRepairFromQIS.js-meta.xml
index 3da8f7a..3392981 100644
--- a/force-app/main/default/lwc/lexCreateRepairFromQIS/lexCreateRepairFromQIS.js-meta.xml
+++ b/force-app/main/default/lwc/lexCreateRepairFromQIS/lexCreateRepairFromQIS.js-meta.xml
@@ -7,12 +7,5 @@
<target>lightning__AppPage</target>
<target>lightning__HomePage</target>
<target>lightning__RecordAction</target>
- <target>lightning__FlowScreen</target>
</targets>
- <!-- 瀹氫箟鍙橀噺 -->
- <targetConfigs>
- <targetConfig targets="lightning__FlowScreen">
- <property name="recordId" type="String" label="recordId"/>
- </targetConfig>
- </targetConfigs>
</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCustomAnewMaintenance/lexCustomAnewMaintenance.css b/force-app/main/default/lwc/lexCustomAnewMaintenance/lexCustomAnewMaintenance.css
new file mode 100644
index 0000000..e9fe316
--- /dev/null
+++ b/force-app/main/default/lwc/lexCustomAnewMaintenance/lexCustomAnewMaintenance.css
@@ -0,0 +1,12 @@
+.toast{
+ border: 1px solid #c9c9c9;
+ border-radius: 10px;
+ width: 50%;
+ margin: 0 auto;
+ font-size: 18px;
+ font-weight: bold;
+ padding: 10px 20px;
+ background: #EA001E;
+ display: flex;
+ color: white;
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCustomAnewMaintenance/lexCustomAnewMaintenance.html b/force-app/main/default/lwc/lexCustomAnewMaintenance/lexCustomAnewMaintenance.html
index d044dbb..8b1c452 100644
--- a/force-app/main/default/lwc/lexCustomAnewMaintenance/lexCustomAnewMaintenance.html
+++ b/force-app/main/default/lwc/lexCustomAnewMaintenance/lexCustomAnewMaintenance.html
@@ -1,5 +1,15 @@
<template>
<div class="exampleHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ <lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button>
+ </div>
+ <div if:false={IsLoading} class="toast">
+ <span style="padding: 10px;">{msg}</span>
+ <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse" onclick={closeAction}
+ title="Close" style="background-color: #e5e4e2;margin-top: 15px;">
+ <lightning-icon class="greyIcon" icon-name="utility:close" alternative-text="Connected" variant="inverse"
+ size="small" title="Close" style="color: black;"></lightning-icon>
+ <span class="slds-assistive-text">Close</span>
+ </button>
</div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCustomAnewMaintenance/lexCustomAnewMaintenance.js b/force-app/main/default/lwc/lexCustomAnewMaintenance/lexCustomAnewMaintenance.js
index c5bd082..bf632b6 100644
--- a/force-app/main/default/lwc/lexCustomAnewMaintenance/lexCustomAnewMaintenance.js
+++ b/force-app/main/default/lwc/lexCustomAnewMaintenance/lexCustomAnewMaintenance.js
@@ -10,6 +10,9 @@
CloseActionScreenEvent
} from 'lightning/actions';
import init from '@salesforce/apex/otherButtonMaintenanceContractCtl.init';
+import {
+ ShowToastEvent
+} from 'lightning/platformShowToastEvent';
import selectMaintenanceContractEstimate from '@salesforce/apex/otherButtonMaintenanceContractCtl.selectMaintenanceContractEstimate';
export default class LexCustomAnewMaintenance extends LightningElement {
@@ -20,6 +23,7 @@
StatusC;
RecordTypeDeveloperNameC;
URFContractC;
+ msg;
@wire(CurrentPageReference)
getStateParameters(currentPageReference) {
@@ -39,7 +43,6 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.Id = result.Id;
this.RecordTypeDeveloperNameC = result.RecordTypeDeveloperNameC;
this.StatusC = result.StatusC;
@@ -53,10 +56,12 @@
})
}
- //涓
+ //鍚堝悓鍐嶆姤浠�
CustomAnew() {
if (this.StatusC != "寮曞悎涓�") {
- alert("缁翠慨鍚堝悓涓嶆槸璇环涓殑鐘舵�侊紝涓嶈兘鍐嶆姤浠�")
+ this.msg = "缁翠慨鍚堝悓涓嶆槸璇环涓殑鐘舵�侊紝涓嶈兘鍐嶆姤浠�";
+ this.IsLoading = false;
+ return;
} else {
selectMaintenanceContractEstimate({
recordId: this.Id
@@ -72,11 +77,16 @@
} else {
window.open("/apex/SelectAssetEstimate?copyid=" + ids[0].Id, "_top");
}
-
} else {
- alert('璇烽�夋嫨涓�涓姤浠�')
+ this.msg = '璇烽�夋嫨涓�涓姤浠�';
+ this.IsLoading = false;
+ return;
}
})
}
}
+
+ closeAction() {
+ window.history.go(-1);
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCustomDelete/lexCustomDelete.html b/force-app/main/default/lwc/lexCustomDelete/lexCustomDelete.html
index d044dbb..d512b2c 100644
--- a/force-app/main/default/lwc/lexCustomDelete/lexCustomDelete.html
+++ b/force-app/main/default/lwc/lexCustomDelete/lexCustomDelete.html
@@ -1,5 +1,6 @@
<template>
<div class="exampleHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ <lightning-button onclick={handleConfirmClick} label="Open Confirm Modal"></lightning-button>
</div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCustomDelete/lexCustomDelete.js b/force-app/main/default/lwc/lexCustomDelete/lexCustomDelete.js
index 5123b26..7d968c9 100644
--- a/force-app/main/default/lwc/lexCustomDelete/lexCustomDelete.js
+++ b/force-app/main/default/lwc/lexCustomDelete/lexCustomDelete.js
@@ -15,6 +15,7 @@
import {
ShowToastEvent
} from 'lightning/platformShowToastEvent';
+import LightningConfirm from 'lightning/confirm';
export default class LexCustomDelete extends LightningElement {
@api recordId;
@@ -45,13 +46,10 @@
this.userID = result.userID;
this.CustomDelete();
- this.dispatchEvent(new CloseActionScreenEvent());
}
}).catch(error => {
console.log(error);
- }).finally(() => {
-
- });
+ })
}
// 鍒犻櫎
@@ -62,24 +60,34 @@
if (repList != null && repList.length > 0) {
var rp = repList[0];
if (rp.Status__c != "鑽夋涓�" && rp.Status__c != "1.鍙楃悊瀹屾瘯(SAP寰呭彂閫�)" && rp.Status__c != "4.淇悊鍝佽繑閫侀樁娈�") {
- this.ShowToastEvent("涓嶆槸鑽夋涓紝涓嶈兘鍒犻櫎", "error")
+ this.ShowToastEvent("涓嶆槸鑽夋涓紝涓嶈兘鍒犻櫎", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
} else if (rp.Status__c == "4.淇悊鍝佽繑閫侀樁娈�" && (rp.SAP_Transfer_time__c != undefined || rp.Repair_Ordered_Date__c != undefined)) {
- this.ShowToastEvent("宸茬粡鍙戦�佽繃SAP锛屼笉鑳藉垹闄�", "error")
+ this.ShowToastEvent("宸茬粡鍙戦�佽繃SAP锛屼笉鑳藉垹闄�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
} else if (this.userID.substring(0, 15) != rp.CreatedById.substring(0, 15) && this.userID.substring(0, 15) != rp.Acc_OwnerId__c.substring(0, 15) && this.userID.substring(0, 15) != rp.FSE_ownerid__c.substring(0, 15)) {
- this.ShowToastEvent("涓嶆槸鎵�鏈変汉銆佸垱寤轰汉鎴朏SE涓昏礋璐ｄ汉锛屼笉鑳藉垹闄�", "error")
+ this.ShowToastEvent("涓嶆槸鎵�鏈変汉銆佸垱寤轰汉鎴朏SE涓昏礋璐ｄ汉锛屼笉鑳藉垹闄�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
} else {
- if (confirm("鏄惁纭畾锛�")) {
- deleteRepair({
- rid: rp.Id
- }).then(rtn => {
- if (rtn == "OK") {
- window.location.href = "/a0J/o";
- } else {
- alert(rtn);
- }
- })
- }
+ this.handleConfirmClick("鏄惁纭畾锛�");
}
+ }
+ })
+ }
+
+ ll() {
+ deleteRepair({
+ rid: this.Id
+ }).then(rtn => {
+ if (rtn == "OK") {
+ window.location.href = "/a0J/o";
+ } else {
+ this.ShowToastEvent(rtn, "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
}
})
}
@@ -92,4 +100,18 @@
});
this.dispatchEvent(event);
}
+
+ async handleConfirmClick(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+
+ if (result) {
+ this.ll();
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.css b/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.css
new file mode 100644
index 0000000..e9fe316
--- /dev/null
+++ b/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.css
@@ -0,0 +1,12 @@
+.toast{
+ border: 1px solid #c9c9c9;
+ border-radius: 10px;
+ width: 50%;
+ margin: 0 auto;
+ font-size: 18px;
+ font-weight: bold;
+ padding: 10px 20px;
+ background: #EA001E;
+ display: flex;
+ color: white;
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.html b/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.html
index bc883e6..0bc8152 100644
--- a/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.html
+++ b/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.html
@@ -1,5 +1,14 @@
<template>
<div class="toReportHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ <lightning-button onclick={handleConfirmClick} label="Open Confirm Modal"></lightning-button>
</div>
+ <div if:false={IsLoading} class="toast">
+ <span style="padding: 10px;">{msg}</span>
+ <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse" onclick={closeAction} title="Close" style="background-color: #e5e4e2;margin-top: 15px;">
+ <lightning-icon class="greyIcon" icon-name="utility:close" alternative-text="Connected" variant="inverse" size="small"
+ title="Close" style="color: black;"></lightning-icon>
+ <span class="slds-assistive-text">Close</span>
+ </button>
+ </div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.js b/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.js
index 9b81859..86a5138 100644
--- a/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.js
+++ b/force-app/main/default/lwc/lexCustomNewMCMaintenance/lexCustomNewMCMaintenance.js
@@ -10,6 +10,7 @@
CloseActionScreenEvent
} from 'lightning/actions';
import init from '@salesforce/apex/otherButtonMaintenanceContractCtl.init';
+import LightningConfirm from 'lightning/confirm';
export default class LexCustomNewMCMaintenance extends LightningElement {
@api recordId;
@@ -20,6 +21,7 @@
IsRecognitionModelC;
URFContractC;
RecordTypeDeveloperNameC;
+ msg;
@wire(CurrentPageReference)
getStateParameters(currentPageReference) {
@@ -39,7 +41,6 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.Id = result.Id;
this.StatusC = result.StatusC;
this.IsRecognitionModelC = result.IsRecognitionModelC;
@@ -57,22 +58,44 @@
// 鏂板缓鏂版湇鍔″悎鍚屾姤浠�
CustomNewMC() {
if (this.StatusC != "寮曞悎涓�") {
- alert("缁翠慨鍚堝悓涓嶆槸璇环涓殑鐘舵�侊紝涓嶈兘鏂板缓鎶ヤ环");
+ this.msg = "缁翠慨鍚堝悓涓嶆槸璇环涓殑鐘舵�侊紝涓嶈兘鏂板缓鎶ヤ环";
+ this.IsLoading = false;
} else {
if (this.IsRecognitionModelC == 1) {
- if (!confirm("璇ョ粡閿�鍟嗕负鍏堟瀵硅薄锛屾槸鍚︾户缁柊寤烘姤浠凤紵")) {
- return;
- }
- }
- if (this.RecordTypeDeveloperNameC == "NewMaintenance_Contract") {
- if (this.URFContractC == 0) {
- window.open("/apex/SelectAssetEstimateVM?mcid=" + this.Id, "_top");
- } else {
- window.open("/apex/SelectAssetEstimateURF?mcid=" + this.Id, "_top");
- }
+ this.handleConfirmClick("璇ョ粡閿�鍟嗕负鍏堟瀵硅薄锛屾槸鍚︾户缁柊寤烘姤浠凤紵")
} else {
- window.open("/apex/SelectAssetEstimate?mcid=" + this.Id, "_top");
+ this.ll();
}
+
}
}
+
+ ll() {
+ if (this.RecordTypeDeveloperNameC == "NewMaintenance_Contract") {
+ if (this.URFContractC == 0) {
+ window.open("/apex/SelectAssetEstimateVM?mcid=" + this.Id, "_top");
+ } else {
+ window.open("/apex/SelectAssetEstimateURF?mcid=" + this.Id, "_top");
+ }
+ } else {
+ window.open("/apex/SelectAssetEstimate?mcid=" + this.Id, "_top");
+ }
+ }
+
+ async handleConfirmClick(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+ if (result) {
+ this.ll();
+ } else {
+ window.history.go(-1);
+ }
+ }
+
+ closeAction() {
+ window.history.go(-1);
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCustomNewMaintenance/lexCustomNewMaintenance.css b/force-app/main/default/lwc/lexCustomNewMaintenance/lexCustomNewMaintenance.css
new file mode 100644
index 0000000..e9fe316
--- /dev/null
+++ b/force-app/main/default/lwc/lexCustomNewMaintenance/lexCustomNewMaintenance.css
@@ -0,0 +1,12 @@
+.toast{
+ border: 1px solid #c9c9c9;
+ border-radius: 10px;
+ width: 50%;
+ margin: 0 auto;
+ font-size: 18px;
+ font-weight: bold;
+ padding: 10px 20px;
+ background: #EA001E;
+ display: flex;
+ color: white;
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCustomNewMaintenance/lexCustomNewMaintenance.html b/force-app/main/default/lwc/lexCustomNewMaintenance/lexCustomNewMaintenance.html
index d044dbb..880fcf3 100644
--- a/force-app/main/default/lwc/lexCustomNewMaintenance/lexCustomNewMaintenance.html
+++ b/force-app/main/default/lwc/lexCustomNewMaintenance/lexCustomNewMaintenance.html
@@ -2,4 +2,12 @@
<div class="exampleHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
</div>
+ <div if:false={IsLoading} class="toast">
+ <span style="padding: 10px;">{msg}</span>
+ <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse" onclick={closeAction} title="Close" style="background-color: #e5e4e2;margin-top: 15px;">
+ <lightning-icon class="greyIcon" icon-name="utility:close" alternative-text="Connected" variant="inverse" size="small"
+ title="Close" style="color: black;"></lightning-icon>
+ <span class="slds-assistive-text">Close</span>
+ </button>
+ </div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCustomNewMaintenance/lexCustomNewMaintenance.js b/force-app/main/default/lwc/lexCustomNewMaintenance/lexCustomNewMaintenance.js
index ac46aa5..cbd223a 100644
--- a/force-app/main/default/lwc/lexCustomNewMaintenance/lexCustomNewMaintenance.js
+++ b/force-app/main/default/lwc/lexCustomNewMaintenance/lexCustomNewMaintenance.js
@@ -18,6 +18,7 @@
Id;
StatusC;
RecordTypeDeveloperNameC;
+ msg;
@wire(CurrentPageReference)
getStateParameters(currentPageReference) {
@@ -37,7 +38,6 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.Id = result.Id;
this.StatusC = result.StatusC;
this.RecordTypeDeveloperNameC = result.RecordTypeDeveloperNameC;
@@ -53,7 +53,8 @@
// 鏂板缓缁翠慨鍚堝悓鎶ヤ环
CustomNew() {
if (this.StatusC != "寮曞悎涓�") {
- alert("缁翠慨鍚堝悓涓嶆槸璇环涓殑鐘舵�侊紝涓嶈兘鏂板缓鎶ヤ环");
+ this.msg = "缁翠慨鍚堝悓涓嶆槸璇环涓殑鐘舵�侊紝涓嶈兘鏂板缓鎶ヤ环";
+ this.IsLoading = false;
} else {
if (this.RecordTypeDeveloperNameC == "NewMaintenance_Contract") {
window.open("/apex/SelectAssetEstimateVM?mcid=" + this.Id, "_top");
@@ -62,4 +63,8 @@
}
}
}
+
+ closeAction() {
+ window.history.go(-1);
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexDiscountRequest/lexDiscountRequest.js b/force-app/main/default/lwc/lexDiscountRequest/lexDiscountRequest.js
index f446a53..d37c2db 100644
--- a/force-app/main/default/lwc/lexDiscountRequest/lexDiscountRequest.js
+++ b/force-app/main/default/lwc/lexDiscountRequest/lexDiscountRequest.js
@@ -46,7 +46,6 @@
this.RepairC = result.RepairC;
this.DiscountRequest();
- this.dispatchEvent(new CloseActionScreenEvent());
}
}).catch(error => {
console.log(error);
@@ -63,10 +62,12 @@
console.log(rp);
if (rp.Return_Without_Repair_IF__c == true) {
this.ShowToastEvent("鏈慨鐞嗗綊杩樼殑淇悊涓嶅厑璁稿噺浠风敵璇�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
} else {
if (rp.Return_Without_Repair__c == true) {
this.ShowToastEvent("宸茬粡鐢宠鏈慨鐞嗚繑鍥烇紝濡傛灉闇�瑕佺户缁慨鐞嗚鍙栨秷\"鏈慨鐞嗗綊杩樼敵璇穃"鐨勫嬀閫夊悗鍐嶈繘琛屽噺浠风敵璇锋搷浣�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
}
@@ -77,7 +78,8 @@
console.log(result);
if (result.length > 0) {
var split = result.split(", ");
- alert(split[1]);
+ this.ShowToastEvent(split[1], "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
})
@@ -87,7 +89,8 @@
console.log(result);
if (result.length > 0) {
var split = result.split(", ");
- alert(split[1]);
+ this.ShowToastEvent(split[1], "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
})
diff --git a/force-app/main/default/lwc/lexESignAcceptanceHospital/lexESignAcceptanceHospital.js b/force-app/main/default/lwc/lexESignAcceptanceHospital/lexESignAcceptanceHospital.js
index 57ae846..cd47fc2 100644
--- a/force-app/main/default/lwc/lexESignAcceptanceHospital/lexESignAcceptanceHospital.js
+++ b/force-app/main/default/lwc/lexESignAcceptanceHospital/lexESignAcceptanceHospital.js
@@ -89,7 +89,7 @@
this.dispatchEvent(new CloseActionScreenEvent());
}else{
window.open ('/apex/HPConfirmPage?id='+this.recordId, '鍖婚櫌纭',
- 'height=340, width=600, top=200, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no');
+ 'height=340, width=800, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no');
this.dispatchEvent(new CloseActionScreenEvent());
}
}
diff --git a/force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.html b/force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.html
index ae58c6c..894569c 100644
--- a/force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.html
+++ b/force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.html
@@ -1,5 +1,6 @@
<template>
<div class="dispatchOCSMQARAHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ <lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button>
</div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.js b/force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.js
index 55736c9..eaf7afa 100644
--- a/force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.js
+++ b/force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.js
@@ -1,9 +1,9 @@
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference, NavigationMixin} from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
-import init from '@salesforce/apex/lexEquipmentRentalApply_FromQISCtl.rentalApp';
-import rentalApp from '@salesforce/apex/lexEquipmentRentalApply_FromQISCtl.init';
-import UserInfo_Owner from '@salesforce/apex/lexEquipmentRentalApply_FromQISCtl.UserInfo_Owner';
+import rentalApp from '@salesforce/apex/LexEquipmentRentalApply_FromQISCtl.rentalApp';
+import init from '@salesforce/apex/LexEquipmentRentalApply_FromQISCtl.init';
+import UserInfo_Owner from '@salesforce/apex/LexEquipmentRentalApply_FromQISCtl.UserInfo_Owner';
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
@@ -33,7 +33,7 @@
rentalApp({
recordId: this.recordId
}).then(result => {
- console.log('rentalApp============' + result);
+ console.log('rentalApp============',result);
if(result.lenth > 0){
const evt = new ShowToastEvent({
title : 'Error',
@@ -47,22 +47,23 @@
recordId: this.recordId
}).then(result => {
this.IsLoading = false;
-
+ console.log('init============',result);
if (result != null) {
if(result.nextAction=='閫佸洖'){
- this.showToast('QIS瀵瑰簲鏂规硶涓衡�滈�佸洖鈥濓紝涓嶈兘鐢宠','warning');
+ this.showToast('QIS瀵瑰簲鏂规硶涓衡�滈�佸洖鈥濓紝涓嶈兘鐢宠','error');
return;
}
if(result.qISStatus=='鑽夋涓�'){
- this.showToast('QIS鐘舵�佷负鑽夋涓紝涓嶈兘鐢宠','warning');
+ // this.msg = 'QIS鐘舵�佷负鑽夋涓紝涓嶈兘鐢宠';
+ this.showToast('QIS鐘舵�佷负鑽夋涓紝涓嶈兘鐢宠','error');
return;
}
if(result.qISStatus=='FSE濉啓瀹屾瘯'){
- this.showToast('QIS鐘舵�佷负FSE濉啓瀹屾瘯锛屼笉鑳界敵璇�','warning');
+ this.showToast('QIS鐘舵�佷负FSE濉啓瀹屾瘯锛屼笉鑳界敵璇�','error');
return;
}
if(result.qISStatus=='鍙栨秷'){
- this.showToast('QIS鐘舵�佷负鍙栨秷锛屼笉鑳界敵璇�','warning');
+ this.showToast('QIS鐘舵�佷负鍙栨秷锛屼笉鑳界敵璇�','error');
return;
}
// if('{!$User.isFormal_Stuff__c}'=='true'){
@@ -73,22 +74,22 @@
// }
UserInfo_Owner({}).then(res=>{
if(res.isFormalStuff == 'true'){
- this.showToast('璇曠敤鏈熷唴锛屼笉鑳界敵璇�','warning');
+ this.showToast('璇曠敤鏈熷唴锛屼笉鑳界敵璇�','error');
return;
}else{
const defaultValues = encodeDefaultFieldValues({
QIS_Report__c: this.recordId,
- Hospital: result.hospital,
- Strategic_dept: result.departmentClass,
- Account:result.hospitalDepartment,
- Demo_purpose1:'缁翠慨浠ｇ敤',
- demo_purpose2:'绱㈣禂QIS',
+ Hospital__c: result.hospital,
+ Strategic_dept__c: result.departmentClass,
+ Account__c:result.hospitalDepartment,
+ Demo_purpose1__c:'缁翠慨浠ｇ敤',
+ demo_purpose2__c:'绱㈣禂QIS',
Name:'*',
- Person_In_Charge:res.lastName + res.firstName,
- applyUser:res.lastName + res.firstName,
- Loaner_received_staff:res.lastName + res.firstName,
- QIS_number:result.name,
- QISRepair:result.repair
+ Person_In_Charge__c:res.lastName + res.firstName,
+ applyUser__c:res.lastName + res.firstName,
+ Loaner_received_staff__c:res.lastName + res.firstName,
+ QIS_number__c:result.name,
+ QISRepair__c:result.repair
});
this[NavigationMixin.Navigate]({
@@ -122,11 +123,12 @@
showToast(message, type) {
const evt = new ShowToastEvent({
- title: '',
+ title: 'Error',
message: message,
variant: type
});
this.dispatchEvent(evt);
+ this.dispatchEvent(new CloseActionScreenEvent());
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.js-meta.xml b/force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.js-meta.xml
index c499f08..fafbfc5 100644
--- a/force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.js-meta.xml
+++ b/force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.js-meta.xml
@@ -3,19 +3,9 @@
<apiVersion>56.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>
- <!-- 瀹氫箟鍙橀噺 -->
- <targetConfigs>
- <targetConfig targets="lightning__FlowScreen">
- <!-- name js涓娇鐢ㄧ殑鍙橀噺锛屼粠灞忓箷娴佷腑鑾峰彇鍙傛暟 label 鍦ㄥ睆骞曟祦鐨勮LWC鐨勮缃腑鏄剧ず -->
- <property name="recordId" type="String" label="recordId"/>
- <!-- <property name="rentalApplyIds" type="String[]" label="rentalApplyIds"/> -->
- </targetConfig>
- </targetConfigs>
+ <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/lexEquipmentRentalApply_FromSA/lexEquipmentRentalApply_FromSA.js b/force-app/main/default/lwc/lexEquipmentRentalApply_FromSA/lexEquipmentRentalApply_FromSA.js
index 0794680..5512f33 100644
--- a/force-app/main/default/lwc/lexEquipmentRentalApply_FromSA/lexEquipmentRentalApply_FromSA.js
+++ b/force-app/main/default/lwc/lexEquipmentRentalApply_FromSA/lexEquipmentRentalApply_FromSA.js
@@ -51,18 +51,18 @@
return;
}else{
const defaultValues = encodeDefaultFieldValues({
- Statu_Achievements: result.achievement,
+ Statu_Achievements__c: result.achievement,
retURL:this.recordId,
- Hospital: result.hospital,
+ Hospital__c: result.hospital,
Name:'*',
- Strategic_dept: result.departmentClass,
- Account:result.oppClassName,
- Demo_purpose1:'浜у搧璇曠敤',
- demo_purpose2:'宸茶喘寰呰揣',
- Person_In_Charge:res.lastName + res.firstName,
- applyUser:res.lastName + res.firstName,
- Loaner_received_staff:res.lastName + res.firstName,
- Follow_UP_Opp:result.opportunity
+ Strategic_dept__c: result.departmentClass,
+ Account__c:result.oppClassName,
+ Demo_purpose1__c:'浜у搧璇曠敤',
+ demo_purpose2__c:'宸茶喘寰呰揣',
+ Person_In_Charge__c:res.lastName + res.firstName,
+ applyUser__c:res.lastName + res.firstName,
+ Loaner_received_staff__c:res.lastName + res.firstName,
+ Follow_UP_Opp__c:result.opportunity
});
this[NavigationMixin.Navigate]({
@@ -85,7 +85,7 @@
console.log(error);
})
}else{
- this.showToast(res,'warning');
+ this.showToast(res,'error');
return;
}
})
@@ -94,10 +94,11 @@
showToast(message, type) {
const evt = new ShowToastEvent({
- title: '',
+ title: 'Error',
message: message,
variant: type
});
this.dispatchEvent(evt);
+ this.dispatchEvent(new CloseActionScreenEvent());
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexEquipmentRentalApply_FromSA/lexEquipmentRentalApply_FromSA.js-meta.xml b/force-app/main/default/lwc/lexEquipmentRentalApply_FromSA/lexEquipmentRentalApply_FromSA.js-meta.xml
index c499f08..fafbfc5 100644
--- a/force-app/main/default/lwc/lexEquipmentRentalApply_FromSA/lexEquipmentRentalApply_FromSA.js-meta.xml
+++ b/force-app/main/default/lwc/lexEquipmentRentalApply_FromSA/lexEquipmentRentalApply_FromSA.js-meta.xml
@@ -3,19 +3,9 @@
<apiVersion>56.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>
- <!-- 瀹氫箟鍙橀噺 -->
- <targetConfigs>
- <targetConfig targets="lightning__FlowScreen">
- <!-- name js涓娇鐢ㄧ殑鍙橀噺锛屼粠灞忓箷娴佷腑鑾峰彇鍙傛暟 label 鍦ㄥ睆骞曟祦鐨勮LWC鐨勮缃腑鏄剧ず -->
- <property name="recordId" type="String" label="recordId"/>
- <!-- <property name="rentalApplyIds" type="String[]" label="rentalApplyIds"/> -->
- </targetConfig>
- </targetConfigs>
+ <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/lexInquiryFormCustomLink1/lexInquiryFormCustomLink1.html b/force-app/main/default/lwc/lexInquiryFormCustomLink1/lexInquiryFormCustomLink1.html
new file mode 100644
index 0000000..e9c9349
--- /dev/null
+++ b/force-app/main/default/lwc/lexInquiryFormCustomLink1/lexInquiryFormCustomLink1.html
@@ -0,0 +1,4 @@
+<template>
+ <div class="lexESignAcceptanceHospital" if:true={IsLoding}>
+ <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/lexInquiryFormCustomLink1/lexInquiryFormCustomLink1.js b/force-app/main/default/lwc/lexInquiryFormCustomLink1/lexInquiryFormCustomLink1.js
new file mode 100644
index 0000000..c716f28
--- /dev/null
+++ b/force-app/main/default/lwc/lexInquiryFormCustomLink1/lexInquiryFormCustomLink1.js
@@ -0,0 +1,201 @@
+import { LightningElement,wire,track,api} from 'lwc';
+import { CurrentPageReference } from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import init from '@salesforce/apex/InquiryFormController.init';
+import sqlResult from '@salesforce/apex/InquiryFormController.sqlResult';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+export default class lexInquiryFormCustomLink1 extends LightningElement {
+ @api recordId;//OwnerId
+ IsLoading = true;
+ Id= "";
+ ServiceStatus= "";
+ profileId= "";
+ userId= "";
+ Status= "";
+ LeadLink= "";
+ OppNameSearch= "";
+ ContactName= "";
+ ContactId = "";
+ HospitalName= "";
+ HospitalID= "";
+ DepartmentClass= "";
+ DepartmentID = "";
+ OppNameSearchID= "";
+ Campaign= "";
+ CampaignID= "";
+ Name= "";
+ CancelReason= "";
+ Phone= "";
+ Email= "";
+ LastName= "";
+ LeadSource= "";
+ OpportunityDivision= "";
+ Request1= "";
+ Urgent = false;
+ FSEOwner= "";
+ FamilyName= "";
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ this.recordId = str;
+ }
+ }
+ }
+ connectedCallback(){
+ init({
+ recordId: this.recordId
+ }).then(result => {
+ this.IsLoading = false;
+ this.Id = result.Id != undefined ? result.Id : "";
+ this.ServiceStatus = result.ServiceStatus != undefined ? result.ServiceStatus : "";
+ this.profileId = result.profileId != undefined ? result.profileId : "";
+ this.userId = result.userId != undefined ? result.userId : "";
+ this.Status = result.Status != undefined ? result.Status : "";
+ this.LeadLink = result.LeadLink != undefined ? result.LeadLink : "";
+ this.OppNameSearch = result.OppNameSearch != undefined ? result.OppNameSearch : "";
+ this.ContactName = result.ContactName != undefined ? result.ContactName : "";
+ this.ContactId = result.ContactId != undefined ? result.ContactId : "";
+ this.HospitalName = result.HospitalName != undefined ? result.HospitalName : "";
+ this.HospitalID = result.HospitalID != undefined ? result.HospitalID : "";
+ this.DepartmentClass = result.DepartmentClass != undefined ? result.DepartmentClass : "";
+ this.DepartmentID = result.DepartmentID != undefined ? result.DepartmentID : "";
+ this.OppNameSearchID = result.OppNameSearchID != undefined ? result.OppNameSearchID : "";
+ this.Campaign = result.Campaign != undefined ? result.Campaign : "";
+ this.CampaignID = result.CampaignID != undefined ? result.CampaignID : "";
+ this.Name = result.Name != undefined ? result.Name : "";
+ this.CancelReason = result.CancelReason != undefined ? result.CancelReason : "";
+ this.Phone = result.Phone != undefined ? result.Phone : "";
+ this.Email = result.Email != undefined ? result.Email : "";
+ this.LastName = result.LastName != undefined ? result.LastName : "";
+ this.LeadSource = result.LeadSource != undefined ? result.LeadSource : "";
+ this.OpportunityDivision = result.OpportunityDivision != undefined ? result.OpportunityDivision : "";
+ this.Request1 = result.Request1 != undefined ? result.Request1 : "";
+ this.FSEOwner = result.FSEOwner != undefined ? result.FSEOwner : "";
+ this.FamilyName = result.FamilyName != undefined ? result.FamilyName : "";
+ this.Urgent = result.Urgent == 0 ? 0 :1;
+ this.CustomLink1();
+ })
+ }
+ // 浜у搧鍜ㄨ鍗� 鏂板缓鎰忓悜
+ CustomLink1(){
+ var lead = "";
+ var search = "";
+ sqlResult({id:this.recordId}).then(records=>{
+ var Request = '';
+ if(records[0].Request_Detail__c != null){
+ Request = records[0].Request_Detail__c.toString();
+ }
+ var lead = this.LeadLink;
+ var search = this.OppNameSearch;
+ // this.CustomLink1();
+ if(lead){
+ // alert('宸茬粡鏈夋剰鍚戜簡锛屼笉鑳藉啀鍒涘缓鏂扮殑鎰忓悜銆�');
+ this.showToast("宸茬粡鏈夋剰鍚戜簡锛屼笉鑳藉啀鍒涘缓鏂扮殑鎰忓悜銆傦紒","error");
+ return;
+ }else{
+ //var urlStr ='/00Q/e?RecordType=01210000000QiRa&ent=Lead';
+ //window.open(urlStr);
+ var urlStr ='/apex/NewAndEditLead?RecordType=01210000000QiRa&ent=Lead'+
+ '&CF00N10000006ps6f='+encodeURI(this.ContactName)+
+ '&CF00N10000006ps6f_lkid='+encodeURI(this.ContactId)+
+ '&CF00N10000002CvC5='+encodeURI(this.HospitalName)+
+ '&CF00N10000002CvC5_lkid='+encodeURI(this.HospitalID)+
+ '&CF00N10000006qNtt='+encodeURI(this.DepartmentClass)+
+ '&CF00N10000006qNtt_lkid='+encodeURI(this.DepartmentID)+
+ '&CF00N10000006qNty='+encodeURI(this.OppNameSearch)+
+ '&CF00N10000006qNty_lkid='+encodeURI(this.OppNameSearchID)+
+ '&CF00N10000004oN28='+encodeURI(this.Campaign)+
+ '&CF00N10000004oN28_lkid='+encodeURI(this.CampaignID)+
+ '&CF00N1000000962np='+encodeURI(this.Name)+
+ '&CF00N1000000962np_lkid='+encodeURI(this.Id)+
+ '&00N10000006qBYk='+encodeURI(this.CancelReason)+
+ // '&00N10000006qGvj='+result.ProductOwner+
+ '&00N10000002CvBM=' + encodeURI(Request) +
+ '&lea13=鏈窡杩�'+
+ '&lea3='+encodeURI(this.HospitalName)+
+ '&lea8='+encodeURI(this.Phone.trim())+
+ '&lea11='+encodeURI(this.Email.trim())+
+ '&name_lastlea2=' + encodeURI(this.FamilyName) +
+ '&name_firstlea2='+encodeURI(this.LastName)+
+ '&lea5='+encodeURI(this.LeadSource)+
+ '&00N10000002CvBR='+encodeURI(this.Request1)+
+ '&00N10000002CvBC='+encodeURI(this.OpportunityDivision)+
+ //'&00N10000002EjE1={!Inquiry_form__c.Opp_Name_Search__c}'+
+ '&00N10000002CvB7='+encodeURI(this.Urgent);
+ if(search != "" && search != null){
+ urlStr += '&00N10000002EjE1='+this.OppNameSearch;
+ }
+ window.open(urlStr);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ })
+ }
+ showToast(msg,type) {
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+}
+
+// var foo = function() {
+// var lead = '{!Inquiry_form__c.Lead_link__c}';
+// var status = '{!Inquiry_form__c.Status__c}';
+// //gzw add
+// var search = '{!Inquiry_form__c.Opp_Name_Search__c}';
+// //zyh add-search
+// var name = '{!Inquiry_form__c.Contact_Name__c}';
+// name = name.replace(" ", "");
+// var sql = "select id,Request_Detail__c from Inquiry_form__c where id = '{!Inquiry_form__c.Id}'";
+// var sqlResult = sforce.connection.query(sql);
+// var records = sqlResult.getArray("records");
+// var Request = '';
+// if(records[0].Request_Detail__c != null){
+// Request = records[0].Request_Detail__c.toString();
+// }
+// //gzw add
+// if(lead){
+// alert('宸茬粡鏈夋剰鍚戜簡锛屼笉鑳藉啀鍒涘缓鏂扮殑鎰忓悜銆�');
+// return;
+// }else{
+// //var urlStr ='/00Q/e?RecordType=01210000000QiRa&ent=Lead';
+// //window.open(urlStr);
+// var urlStr ='/00Q/e?RecordType=01210000000QiRa&ent=Lead'+
+// '&CF00N10000006ps6f={!HTMLENCODE(Inquiry_form__c.Contact_Name__c)}'+
+// '&CF00N10000006ps6f_lkid={!Inquiry_form__c.Contact_Id__c}'+
+// '&CF00N10000002CvC5={!HTMLENCODE(Inquiry_form__c.Hospital_Name__c)}'+
+// '&CF00N10000002CvC5_lkid={!Inquiry_form__c.Hospital_ID__c}'+
+// '&CF00N10000006qNtt={!HTMLENCODE(Inquiry_form__c.Department_Class__c)}'+
+// '&CF00N10000006qNtt_lkid={!Inquiry_form__c.Department_ID__c}'+
+// '&CF00N10000006qNty={!HTMLENCODE(Inquiry_form__c.Opp_Name_Search__c)}'+
+// '&CF00N10000006qNty_lkid={!Inquiry_form__c.Opp_Name_Search_ID__c}'+
+// '&CF00N10000004oN28={!HTMLENCODE(Inquiry_form__c.Campaign__c)}'+
+// '&CF00N10000004oN28_lkid={!Inquiry_form__c.Campaign_ID__c}'+
+// '&CF00N1000000962np={!HTMLENCODE(Inquiry_form__c.Name)}'+
+// '&CF00N1000000962np_lkid={!Inquiry_form__c.Id}'+
+// '&00N10000006qBYk={!HTMLENCODE(Inquiry_form__c.Cancel_Reason__c)}'+
+// '&00N10000006qGvj={!Inquiry_form__c.Product_Owner__c}'+
+// '&00N10000002CvBM=' + Request +
+// '&lea13=鏈窡杩�'+
+// '&lea3={!HTMLENCODE(Inquiry_form__c.Hospital_Name__c)}'+
+// '&lea8={!HTMLENCODE(Inquiry_form__c.Phone__c)}'+
+// '&lea11={!HTMLENCODE(Inquiry_form__c.Email__c)}'+
+// '&name_lastlea2=' + name +
+// '&name_firstlea2={!HTMLENCODE(Inquiry_form__c.Last_Name__c)}'+
+// '&lea5={!HTMLENCODE( TEXT(Inquiry_form__c.LeadSource__c))}'+
+// '&00N10000002CvBC={!HTMLENCODE(TEXT(Inquiry_form__c.Opportunity_Division__c))}'+
+// '&00N10000002CvBR={!Inquiry_form__c.Request1__c}'+
+// //'&00N10000002EjE1={!Inquiry_form__c.Opp_Name_Search__c}'+
+// '&00N10000002CvB7={!Inquiry_form__c.Urgent__c}';
+// if(search != "" && search != null){
+// urlStr += '&00N10000002EjE1={!Inquiry_form__c.Opp_Name_Search__c}';
+// }
+// window.open(urlStr);
+// }
+// }
+// foo();
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexInquiryFormCustomLink1/lexInquiryFormCustomLink1.js-meta.xml b/force-app/main/default/lwc/lexInquiryFormCustomLink1/lexInquiryFormCustomLink1.js-meta.xml
new file mode 100644
index 0000000..8b422cd
--- /dev/null
+++ b/force-app/main/default/lwc/lexInquiryFormCustomLink1/lexInquiryFormCustomLink1.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexEquipmentSetRental_Order">
+ <apiVersion>51.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__AppPage</target>
+ <target>lightning__RecordPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexInquiryFormCustomLink2/lexInquiryFormCustomLink2.html b/force-app/main/default/lwc/lexInquiryFormCustomLink2/lexInquiryFormCustomLink2.html
new file mode 100644
index 0000000..e9c9349
--- /dev/null
+++ b/force-app/main/default/lwc/lexInquiryFormCustomLink2/lexInquiryFormCustomLink2.html
@@ -0,0 +1,4 @@
+<template>
+ <div class="lexESignAcceptanceHospital" if:true={IsLoding}>
+ <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/lexInquiryFormCustomLink2/lexInquiryFormCustomLink2.js b/force-app/main/default/lwc/lexInquiryFormCustomLink2/lexInquiryFormCustomLink2.js
new file mode 100644
index 0000000..55ad934
--- /dev/null
+++ b/force-app/main/default/lwc/lexInquiryFormCustomLink2/lexInquiryFormCustomLink2.js
@@ -0,0 +1,62 @@
+import { LightningElement,wire,track,api} from 'lwc';
+import { CurrentPageReference } from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import init from '@salesforce/apex/InquiryFormController.init';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+export default class lexInquiryFormCustomLink2 extends LightningElement {
+ @api recordId;//OwnerId
+ IsLoading = true;
+ Status;
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ this.recordId = str;
+ }
+ }
+ }
+ connectedCallback(){
+ init({
+ recordId: this.recordId
+ }).then(result => {
+ this.Status = result.Status;
+ this.IsLoading = false;
+ this.CustomLink2();
+ this.dispatchEvent(new CloseActionScreenEvent());
+ })
+ }
+ // 浜у搧鍜ㄨ鍗� 钀ヤ笟璺熻繘
+ CustomLink2(){
+ if(this.Status != '04.宸插缓鎰忓悜'){
+ window.open ('/apex/FollowPage?id='+this.recordId, '涓嶉渶瑕佺殑鐞嗙敱',
+ 'height=400, width=800, top=200, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no');
+ }else {
+ // alert('宸茬粡鏈夋剰鍚戜簡锛屼笉鑳芥墽琛屾鎿嶄綔銆�');
+ this.showToast("宸茬粡鏈夋剰鍚戜簡锛屼笉鑳芥墽琛屾鎿嶄綔銆�","error")
+ }
+ }
+ showToast(msg,type) {
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+}
+
+// //2021-10-21 gwy 鐗堟湰鏇存敼涓�51.0
+// var foo = function() {
+// var Status = "{!Inquiry_form__c.Status__c}";
+// if(Status != '04.宸插缓鎰忓悜'){
+// window.open ('/apex/FollowPage?id='+"{!Inquiry_form__c.Id}", '涓嶉渶瑕佺殑鐞嗙敱',
+// 'height=400, width=700, top=200, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no');
+// }else {
+// alert('宸茬粡鏈夋剰鍚戜簡锛屼笉鑳芥墽琛屾鎿嶄綔銆�');
+// }
+
+// }
+
+// foo();
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexInquiryFormCustomLink2/lexInquiryFormCustomLink2.js-meta.xml b/force-app/main/default/lwc/lexInquiryFormCustomLink2/lexInquiryFormCustomLink2.js-meta.xml
new file mode 100644
index 0000000..8b422cd
--- /dev/null
+++ b/force-app/main/default/lwc/lexInquiryFormCustomLink2/lexInquiryFormCustomLink2.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexEquipmentSetRental_Order">
+ <apiVersion>51.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__AppPage</target>
+ <target>lightning__RecordPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexInquiryFormNoStatus/lexInquiryFormNoStatus.html b/force-app/main/default/lwc/lexInquiryFormNoStatus/lexInquiryFormNoStatus.html
new file mode 100644
index 0000000..e9c9349
--- /dev/null
+++ b/force-app/main/default/lwc/lexInquiryFormNoStatus/lexInquiryFormNoStatus.html
@@ -0,0 +1,4 @@
+<template>
+ <div class="lexESignAcceptanceHospital" if:true={IsLoding}>
+ <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/lexInquiryFormNoStatus/lexInquiryFormNoStatus.js b/force-app/main/default/lwc/lexInquiryFormNoStatus/lexInquiryFormNoStatus.js
new file mode 100644
index 0000000..8cf4885
--- /dev/null
+++ b/force-app/main/default/lwc/lexInquiryFormNoStatus/lexInquiryFormNoStatus.js
@@ -0,0 +1,65 @@
+import { LightningElement,wire,track,api} from 'lwc';
+import { CurrentPageReference } from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import init from '@salesforce/apex/InquiryFormController.init';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+export default class lexInquiryFormNoStatus extends LightningElement {
+ @api recordId;//OwnerId
+ IsLoading = true;
+ Status;
+
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ this.recordId = str;
+ }
+ }
+ }
+
+ connectedCallback(){
+ init({
+ recordId: this.recordId
+ }).then(result => {
+ this.Status = result.Status;
+ this.IsLoading = false;
+ this.NoStatus();
+ this.dispatchEvent(new CloseActionScreenEvent());
+ })
+ }
+ // 浜у搧鍜ㄨ鍗� 涓嶉渶瑕�
+ NoStatus(){
+ if(this.Status != '04.宸插缓鎰忓悜'){
+ window.open ('/apex/StatusPage?id='+this.recordId , '涓嶉渶瑕佺殑鐞嗙敱',
+ 'height=400, width=790, top=200, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no');
+ }else {
+ // alert('宸茬粡鏈夋剰鍚戜簡锛屼笉鑳芥墽琛屾鎿嶄綔銆�');
+ this.showToast("宸茬粡鏈夋剰鍚戜簡锛屼笉鑳芥墽琛屾鎿嶄綔銆�","error")
+ }
+ }
+
+ showToast(msg,type) {
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+}
+
+//2021-10-21 gwy 鐗堟湰鏇存敼涓�51.0
+// var foo = function() {
+// var Status = "{!Inquiry_form__c.Status__c}";
+// if(Status != '04.宸插缓鎰忓悜'){
+// window.open ('/apex/StatusPage?id='+"{!Inquiry_form__c.Id}", '涓嶉渶瑕佺殑鐞嗙敱',
+// 'height=400, width=700, top=200, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no');
+// }else {
+// alert('宸茬粡鏈夋剰鍚戜簡锛屼笉鑳芥墽琛屾鎿嶄綔銆�');
+// }
+
+// }
+
+// foo();
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexInquiryFormNoStatus/lexInquiryFormNoStatus.js-meta.xml b/force-app/main/default/lwc/lexInquiryFormNoStatus/lexInquiryFormNoStatus.js-meta.xml
new file mode 100644
index 0000000..8b422cd
--- /dev/null
+++ b/force-app/main/default/lwc/lexInquiryFormNoStatus/lexInquiryFormNoStatus.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexEquipmentSetRental_Order">
+ <apiVersion>51.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__AppPage</target>
+ <target>lightning__RecordPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexInquiryFormServiceFollow/lexInquiryFormServiceFollow.html b/force-app/main/default/lwc/lexInquiryFormServiceFollow/lexInquiryFormServiceFollow.html
new file mode 100644
index 0000000..e9c9349
--- /dev/null
+++ b/force-app/main/default/lwc/lexInquiryFormServiceFollow/lexInquiryFormServiceFollow.html
@@ -0,0 +1,4 @@
+<template>
+ <div class="lexESignAcceptanceHospital" if:true={IsLoding}>
+ <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/lexInquiryFormServiceFollow/lexInquiryFormServiceFollow.js b/force-app/main/default/lwc/lexInquiryFormServiceFollow/lexInquiryFormServiceFollow.js
new file mode 100644
index 0000000..cdf5c83
--- /dev/null
+++ b/force-app/main/default/lwc/lexInquiryFormServiceFollow/lexInquiryFormServiceFollow.js
@@ -0,0 +1,68 @@
+import { LightningElement,wire,track,api} from 'lwc';
+import { CurrentPageReference } from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import init from '@salesforce/apex/InquiryFormController.init';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+export default class lexInquiryFormServiceFollow extends LightningElement {
+ @api recordId;//OwnerId
+ IsLoading = true;
+ FSEOwnerId;
+ userId;
+ JINGZHUOJISHU;
+
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ this.recordId = str;
+ }
+ }
+ }
+
+ connectedCallback(){
+ init({
+ recordId: this.recordId
+ }).then(result => {
+ this.FSEOwnerId = result.FSEOwnerId;
+ this.userId = result.userId;
+ this.JINGZHUOJISHU = result.JINGZHUOJISHU;
+ this.IsLoading = false;
+ this.ServiceFollow ();
+ this.dispatchEvent(new CloseActionScreenEvent());
+ })
+ }
+ // 浜у搧鍜ㄨ鍗� 鏈嶅姟璺熻繘
+ ServiceFollow (){
+ if(null != this.FSEOwnerId && (this.FSEOwnerId== this.userId || this.userId == this.JINGZHUOJISHU)){
+ window.open ('/apex/ServiceFollowPage?id='+this.recordId, '鏈嶅姟璺熻繘',
+ 'height=400, width=800, top=200, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no');
+ }else{
+ // alert("姝ゆ寜閽彧鏈塅SE鍙互鐐瑰嚮!");
+ this.showToast("姝ゆ寜閽彧鏈塅SE鍙互鐐瑰嚮!","error")
+ }
+ }
+
+ showToast(msg,type) {
+ const event = new ShowToastEvent({
+ message: msg,
+ variant: type
+ });
+ this.dispatchEvent(event);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+}
+
+// var foo = function() {
+// var Status = "{!Inquiry_form__c.Service_Status__c}";
+// var FSEOwner = "{!Inquiry_form__c.FSE_OwnerId__c}";
+// //alert( FSEOwner+'==='+"{!$User.Id}");
+// if(null!=FSEOwner && (FSEOwner=="{!$User.Id}" || "{!$User.Id}" == "00510000005sEEM")){
+// window.open ('/apex/ServiceFollowPage?id='+"{!Inquiry_form__c.Id}", '鏈嶅姟璺熻繘',
+// 'height=400, width=700, top=200, left=400, toolbar=no, menubar=no, scrollbars=no, location=no, status=no');
+// }else{
+// alert("姝ゆ寜閽彧鏈塅SE鍙互鐐瑰嚮!");
+// }
+// }
+// foo();
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexInquiryFormServiceFollow/lexInquiryFormServiceFollow.js-meta.xml b/force-app/main/default/lwc/lexInquiryFormServiceFollow/lexInquiryFormServiceFollow.js-meta.xml
new file mode 100644
index 0000000..8b422cd
--- /dev/null
+++ b/force-app/main/default/lwc/lexInquiryFormServiceFollow/lexInquiryFormServiceFollow.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexEquipmentSetRental_Order">
+ <apiVersion>51.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__AppPage</target>
+ <target>lightning__RecordPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexMailMessege/lexMailMessege.js b/force-app/main/default/lwc/lexMailMessege/lexMailMessege.js
index 6cbc7d5..6c1c060 100644
--- a/force-app/main/default/lwc/lexMailMessege/lexMailMessege.js
+++ b/force-app/main/default/lwc/lexMailMessege/lexMailMessege.js
@@ -69,7 +69,9 @@
// 鎶ヤ环闄勪欢鏇存柊鐨勯偖浠堕�氱煡
mailMessege() {
- var Link = "https://ocsm--partial.sandbox.my.salesforce.com/" + this.Id;
+ // var Link = "https://ocsm--partial.sandbox.my.salesforce.com/" + this.Id;
+
+ var origin = window.location.origin + "/" + this.Id;
location.href = 'mailto:' + this.InchargeStaffEmailC +
'?bcc=' + this.userEmail +
@@ -83,6 +85,6 @@
'姝ゆ鎶ヤ环鏃ワ細' + this.RepairEstimatedDateC + '%0D%0A' +
'%0D%0A' +
'RC鑱旂粶浜嬮」锛�' + this.RCInformationC + '%0D%0A' +
- '%0D%0A' + Link + '';
+ '%0D%0A' + origin;
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.html b/force-app/main/default/lwc/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.html
new file mode 100644
index 0000000..ae58c6c
--- /dev/null
+++ b/force-app/main/default/lwc/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.html
@@ -0,0 +1,5 @@
+<template>
+ <div class="dispatchOCSMQARAHolder" 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/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.js b/force-app/main/default/lwc/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.js
new file mode 100644
index 0000000..c28718a
--- /dev/null
+++ b/force-app/main/default/lwc/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.js
@@ -0,0 +1,275 @@
+import { LightningElement,wire,track,api} from 'lwc';
+import { CurrentPageReference, NavigationMixin} from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import init from '@salesforce/apex/lexNewSparePartsLoanApplicationCtl.init';
+import UserInfo_Owner from '@salesforce/apex/lexNewSparePartsLoanApplicationCtl.UserInfo_Owner';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
+
+// 鏂板缓澶囧搧鍊熷嚭鐢宠 opd璁″垝
+export default class LexNewSparePartsLoanApplication extends NavigationMixin(LightningElement) {
+ @api recordId;
+ defaultValues1;
+ IsLoading = true;
+
+ @wire(CurrentPageReference)
+ getStateParameters(currentPageReference) {
+ console.log(111);
+ console.log(currentPageReference);
+
+ if (currentPageReference) {
+ const urlValue = currentPageReference.state.recordId;
+ if (urlValue) {
+ let str = `${urlValue}`;
+ console.log("str");
+ console.log(str);
+ this.recordId = str;
+ }
+ }
+ }
+
+ connectedCallback(){
+ console.log(this.recordId);
+ init({
+ recordId: this.recordId
+ }).then(result => {
+ this.IsLoading = false;
+ if (result != null) {
+ console.log("-------result--------------",JSON.stringify(result))
+ if (result.opdStayOrNot == '宸茬鑱�') {
+ this.showToast('鎵�鏈変汉宸茬粡绂昏亴锛岃鑱旂郴绯荤粺绠＄悊鍛樹慨鏀规墍鏈変汉銆�','error');
+ return;
+ }
+ if (result.opdIFApproved == true && result.opdApprovedNo == ''){
+ this.showToast('闇�瑕佸喅瑁佹椂锛屽喅瑁佺紪鐮佷笉鑳戒负绌�','error');
+ return;
+ }
+ if (result.opdIFApproved == true && result.opdApprovedNo != '' && result.opdStatusProcessState.indexOf(result.opdApprovedStatus)!= -1 && result.opdApprovedStatus != '鑽夌' ){
+ this.showToast('宸茬敵璇峰喅瑁佷絾鍐宠鐘舵�佷笉绗﹀悎鏉′欢','error');
+ return;
+ }
+ var HaveValue = "{!OPDPlan__c.Rental_Apply2__c}";
+ if (result.opdRentalApply2 != '' && result.opdType != '瀛︿細') {
+ this.showToast('涓�涓狾PD璁″垝鍙彲鍏宠仈鍒涘缓涓�涓鍝佺敵璇峰崟','error');
+ return;
+ }
+ if (result.opdStatus != '璁″垝涓�') {
+ this.showToast('OPD璁″垝鐨勭姸鎬佷笉鏄鍒掍腑锛屼笉鑳芥柊寤哄鍝佸�熷嚭鐢宠','error');
+ return;
+ }
+
+ UserInfo_Owner({}).then(res=>{
+ console.log("-------UserInfo_Owner------------",res);
+ if(res.isFormalStuff == 'true'){
+ this.showToast('璇曠敤鏈熷唴锛屼笉鑳界敵璇�','error');
+ return;
+ }
+ console.log("-------UserInfo_Owner---1111---------",result);
+ if (result.opdType == '瀛︿細' && result.opdCampaignId != '') {
+ console.log("-------UserInfo_Owner---2222---------");
+ if (result.opdRentalApplyFlag < 7) {
+ this.showToast("鐢宠鎻愪氦蹇呴』鍦�7澶╋紙鍚級浠ヤ笂鎵嶅彲浠�",'error');
+ return;
+ }
+ var ups = res.userProvince.slice(0, 2);
+ if (result.opdCampaignTypeId != '01210000000R26P' && res.userJobCategory == '閿�鍞湇鍔�' ) {
+ this.showToast('FSE涓嶈兘鐢宠璇ュ浼氱被鍨嬪鍝�','error');
+ return;
+ } else if ((res.userJobCategory == '閿�鍞湇鍔�' || res.userJobCategory == '鏀彺') && result.opdCampaignTypeId == '01210000000R26P' && result.opdInternalinchargeprovince.indexOf(ups) == -1) {
+ this.showToast("涓嶧SE鎵�鍦ㄧ渷涓�鑷达紝鎵嶅彲浣跨敤澶囧搧",'error');
+ return;
+ } else if (result.opdCampaignStatus == '宸茬粨鏉�') {
+ this.showToast("宸茬粨鏉燂紝涓嶈兘鐢宠",'error');
+ return;
+ } else if (result.opdCampaignStatus == '宸叉彁浜ゆ姤鍛�') {
+ this.showToast("宸叉彁浜ゆ姤鍛婏紝涓嶈兘鐢宠",'error');
+ return;
+ } else if (result.opdCampaignStatus == '鍙栨秷鐢宠涓�') {
+ this.showToast("鍙栨秷鐢宠涓紝涓嶈兘鐢宠",'error');
+ return;
+ } else if (result.opdCampaignStatus == '鍙栨秷') {
+ this.showToast("宸茬粡鍙栨秷锛屼笉鑳界敵璇�",'error');
+ return;
+ }
+ }
+
+ if (result.opdOriginalOpdPlan == '') {
+ if (result.opdOriginalOpdPlanApplication == '') {
+ if (result.opdType == '瀛︿細' && result.opdCampaignId != '') {
+ // var purposeStr = '&00N10000003Msk0=浜у搧璇曠敤' +
+ // '&00N10000003Msk5=瀛︿細灞曚細' +
+ // '&CF00N10000003Mp2q_lkid={!URLENCODE(OPDPlan__c.CampaignId__c)}' +
+ // '&CF00N10000003Mp2q={!URLENCODE(OPDPlan__c.CampaignName__c)}';
+ const defaultValues = encodeDefaultFieldValues({
+ // OPDPlan__c:this.recordId,
+ Demo_purpose1__c:'浜у搧璇曠敤',
+ demo_purpose2__c:'瀛︿細灞曚細',
+ Campaign__c:result.opdCampaign,
+ Account__c:result.opdAccountLaboratory,
+ Strategic_dept__c:result.opdOCMcategoryName,
+ Hospital__c:result.opdHospitalName,
+ OPDPlan__c:opdName,
+ Person_In_Charge__c:res.lastName + res.firstName,
+ applyUser__c:res.lastName + res.firstName,
+ Loaner_received_staff__c:res.lastName + res.firstName,
+ IsJump__c:result.opdIsJump,
+ JumpCause__c:result.opdJumpCause,
+ Name:'*',
+ Approved_State_Create__c:result.ApprovedStatus,
+ ApprovedNo_Create__c:result.opdApprovedNo
+ });
+ this.navigateEvents(defaultValues);
+ } else if (result.opdOpportunityId != '') {
+ // var purposeStr = '&00N10000003Msk0=浜у搧璇曠敤' +
+ // '&00N10000003Msk5=璇曠敤锛堟湁璇环锛�' +
+ // '&CF00N10000003O3VB_lkid={!OPDPlan__c.Related_Opportunity1_IDId__c}' +
+ // '&CF00N10000003O3VB={!HTMLENCODE(OPDPlan__c.Related_Opportunity1_Name__c)}';
+ console.log("--------defaultValues------")
+ const defaultValues = encodeDefaultFieldValues({
+ // OPDPlan__c:this.recordId,
+ Demo_purpose1__c:'浜у搧璇曠敤',
+ demo_purpose2__c:'璇曠敤锛堟湁璇环锛�',
+ Follow_UP_Opp__c:result.opdRelatedOpportunity1Name,
+
+ Account__c:result.opdAccountLaboratory,
+ // Strategic_dept__c:result.opdOCMcategoryName,
+ // Hospital__c:result.opdHospitalName,
+ // OPDPlan__c:opdName,
+ // Person_In_Charge__c:res.lastName + res.firstName,
+ // applyUser__c:res.lastName + res.firstName,
+ // Loaner_received_staff__c:res.lastName + res.firstName,
+ // IsJump__c:result.opdIsJump,
+ // JumpCause__c:result.opdJumpCause,
+ // Name:'*',
+ // Approved_State_Create__c:result.ApprovedStatus,
+ // ApprovedNo_Create__c:result.opdApprovedNo
+ });
+ console.log("--------defaultValues---1111---",defaultValues);
+
+ this.navigateEvents(defaultValues);
+ } else {
+ console.log("-------UserInfo_Owner---77777---------");
+ // var purposeStr = '&00N10000003Msk0=浜у搧璇曠敤' +
+ // '&00N10000003Msk5=璇曠敤锛堟棤璇环锛�' +
+ // '&00N100000098amW={!OPDPlan__c.NoOpp_Reason__c}';
+ const defaultValues = encodeDefaultFieldValues({
+ // OPDPlan__c:this.recordId,
+ Demo_purpose1__c:'浜у搧璇曠敤',
+ demo_purpose2__c:'璇曠敤锛堟湁璇环锛�',
+ NoOpp_Reason__c:result.opdNoOppReason,
+
+ Account__c:result.opdAccountLaboratory,
+ Strategic_dept__c:result.opdOCMcategoryName,
+ Hospital__c:result.opdHospitalName,
+ OPDPlan__c:opdName,
+ Person_In_Charge__c:res.lastName + res.firstName,
+ applyUser__c:res.lastName + res.firstName,
+ Loaner_received_staff__c:res.lastName + res.firstName,
+ IsJump__c:result.opdIsJump,
+ JumpCause__c:result.opdJumpCause,
+ Name:'*',
+ Approved_State_Create__c:result.ApprovedStatus,
+ ApprovedNo_Create__c:result.opdApprovedNo
+ });
+ this.navigateEvents(defaultValues);
+ }
+
+ // var urlStr = '&CF00N10000003Mp2R={!HTMLENCODE(OPDPlan__c.Account_Laboratory__c)}' +
+ // '&CF00N10000003O3V6={!HTMLENCODE(OPDPlan__c.OCM_category_Name__c)}' +
+ // '&CF00N10000003Mp1d={!HTMLENCODE(OPDPlan__c.HospitalName__c)}' +
+ // '&CF00N10000008ps61={!HTMLENCODE(OPDPlan__c.Name)}' +
+
+ // '&CF00N10000005HzRr={!URLENCODE($User.LastName&' '&$User.FirstName)}' +
+ // '&CF00N10000005HzRz={!URLENCODE($User.LastName&' '&$User.FirstName)}' +
+ // '&00N10000003OJzc={!URLENCODE($User.LastName&' '&$User.FirstName)}' +
+ // '&00N100000098dmS={!OPDPlan__c.IsJump__c}' +
+ // '&00N100000098dmI={!HTMLENCODE(OPDPlan__c.JumpCause__c)}' +
+ // '&Name=*'+
+ // '&00N10000009HBWg= {!OPDPlan__c.Approved_Status__c} ' +
+ // '&00N10000009HBXK= {!OPDPlan__c.Approved_No__c} '; //// 20220211 sx add 澶囧搧鍊熷嚭鐢宠-鍐宠鎺у埗 No.2
+ // window.open('/a0t/e?retURL=%2F{!OPDPlan__c.Id}' + purposeStr + urlStr );
+
+ } else {
+ const defaultValues = encodeDefaultFieldValues({
+ // OPDPlan__c:this.recordId,
+ Cancel_Reason__c:'',
+ Loaner_cancel_reason__c:'',
+ Loaner_cancel_request__c:'',
+ Request_demo_time__c:'',
+
+ Request_approval_time__c:'',
+ Application_accept_time__c:'',
+ Response__c:'',
+ Status__c:'鑽夋涓�',
+ Zsq_Rental_Apply__c:result.opdRentalApplyName,
+ OPDPlan__c:result.opdName,
+ Assign_Person__c:'',
+ Old_Rental_Apply__c:'',
+ Split_Apply_Reason__c:''
+ });
+ this.navigateEvents(defaultValues);
+
+ // var url = "/{!OPDPlan__c.originalOpdRentalApply__c}/e?newclone=1&retURL=%2F{!OPDPlan__c.originalOpdRentalApply__c}&common.udd.actions.ActionsUtilORIG_URI=%2F{!OPDPlan__c.RentalApplyId__c}%2Fe&cloneli=1&00N10000007MNF8=&00N100000098uKJ=&00N10000004oFTC=&00N10000003O1JF=&00N10000003O1JK=&00N10000006pvpZ=&00N10000003O1JU=&00N10000006gY9x=&00N10000003Mp2H=鑽夋涓�&CF00N10000009EKKp_lkid={!OPDPlan__c.RentalApplyId__c}&CF00N10000009EKKp={!OPDPlan__c.RentalApplyName__c}&CF00N10000008ps61={!OPDPlan__c.Name}&CF00N10000008ps61_lkid={!OPDPlan__c.Id}&CF00N10000008poFM=&CF00N10000008poFM_lkid=&CF00N10000005HzRq=&CF00N10000005HzRq_lkid=&00N10000007oQKh=";
+ // window.open(url);
+ }
+ }else {
+ console.log("-------UserInfo_Owner---00000--else-------");
+ const defaultValues = encodeDefaultFieldValues({
+ // OPDPlan__c:this.recordId,
+ Cancel_Reason__c:'',
+ Loaner_cancel_reason__c:'',
+ Loaner_cancel_request__c:'',
+ Request_shipping_day__c:'',
+
+ Hope_Lonaer_date_Num__c:'',
+ Request_return_day__c:'',
+ Status__c:'鑽夋涓�',
+ Zsq_Rental_Apply__c:result.opdRentalApplyName,
+ OPDPlan__c:result.opdName,
+ Assign_Person__c:'',
+ Old_Rental_Apply__c:'',
+ Split_Apply_Reason__c:''
+ });
+ console.log("-------UserInfo_Owner---00000--else-------" + defaultValues);
+
+ this.navigateEvents(defaultValues);
+
+ // var url = "/{!OPDPlan__c.RentalApplyId__c}/e?newclone=1&retURL=%2F{!OPDPlan__c.RentalApplyId__c}&common.udd.actions.ActionsUtilORIG_URI=%2F{!OPDPlan__c.RentalApplyId__c}%2Fe&cloneli=1&00N10000007MNF8=&00N100000098uKJ=&00N10000004oFTC=&00N10000003Ntz7=&00N10000008rG1M=&00N10000005HzRw=&00N10000003Mp2H=鑽夋涓�&CF00N10000009EKKp_lkid={!OPDPlan__c.RentalApplyId__c}&CF00N10000009EKKp={!OPDPlan__c.RentalApplyName__c}&CF00N10000008ps61={!OPDPlan__c.Name}&CF00N10000008ps61_lkid={!OPDPlan__c.Id}&CF00N10000008poFM=&CF00N10000008poFM_lkid=&CF00N10000005HzRq=&CF00N10000005HzRq_lkid=&00N10000007oQKh=";
+ // window.open(url);
+ }
+
+ })
+ this.dispatchEvent(new CloseActionScreenEvent());
+ // window.location.reload();
+ }
+ }).catch(error => {
+ console.log("error");
+ console.log(error);
+ });
+ }
+
+ showToast(message, type) {
+ const evt = new ShowToastEvent({
+ title: 'Error',
+ message: message,
+ variant: type
+ });
+ this.dispatchEvent(evt);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+
+ navigateEvents(defaultValues){
+ console.log("--------navigateEvents------",defaultValues)
+ this[NavigationMixin.Navigate]({
+ type: 'standard__objectPage',
+ attributes: {
+ objectApiName: 'Rental_Apply__c',
+ actionName: 'new'
+ },
+ state:{
+ defaultFieldValues: defaultValues
+
+ }
+ })
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.js-meta.xml b/force-app/main/default/lwc/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.js-meta.xml
new file mode 100644
index 0000000..fafbfc5
--- /dev/null
+++ b/force-app/main/default/lwc/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.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/lexOCSMNoToReportRepair/lexOCSMNoToReportRepair.html b/force-app/main/default/lwc/lexOCSMNoToReportRepair/lexOCSMNoToReportRepair.html
index 87f391a..92c9e32 100644
--- a/force-app/main/default/lwc/lexOCSMNoToReportRepair/lexOCSMNoToReportRepair.html
+++ b/force-app/main/default/lwc/lexOCSMNoToReportRepair/lexOCSMNoToReportRepair.html
@@ -2,5 +2,6 @@
<div class="exampleHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
<lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button>
+ <lightning-button onclick={handleConfirmClick} label="Open Confirm Modal"></lightning-button>
</div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexOCSMNoToReportRepair/lexOCSMNoToReportRepair.js b/force-app/main/default/lwc/lexOCSMNoToReportRepair/lexOCSMNoToReportRepair.js
index 7c02aa0..1712fda 100644
--- a/force-app/main/default/lwc/lexOCSMNoToReportRepair/lexOCSMNoToReportRepair.js
+++ b/force-app/main/default/lwc/lexOCSMNoToReportRepair/lexOCSMNoToReportRepair.js
@@ -14,6 +14,7 @@
import {
ShowToastEvent
} from 'lightning/platformShowToastEvent';
+import LightningConfirm from 'lightning/confirm';
export default class LexOCSMNoToReportRepair extends LightningElement {
@api recordId;
@@ -42,14 +43,12 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.Id = result.Id;
this.OCSMAdministrativeReportNumberC = result.OCSMAdministrativeReportNumberC;
this.OCSMAdministrativeReportDateC = result.OCSMAdministrativeReportDateC;
this.AwareDateC = result.AwareDateC;
this.OCSMNoToReport();
- this.dispatchEvent(new CloseActionScreenEvent());
}
}).catch(error => {
console.log(error);
@@ -58,29 +57,7 @@
// OCSM涓嶈鎶ュ憡
OCSMNoToReport() {
- if (!confirm("涓嶈鎶ュ憡鍚庢棤娉曟挙鍥烇紝鏄惁缁х画锛�")) {
- return;
- }
- if (this.OCSMAdministrativeReportNumberC != undefined ||
- this.OCSMAdministrativeReportDateC != undefined) {
- this.ShowToastEvent("宸茬粡鎶ュ憡鐨凲IS锛屼笉鍙互鐐瑰嚮OCSM涓嶈鎶ュ憡銆�", "error")
- return;
- }
- if (this.AwareDateC != undefined) {
- updateRepair({
- recordId: this.Id
- }).then(result => {
- console.log(result);
- if (result.length > 0) {
- var split = result.split(", ");
- alert(split[1]);
- }
- window.location.reload();
- })
- } else {
- this.ShowToastEvent("娌℃湁AwareDate鎴栧凡缁廜CSM琛屾斂鎶ュ憡锛岃纭銆�", "error")
- return;
- }
+ this.handleConfirmClick("涓嶈鎶ュ憡鍚庢棤娉曟挙鍥烇紝鏄惁缁х画锛�");
}
// 寮圭獥
@@ -92,4 +69,41 @@
});
this.dispatchEvent(event);
}
+
+ async handleConfirmClick(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+
+ if (result) {
+ if (this.OCSMAdministrativeReportNumberC != undefined ||
+ this.OCSMAdministrativeReportDateC != undefined) {
+ this.ShowToastEvent("宸茬粡鎶ュ憡鐨凲IS锛屼笉鍙互鐐瑰嚮OCSM涓嶈鎶ュ憡銆�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ if (this.AwareDateC != undefined) {
+ updateRepair({
+ recordId: this.Id
+ }).then(result => {
+ console.log(result);
+ if (result.length > 0) {
+ var split = result.split(", ");
+ this.ShowToastEvent(split[1], "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ window.location.reload();
+ })
+ } else {
+ this.ShowToastEvent("娌℃湁AwareDate鎴栧凡缁廜CSM琛屾斂鎶ュ憡锛岃纭銆�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexOCSMNogoods/lexOCSMNogoods.js b/force-app/main/default/lwc/lexOCSMNogoods/lexOCSMNogoods.js
index d9f159f..e56a0d1 100644
--- a/force-app/main/default/lwc/lexOCSMNogoods/lexOCSMNogoods.js
+++ b/force-app/main/default/lwc/lexOCSMNogoods/lexOCSMNogoods.js
@@ -52,7 +52,6 @@
this.isCNBuyC = result.isCNBuyC;
this.OCSMNogoods();
- this.dispatchEvent(new CloseActionScreenEvent());
}
}).catch(error => {
console.log(error);
@@ -63,14 +62,18 @@
OCSMNogoods() {
if (this.QISStatusC != 'RC妫�娴嬬敵璇�') {
this.ShowToastEvent("OCM鏈嶅姟鏈儴宸茬粡鏀跺埌瀹炵墿", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
} else {
if ((this.isAEProfileC == undefined || this.isPAEProfileC == undefined) && this.isCNBuyC != 'true') {
- this.ShowToastEvent("瀹夊叏淇℃伅鏈垽瀹氾紝璇疯仈绯昏川閲忔硶瑙勯儴", "error");
var btns = document.getElementsByName('rc_recieved');
for (var i = 0; i < btns.length; i++) {
btns[i].disabled = true;
btns[i].className = 'btnDisabled';
}
+ this.ShowToastEvent("瀹夊叏淇℃伅鏈垽瀹氾紝璇疯仈绯昏川閲忔硶瑙勯儴", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
} else {
updateQisForRCRecieved({
QId: this.Id,
@@ -78,7 +81,9 @@
}).then(result => {
console.log(result);
if (result.length > 0) {
- alert(result);
+ this.ShowToastEvent(result, "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
}
})
}
diff --git a/force-app/main/default/lwc/lexOCSMToReportRepair/lexOCSMToReportRepair.html b/force-app/main/default/lwc/lexOCSMToReportRepair/lexOCSMToReportRepair.html
index 87f391a..92c9e32 100644
--- a/force-app/main/default/lwc/lexOCSMToReportRepair/lexOCSMToReportRepair.html
+++ b/force-app/main/default/lwc/lexOCSMToReportRepair/lexOCSMToReportRepair.html
@@ -2,5 +2,6 @@
<div class="exampleHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
<lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button>
+ <lightning-button onclick={handleConfirmClick} label="Open Confirm Modal"></lightning-button>
</div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexOCSMToReportRepair/lexOCSMToReportRepair.js b/force-app/main/default/lwc/lexOCSMToReportRepair/lexOCSMToReportRepair.js
index dd78103..5c44fe5 100644
--- a/force-app/main/default/lwc/lexOCSMToReportRepair/lexOCSMToReportRepair.js
+++ b/force-app/main/default/lwc/lexOCSMToReportRepair/lexOCSMToReportRepair.js
@@ -14,7 +14,7 @@
import {
ShowToastEvent
} from 'lightning/platformShowToastEvent';
-
+import LightningConfirm from 'lightning/confirm';
export default class LexOCSMToReportRepair extends LightningElement {
@api recordId;
@@ -42,13 +42,11 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.Id = result.Id;
this.AwareDateC = result.AwareDateC;
this.OCSMAdministrativeReportStatusC = result.OCSMAdministrativeReportStatusC;
this.OCSMToReport();
- this.dispatchEvent(new CloseActionScreenEvent());
}
}).catch(error => {
console.log(error);
@@ -59,24 +57,7 @@
// OCSM瑕佹姤鍛�
OCSMToReport() {
- if (!confirm("鎶ュ憡鍚庢棤娉曟挙鍥烇紝鏄惁缁х画锛�")) {
- return;
- }
- if (this.OCSMAdministrativeReportStatusC == undefined && this.AwareDateC != undefined) {
- updateRepair({
- recordId: this.Id
- }).then(result => {
- console.log(result);
- if (result.length > 0) {
- var split = result.split(", ");
- alert(split[1]);
- }
- location.reload();
- })
- } else {
- this.ShowToastEvent("娌℃湁AwareDate鎴栧凡缁廜CSM琛屾斂鎶ュ憡锛岃纭銆�", "error")
- return;
- }
+ this.handleConfirmClick("鎶ュ憡鍚庢棤娉曟挙鍥烇紝鏄惁缁х画锛�");
}
// 寮圭獥
@@ -88,4 +69,35 @@
});
this.dispatchEvent(event);
}
+
+ async handleConfirmClick(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+ if(result){
+ if (this.OCSMAdministrativeReportStatusC == undefined && this.AwareDateC != undefined) {
+ updateRepair({
+ recordId: this.Id
+ }).then(result => {
+ console.log(result);
+ if (result.length > 0) {
+ var split = result.split(", ");
+ this.ShowToastEvent(split[1], "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ location.reload();
+ })
+ } else {
+ this.ShowToastEvent("娌℃湁AwareDate鎴栧凡缁廜CSM琛屾斂鎶ュ憡锛岃纭銆�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ }
+ else{
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexOSHNogoods/lexOSHNogoods.js b/force-app/main/default/lwc/lexOSHNogoods/lexOSHNogoods.js
index 388856a..b680883 100644
--- a/force-app/main/default/lwc/lexOSHNogoods/lexOSHNogoods.js
+++ b/force-app/main/default/lwc/lexOSHNogoods/lexOSHNogoods.js
@@ -48,7 +48,6 @@
this.email = result.email;
this.OSHNogoods();
- this.dispatchEvent(new CloseActionScreenEvent());
}
}).catch(error => {
console.log(error);
@@ -59,6 +58,8 @@
OSHNogoods() {
if (this.QISStatusC != 'OSH妫�娴嬬敵璇�' && this.QISStatusC != '瀹屾瘯') {
this.ShowToastEvent("OSH宸茬粡鏀跺埌瀹炵墿", "error")
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
} else {
updateOSHNogoods({
Id: this.Id,
@@ -68,7 +69,8 @@
console.log(result);
if (result.length > 0) {
var split = result.split(", ");
- alert(split[1]);
+ this.ShowToastEvent(split[1], "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
}
})
}
diff --git a/force-app/main/default/lwc/lexPreContractSubmit/lexPreContractSubmit.html b/force-app/main/default/lwc/lexPreContractSubmit/lexPreContractSubmit.html
index 87f391a..92c9e32 100644
--- a/force-app/main/default/lwc/lexPreContractSubmit/lexPreContractSubmit.html
+++ b/force-app/main/default/lwc/lexPreContractSubmit/lexPreContractSubmit.html
@@ -2,5 +2,6 @@
<div class="exampleHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
<lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button>
+ <lightning-button onclick={handleConfirmClick} label="Open Confirm Modal"></lightning-button>
</div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexPreContractSubmit/lexPreContractSubmit.js b/force-app/main/default/lwc/lexPreContractSubmit/lexPreContractSubmit.js
index 9cb57e1..c441754 100644
--- a/force-app/main/default/lwc/lexPreContractSubmit/lexPreContractSubmit.js
+++ b/force-app/main/default/lwc/lexPreContractSubmit/lexPreContractSubmit.js
@@ -14,6 +14,8 @@
import {
ShowToastEvent
} from 'lightning/platformShowToastEvent';
+import LightningConfirm from 'lightning/confirm';
+
export default class LexPreContractSubmit extends LightningElement {
@api recordId;
@@ -44,7 +46,6 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.oldIsRecognitionModelC = result.oldIsRecognitionModelC;
this.uploadToRMTimeC = result.uploadToRMTimeC;
this.IsRecognitionModelTrueC = result.IsRecognitionModelTrueC;
@@ -53,7 +54,6 @@
this.Id = result.Id;
this.preContractSubmit();
- this.dispatchEvent(new CloseActionScreenEvent());
}
}).catch(error => {
console.log(error);
@@ -64,37 +64,30 @@
preContractSubmit() {
if (this.oldIsRecognitionModelC) {
if (this.uploadToRMTimeC == null) {
- this.ShowToastEvent('褰撳墠缁翠慨鍚堝悓鐨勭粡閿�鍟嗘槸鍏堟瀵硅薄锛岄渶瑕佸厛銆愪笂浼犺娆惧悎鍚屻�戯紝鐒跺悗瀹屾垚璁ゆ浠ュ悗鎵嶈兘澶嶆牳銆�', "error")
+ this.ShowToastEvent('褰撳墠缁翠慨鍚堝悓鐨勭粡閿�鍟嗘槸鍏堟瀵硅薄锛岄渶瑕佸厛銆愪笂浼犺娆惧悎鍚屻�戯紝鐒跺悗瀹屾垚璁ゆ浠ュ悗鎵嶈兘澶嶆牳銆�', "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
} else {
if (!this.IsRecognitionModelTrueC) {
- this.ShowToastEvent('褰撳墠缁翠慨鍚堝悓娌℃湁瀹屾垚璁ゆ锛屼笉鑳借繘琛屽鏍搞��', "error")
+ this.ShowToastEvent('褰撳墠缁翠慨鍚堝悓娌℃湁瀹屾垚璁ゆ锛屼笉鑳借繘琛屽鏍搞��', "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
}
}
var status = this.MCApprovalStatusC;
if (status != 'Draft' && status != 'Reject' && status != undefined) {
- this.ShowToastEvent('澶嶆牳宸茬粡鎻愪氦锛岃纭鐘舵�併��', "error")
+ this.ShowToastEvent('澶嶆牳宸茬粡鎻愪氦锛岃纭鐘舵�併��', "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
var con_no = this.ContractprintCompletedC;
if (con_no == undefined) {
- this.ShowToastEvent('鍚堝悓鐩栫珷瀹屾瘯涓虹┖锛屼笉鑳芥彁浜ゅ悎鍚屽鏍哥敵璇枫��', "error")
+ this.ShowToastEvent('鍚堝悓鐩栫珷瀹屾瘯涓虹┖锛屼笉鑳芥彁浜ゅ悎鍚屽鏍哥敵璇枫��', "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
- if (!confirm("涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵")) {
- return;
- }
- processResults({
- recordId: this.recordId
- }).catch(error => {
- if (error.body.pageErrors[0] != null) {
- var errmsg = error.body.pageErrors[0].message.toString();
- this.ShowToastEvent(errmsg + '_sys', "error")
- return;
- }
- })
+ this.handleConfirmClick("涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵");
}
// 寮圭獥
@@ -106,4 +99,27 @@
});
this.dispatchEvent(event);
}
+
+ async handleConfirmClick(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+
+ if (result) {
+ processResults({
+ recordId: this.Id
+ }).catch(error => {
+ if (error.body.pageErrors[0] != null) {
+ var errmsg = error.body.pageErrors[0].message.toString();
+ this.ShowToastEvent(errmsg, "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ })
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexProductRepairQuoteRepair/lexProductRepairQuoteRepair.js b/force-app/main/default/lwc/lexProductRepairQuoteRepair/lexProductRepairQuoteRepair.js
index 2bdad39..e6368de 100644
--- a/force-app/main/default/lwc/lexProductRepairQuoteRepair/lexProductRepairQuoteRepair.js
+++ b/force-app/main/default/lwc/lexProductRepairQuoteRepair/lexProductRepairQuoteRepair.js
@@ -58,8 +58,6 @@
}).then(result => {
this.DeliveredProductC = result;
window.open('/apex/ProductRepairQuote?productid=' + this.DeliveredProductC + '&flag=asset', '', 'height=250, width=500, top=300, left=350,location=no')
- }).catch(error => {
- console.log(error);
})
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexQISMBCrequestNew/lexQISMBCrequestNew.html b/force-app/main/default/lwc/lexQISMBCrequestNew/lexQISMBCrequestNew.html
index d044dbb..15a028e 100644
--- a/force-app/main/default/lwc/lexQISMBCrequestNew/lexQISMBCrequestNew.html
+++ b/force-app/main/default/lwc/lexQISMBCrequestNew/lexQISMBCrequestNew.html
@@ -1,5 +1,6 @@
<template>
<div class="exampleHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ <lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button>
</div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexQISMBCrequestNew/lexQISMBCrequestNew.js b/force-app/main/default/lwc/lexQISMBCrequestNew/lexQISMBCrequestNew.js
index b2cef38..2a07eed 100644
--- a/force-app/main/default/lwc/lexQISMBCrequestNew/lexQISMBCrequestNew.js
+++ b/force-app/main/default/lwc/lexQISMBCrequestNew/lexQISMBCrequestNew.js
@@ -10,8 +10,17 @@
CloseActionScreenEvent
} from 'lightning/actions';
import init from '@salesforce/apex/buttonQISReportCtl.init';
+import {
+ NavigationMixin
+} from 'lightning/navigation';
+import {
+ encodeDefaultFieldValues
+} from 'lightning/pageReferenceUtils';
+import {
+ ShowToastEvent
+} from 'lightning/platformShowToastEvent';
-export default class LexQISMBCrequestNew extends LightningElement {
+export default class LexQISMBCrequestNew extends NavigationMixin(LightningElement) {
@api recordId;
str;
IsLoading = true;
@@ -52,12 +61,35 @@
// 鏂板缓QIS M-BC鐢宠.
QISMBCRequestNew() {
var status = this.QISStatusC;
-
if (status != '瀹屾瘯' && status != '宸插洖绛�' && status != '鍙栨秷') {
- alert("QIS娌℃湁瀹℃壒瀹屾瘯鎴栧彇娑堬紝涓嶅彲浠ュ垱寤篞IS M-BC!");
+ this.ShowToastEvent("QIS娌℃湁瀹℃壒瀹屾瘯鎴栧彇娑堬紝涓嶅彲浠ュ垱寤篞IS M-BC!", "error");
return;
}
- var url = "a20/e?retURL=%2Fa20%2Fo&Name=" + this.Name + "&CF00N10000006Q4NP_lkid=" + this.Id;
- window.top.location.href = url;
+ const url = encodeDefaultFieldValues({
+ Name: this.Name,
+ QIS_request_name__c: this.Id
+ });
+ this[NavigationMixin.Navigate]({
+ type: 'standard__objectPage',
+ attributes: {
+ objectApiName: 'QIS_M_BC__c',
+ actionName: 'new'
+ },
+ state: {
+ nooverride: '1',
+ defaultFieldValues: url
+ }
+ });
+ // var url = "a20/e?retURL=%2Fa20%2Fo&Name=" + this.Name + "&CF00N10000006Q4NP_lkid=" + this.Id;
+ // window.open(url);
+ }
+
+ ShowToastEvent(msg, type) {
+ const event = new ShowToastEvent({
+ title: '',
+ message: msg,
+ variant: type
+ });
+ this.dispatchEvent(event);
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexQISMBCrequestNew/lexQISMBCrequestNew.js-meta.xml b/force-app/main/default/lwc/lexQISMBCrequestNew/lexQISMBCrequestNew.js-meta.xml
index 3da8f7a..12078fb 100644
--- a/force-app/main/default/lwc/lexQISMBCrequestNew/lexQISMBCrequestNew.js-meta.xml
+++ b/force-app/main/default/lwc/lexQISMBCrequestNew/lexQISMBCrequestNew.js-meta.xml
@@ -9,10 +9,4 @@
<target>lightning__RecordAction</target>
<target>lightning__FlowScreen</target>
</targets>
- <!-- 瀹氫箟鍙橀噺 -->
- <targetConfigs>
- <targetConfig targets="lightning__FlowScreen">
- <property name="recordId" type="String" label="recordId"/>
- </targetConfig>
- </targetConfigs>
</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexRentalApplyDiscountApproval/lexRentalApplyDiscountApproval.js b/force-app/main/default/lwc/lexRentalApplyDiscountApproval/lexRentalApplyDiscountApproval.js
index 777f405..ca55997 100644
--- a/force-app/main/default/lwc/lexRentalApplyDiscountApproval/lexRentalApplyDiscountApproval.js
+++ b/force-app/main/default/lwc/lexRentalApplyDiscountApproval/lexRentalApplyDiscountApproval.js
@@ -61,7 +61,6 @@
this.RentalApplyDiscountApproval();
}
})
- this.dispatchEvent(new CloseActionScreenEvent());
}
}).catch(error => {
console.log(error);
@@ -74,16 +73,19 @@
if (power != '2B2_澶囧搧涓績妫�娴�&浠撳簱绠＄悊') {
this.ShowToastEvent("瀵逛笉璧凤紝鎮ㄦ病鏈夋潈闄愭彁浜ゆ鐢宠锛�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
var status = this.RentalApplyDiscountStatusC;
if (status == '瀹℃壒涓�') {
this.ShowToastEvent("瀹℃壒鎻愪氦鎴愬姛,褰撳墠姝ｅ湪瀹℃壒璇峰嬁鍐嶆彁浜わ紒", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
if (status == '鎵瑰噯') {
this.ShowToastEvent("瀹℃壒宸叉壒鍑�,璇峰嬁鍐嶆彁浜わ紒", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
if (status == '鑽夋涓�' || status == undefined || status == '椹冲洖') {
@@ -94,12 +96,14 @@
console.log(result);
if (result.length > 0) {
var split = result.split(", ");
- alert("鎻愪氦澶辫触 " + split[1]);
+ this.ShowToastEvent("鎻愪氦澶辫触 " + split[1], "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
})
} else {
this.ShowToastEvent("鎻愪氦澶辫触", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
}
diff --git a/force-app/main/default/lwc/lexSCSubmit/lexSCSubmit.html b/force-app/main/default/lwc/lexSCSubmit/lexSCSubmit.html
index 87f391a..92c9e32 100644
--- a/force-app/main/default/lwc/lexSCSubmit/lexSCSubmit.html
+++ b/force-app/main/default/lwc/lexSCSubmit/lexSCSubmit.html
@@ -2,5 +2,6 @@
<div class="exampleHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
<lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button>
+ <lightning-button onclick={handleConfirmClick} label="Open Confirm Modal"></lightning-button>
</div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSCSubmit/lexSCSubmit.js b/force-app/main/default/lwc/lexSCSubmit/lexSCSubmit.js
index 2f0f4de..f66f5ce 100644
--- a/force-app/main/default/lwc/lexSCSubmit/lexSCSubmit.js
+++ b/force-app/main/default/lwc/lexSCSubmit/lexSCSubmit.js
@@ -14,6 +14,7 @@
import {
ShowToastEvent
} from 'lightning/platformShowToastEvent';
+import LightningConfirm from 'lightning/confirm';
export default class LexSCSubmit extends LightningElement {
@api recordId;
@@ -39,12 +40,10 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.Id = result.Id;
this.StatusC = result.StatusC;
this.SCSubmit();
- this.dispatchEvent(new CloseActionScreenEvent());
}
}).catch(error => {
console.log(error);
@@ -54,26 +53,12 @@
// 鎻愪氦寰呭鎵�
SCSubmit() {
if (this.StatusC != '鑽夋涓�') {
- this.ShowToastEvent("宸茬粡鎻愪氦瀹℃壒", "error")
+ this.ShowToastEvent("宸茬粡鎻愪氦瀹℃壒", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
- if (!confirm("涓�鏃CM鎻愪氦姝よ褰曚互寰呮壒鍑嗭紝鏍规嵁鎮ㄧ殑璁剧疆鎮ㄥ彲鑳戒笉鍐嶈兘澶熺紪杈戞璁板綍鎴栧皢浠栦粠鎵瑰噯杩囩▼涓皟鍥炪�傛槸鍚︾户缁紵")) {
- return;
- }
-
- updateQISSCReport({
- QId: this.Id
- }).then(result => {
- console.log(result);
- if (result.length > 0) {
- var split = result.split(", ");
- alert(split[1]);
- } else {
- this.ShowToastEvent("宸叉彁浜�", "success")
- window.location.reload();
- }
- })
+ this.handleConfirmClick("涓�鏃CM鎻愪氦姝よ褰曚互寰呮壒鍑嗭紝鏍规嵁鎮ㄧ殑璁剧疆鎮ㄥ彲鑳戒笉鍐嶈兘澶熺紪杈戞璁板綍鎴栧皢浠栦粠鎵瑰噯杩囩▼涓皟鍥炪�傛槸鍚︾户缁紵");
}
ShowToastEvent(msg, type) {
@@ -84,4 +69,30 @@
});
this.dispatchEvent(event);
}
+
+ async handleConfirmClick(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+
+ if(result){
+ updateQISSCReport({
+ QId: this.Id
+ }).then(result => {
+ console.log(result);
+ if (result.length > 0) {
+ var split = result.split(", ");
+ this.ShowToastEvent(split[1], "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ } else {
+ this.ShowToastEvent("宸叉彁浜�", "success")
+ window.location.reload();
+ }
+ })
+ }else{
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSelectProduct2CIC/lexSelectProduct2CIC.js b/force-app/main/default/lwc/lexSelectProduct2CIC/lexSelectProduct2CIC.js
index 8e7f76d..6b1b1a0 100644
--- a/force-app/main/default/lwc/lexSelectProduct2CIC/lexSelectProduct2CIC.js
+++ b/force-app/main/default/lwc/lexSelectProduct2CIC/lexSelectProduct2CIC.js
@@ -47,7 +47,6 @@
// 鏂板缓CIC/浜у搧
SelectProduct2CIC() {
- console.log(11111111);
var pathnames = window.location.pathname.split("/");
if (pathnames[1] == "emptyHtmlDoc.html") {
window.open("/apex/SelectProduct2CIC?cicid=" + this.Id, "_parent");
diff --git a/force-app/main/default/lwc/lexSendNFM103/lexSendNFM103.html b/force-app/main/default/lwc/lexSendNFM103/lexSendNFM103.html
index aaa4cbd..92c9e32 100644
--- a/force-app/main/default/lwc/lexSendNFM103/lexSendNFM103.html
+++ b/force-app/main/default/lwc/lexSendNFM103/lexSendNFM103.html
@@ -1,6 +1,7 @@
<template>
- <div class="toReportHolder" if:true={IsLoading}>
+ <div class="exampleHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
<lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button>
+ <lightning-button onclick={handleConfirmClick} label="Open Confirm Modal"></lightning-button>
</div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSendNFM103/lexSendNFM103.js b/force-app/main/default/lwc/lexSendNFM103/lexSendNFM103.js
index 277d86e..66b40ba 100644
--- a/force-app/main/default/lwc/lexSendNFM103/lexSendNFM103.js
+++ b/force-app/main/default/lwc/lexSendNFM103/lexSendNFM103.js
@@ -38,10 +38,11 @@
api,
wire
} from "lwc";
+import LightningConfirm from 'lightning/confirm';
+
export default class LexSendNFM103 extends LightningElement {
@api recordId;
- detailedAddress;
dealer;
numberofEffectiveContract;
newProductGuaranteTxt;
@@ -80,10 +81,15 @@
userName;
profileName;
Id;
+ DetailedAddress;
+ surplusCount = 0;
+ url;
+ HPActiveC;
@wire(CurrentPageReference)
getStateParameters(currentPageReference) {
if (currentPageReference) {
+ this.url = currentPageReference.state.backgroundContext;
const urlValue = currentPageReference.state.recordId;
if (urlValue) {
let str = `${urlValue}`;
@@ -104,7 +110,8 @@
btns[i].className = 'btnDisabled';
}
this.Id = result.Id;
- this.detailedAddress = result.detailedAddress;
+ this.HPActiveC = result.HPActiveC;
+ this.DetailedAddress = result.detailedAddress;
this.dealer = result.DealerC;
this.numberofEffectiveContract = result.numberofEffectiveContract;
this.newProductGuaranteTxt = result.newProductGuaranteTxt;
@@ -160,209 +167,29 @@
this.foo();
}
})
- this.dispatchEvent(new CloseActionScreenEvent());
}).catch(error => {
console.log(error);
});
}
foo() {
- // queryForrecords3({
- // dealer: this.dealer
- // }).then(result => {
- // if (result.length > 0 && result[0].FirstParagraph__c == true) {
- // if (!confirm("璇ョ粡閿�鍟嗕负鍏堟瀵硅薄锛屾槸鍚︾户缁敵璇蜂慨鐞嗭紵")) {
- // return;
- // }
- // }
- // if (
- // this.numberofEffectiveContract == "鏃�" && this.newProductGuaranteTxt != "2: 澶氬勾淇濅慨" &&
- // this.newProductGuaranteTxt != "2: 鏈嶅姟澶氬勾淇濅慨" && this.newProductGuaranteTxt != "8: 甯傚満澶氬勾淇濅慨" &&
- // this.onSiteRepair == "鐩撮�丼ORC淇悊"
- // ) {
- // if (!confirm("璁惧涓洪潪缁翠慨鍚堝悓涓旈潪澶氬勾淇濅慨瀵硅薄鍝侊紝璇风‘璁ゆ槸鍚︾洿閫丼ORC淇悊锛�")) {
- // return;
- // }
- // }
- // if ((this.maintenanceContract != undefined || this.VMMaintenanceContract != undefined) &&
- // this.onSiteRepair == "RC淇悊" && this.FSEState == "灞变笢鐪�"
- // ) {
- // if (!confirm("璇ヨ澶囦负缁翠慨鍚堝悓鎴栧骞翠繚淇璞″搧锛岃纭鏄惁閫佽嚦RC淇悊锛�")) {
- // return;
- // }
- // }
- // var today = Date.now();
- // var dateReceiptQuestions = Date.parse(this.dateReceiptQuestions);
- // var dates = (today - dateReceiptQuestions) / (24 * 60 * 60 * 1000);
- // if (this.profileName != "绯荤粺绠＄悊鍛�" && this.userName != "鑳� 鐜夋垚" && this.userName != "鏉� 鐞竻" &&
- // this.userName != "閮� 娲�" &&
- // this.delayReportReason == undefined && dates > "1" &&
- // this.repairSource != "QIS杞慨鐞�") {
- // alert("鐢宠淇悊鏃禨AP淇悊鐢宠鏃ヨ秴杩囬棶棰樿仈缁滄敹鍒版棩1澶╋紝蹇呴』濉啓闂秴鏃舵姤鍛婄殑鐞嗙敱");
- // return;
- // }
- // if (this.quickRepairSign == true && (this.numberofEffectiveContract == "鏈�" || this.newProductGuaranteTxt == "2: 澶氬勾淇濅慨" ||
- // this.newProductGuaranteTxt == "2: 鏈嶅姟澶氬勾淇濅慨" || this.newProductGuaranteTxt == "8: 甯傚満澶氬勾淇濅慨") &&
- // (this.onSiteRepair == "RC淇悊" || this.onSiteRepair == "鍔炰簨澶勪慨鐞�" || this.onSiteRepair == "鐜板満淇悊")) {
- // if (this.RCCD == "2.涓滃寳" || this.RCCD == "3.瑗垮寳") {
- // if (!confirm("璇ュ瀷鍙峰搴斾负鍚堝悓鎴栧骞翠繚瀵硅薄鍝併�傚纭涓哄ぇ淇悊鏁呴殰锛岄渶瑕侀�夋嫨鐩撮�丼ORC淇悊锛岃纭鏄惁缁х画銆�")) {
- // return;
- // }
- // } else if (this.RCCD == "1.鍗庡寳" || this.RCCD == "6.鍗庡崡" || this.RCCD == "4.瑗垮崡") {
- // if (!confirm("璇ュ瀷鍙峰搴斾负鍚堝悓鎴栧骞翠繚瀵硅薄鍝併�傚纭涓哄ぇ淇悊鏁呴殰锛岄渶瑕侀�夋嫨鐩撮�丱GZ淇悊锛岃纭鏄惁缁х画銆�")) {
- // return;
- // }
- // }
- // }
- // var returnsProductWay = this.returnsProductway;
- // if (returnsProductWay == undefined) {
- // if (!confirm("杩斿搧鏂瑰紡涓虹┖锛屾槸鍚︾户缁敵璇蜂慨鐞嗭紒")) {
- // return;
- // }
- // }
- // var DetailedAddress = this.detailedAddress;
- // if (this.assetOwner != "Olympus") {
- // if (DetailedAddress != undefined) {
- // var prompt = '褰撳墠鐩磋繑鏀惰揣鍦板潃涓猴細' + DetailedAddress + ',鎮ㄧ‘璁や笉淇敼浜嗗悧锛�';
- // if (!confirm(prompt)) {
- // return;
- // }
- // } else {
- // alert('褰撳墠淇悊娌℃湁褰曞叆鐩磋繑鏀惰揣鐨勮缁嗗湴鍧�锛屼笉鑳界敵璇蜂慨鐞嗭紒');
- // return;
- // }
- // }
- // queryForEquipments({
- // deliveredProductId: this.deliveredProductId,
- // }).then(equipments => {
- // if (equipments != null && equipments.length > 0) {
- // var equipment = equipments[0];
- // if (equipment.Status == "寤冩") {
- // alert("璁惧搴熷純锛屼笉鑳芥彁浜ょ敵璇�!");
- // return;
- // }
- // }
- // });
- // if (this.FSEApplyForRepairTime != undefined) {
- // alert("宸蹭慨鐞嗙敵璇凤紝涓嶅啀淇悊鐢宠浜�");
- // return;
- // }
- // var surplusCount = 0;
- // if (this.URFReapir == false) {
- // queryForUrfAsset({
- // maintenanceContractId: this.maintenanceContractId,
- // deliveredProductId: this.deliveredProductId,
- // }).then(urfAsset => {
- // var seriesMaxRepairCount = 0;
- // var seriesRepairCount = 0;
- // if (urfAsset != null && urfAsset.length > 0) {
- // seriesMaxRepairCount = urfAsset[0].Series_MaxRepairCount_F__c;
- // seriesRepairCount = urfAsset[0].Series_RepairCount_F__c;
- // surplusCount = seriesMaxRepairCount - seriesRepairCount;
- // }
- // });
- // queryForUrfSeriesInfo({
- // URFLimitSerial: this.URFLimitSerial,
- // }).then(urfSeriesInfo => {
- // var urfSeries = "";
- // if (urfSeriesInfo != null && urfSeriesInfo.length > 0) {
- // urfSeries = urfSeriesInfo[0].URFLimitSerial__c;
- // }
- // queryForRepairCount({
- // maintenanceContractId: this.maintenanceContractId,
- // status1: "1.鍙楃悊瀹屾瘯",
- // URFLimitSerial: urfSeries,
- // }).then(repairCount => {
- // if (repairCount.length > 0 && surplusCount == 1) {
- // alert("璇ヨ澶囧叧鑱旈檺娆″悎鍚岋紝鐩墠鍓╀綑娆℃暟灏忎簬閫佷慨璁惧銆傝绛夊緟杩涜涓慨鐞嗗畬鎴愬悗鍐嶈繘琛岀敵璇�");
- // return;
- // }
- // });
- // });
- // }
- // if (this.status != "鑽夋涓�" && this.status != "1.鍙楃悊瀹屾瘯(SAP寰呭彂閫�)" && this.status != "4.淇悊鍝佽繑閫侀樁娈�") {
- // alert("涓嶆槸鑽夋涓笉鑳界敵璇�");
- // } else {
- // if (this.dealer != undefined) {
+ if (this.HPActiveC == '鐒″姽') {
+ this.ShowToastEvent("鏈尰闄㈠凡鏃犳晥锛屾棤娉曡繘琛岀敵璇枫��", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
- // queryForFindInvalidLicense({
- // dealerId: this.dealerId,
- // }).then(findInvalidLicense => {
- // console.log(findInvalidLicense);
- // if (findInvalidLicense.length > 0) {
- // alert("缁忛攢鍟嗕笁璇佷笉鍦ㄦ湁鏁堟湡锛屾棤娉曢�佷慨");
- // return;
- // }
- // });
- // }
- // }
- // if (this.ifDeadHurt == "鏈�") {
- // if (!confirm("鏄惁纭AE瑕佹彁浜わ紵")) {
- // return;
- // }
- // }
- // if (this.dayLater30 == "鏄�") {
- // alert("鍒涘缓鍚庤秴杩�30澶╋紝涓嶈兘鐢宠浜�");
- // return;
- // }
- // var prompt11 = "鍚堝悓鍐呭ぇ淇鏁板凡鐢ㄥ畬锛屽綋鍓嶄慨鐞嗕负鍚堝悓澶栫殑淇悊锛屾槸鍚︾户缁紵";
- // if (this.URFReapir == false && surplusCount == 0) {
- // if (!confirm(prompt11)) {
- // return;
- // }
- // }
- // updateForRepair1({
- // recordId: this.Id
- // }).then(result => {
- // if (result != null && result.length > 0) {
- // var split = result.split(", ");
- // alert(split[1]);
- // } else {
- // queryForReocrds({
- // inchargeStaffId: this.inchargeStaffId,
- // }).then(records => {
- // if (records != null && records.length > 0) {
- // var staff = records[0];
- // console.log(staff);
- // updateRepair2({
- // recordId: this.Id,
- // staff: staff,
- // DWSign: this.DWSign,
- // statusc: "1.鍙楃悊瀹屾瘯",
- // DOJStatus: this.DOJStatus,
- // SAPcondition: this.SAPcondition,
- // }).then(result => {
- // console.log(result);
- // if (result != null && result.length > 0) {
- // var split = result.split(", ");
- // alert(split[1]);
- // } else {
- // if (this.salesOfficeCodeSelection == "鎴愰兘RC") {
- // alert("鐜伴樁娈碉紝鎴愰兘RC浠呭彈鐞嗗洓宸濓紙瑗胯棌锛夊唴闀溿�佽タ鍗楀叏鍩烠V/CLV锛屽叾浣欏疄鐗╄鍙戣嚦骞垮窞RC銆�");
- // }
- // }
- // });
- // queryForRds({
- // recordId: this.Id,
- // }).then(rds => {
- // if (rds != null && rds.length > 0) {
- // var repairAft = rds[0];
- // if (repairAft.NewProductGuarante_Formula__c != repairAft.ProductGuarante_Create__c) {
- // alert("璇ヨ澶囦繚淇俊鎭凡鍙戠敓鍙樺寲锛岃浜嗚В");
- // }
- // }
- // });
- // } else {
- // alert("娌℃湁鎵惧埌 淇悊濮旀墭鑰�");
- // }
- // });
- // }
- // });
- // });
+ queryForrecords3({
+ dealer: this.dealer
+ }).then(result => {
+ if (result.length > 0 && result[0].FirstParagraph__c == true) {
+ this.handleConfirmClick01("璇ョ粡閿�鍟嗕负鍏堟瀵硅薄锛屾槸鍚︾户缁敵璇蜂慨鐞嗭紵");
+ } else {
+ this.ll01();
+ }
+ });
var staticResource;
- var DetailedAddress = this.detailedAddress;
-
getStaticResource({
sobj: "Repair__c"
}).then(result => {
@@ -382,13 +209,252 @@
function (data) {
console.log(data);
if (data && data.object) {
- DetailedAddress = data.object.detailedAddress;
+ this.DetailedAddress = data.object.detailedAddress;
}
this.foo();
},
staticResource.token);
});
})
+ }
+
+ ll01() {
+ console.log(1);
+ if (this.numberofEffectiveContract == "鏃�" && this.newProductGuaranteTxt != "2: 澶氬勾淇濅慨" &&
+ this.newProductGuaranteTxt != "2: 鏈嶅姟澶氬勾淇濅慨" && this.newProductGuaranteTxt != "8: 甯傚満澶氬勾淇濅慨" &&
+ this.onSiteRepair == "鐩撮�丼ORC淇悊") {
+ this.handleConfirmClick02("璁惧涓洪潪缁翠慨鍚堝悓涓旈潪澶氬勾淇濅慨瀵硅薄鍝侊紝璇风‘璁ゆ槸鍚︾洿閫丼ORC淇悊锛�");
+ } else {
+ this.ll02();
+ }
+ }
+
+ ll02() {
+ console.log(2);
+ if ((this.maintenanceContract != undefined || this.VMMaintenanceContract != undefined) &&
+ this.onSiteRepair == "RC淇悊" && this.FSEState == "灞变笢鐪�"
+ ) {
+ this.handleConfirmClick03("璇ヨ澶囦负缁翠慨鍚堝悓鎴栧骞翠繚淇璞″搧锛岃纭鏄惁閫佽嚦RC淇悊锛�");
+ } else {
+ this.ll03();
+ }
+ }
+
+ ll03() {
+ console.log(3);
+ var today = Date.now();
+ var dateReceiptQuestions = Date.parse(this.dateReceiptQuestions);
+ var dates = (today - dateReceiptQuestions) / (24 * 60 * 60 * 1000);
+ if (this.profileName != "绯荤粺绠＄悊鍛�" && this.userName != "鑳� 鐜夋垚" && this.userName != "鏉� 鐞竻" &&
+ this.userName != "閮� 娲�" &&
+ this.delayReportReason == undefined && dates > "1" &&
+ this.repairSource != "QIS杞慨鐞�") {
+ this.ShowToastEvent("鐢宠淇悊鏃禨AP淇悊鐢宠鏃ヨ秴杩囬棶棰樿仈缁滄敹鍒版棩1澶╋紝蹇呴』濉啓闂秴鏃舵姤鍛婄殑鐞嗙敱", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ if (this.quickRepairSign == true && (this.numberofEffectiveContract == "鏈�" || this.newProductGuaranteTxt == "2: 澶氬勾淇濅慨" ||
+ this.newProductGuaranteTxt == "2: 鏈嶅姟澶氬勾淇濅慨" || this.newProductGuaranteTxt == "8: 甯傚満澶氬勾淇濅慨") &&
+ (this.onSiteRepair == "RC淇悊" || this.onSiteRepair == "鍔炰簨澶勪慨鐞�" || this.onSiteRepair == "鐜板満淇悊")) {
+ if (this.RCCD == "2.涓滃寳" || this.RCCD == "3.瑗垮寳") {
+ this.handleConfirmClick04("璇ュ瀷鍙峰搴斾负鍚堝悓鎴栧骞翠繚瀵硅薄鍝併�傚纭涓哄ぇ淇悊鏁呴殰锛岄渶瑕侀�夋嫨鐩撮�丼ORC淇悊锛岃纭鏄惁缁х画銆�");
+ } else if (this.RCCD == "1.鍗庡寳" || this.RCCD == "6.鍗庡崡" || this.RCCD == "4.瑗垮崡") {
+ this.handleConfirmClick04("璇ュ瀷鍙峰搴斾负鍚堝悓鎴栧骞翠繚瀵硅薄鍝併�傚纭涓哄ぇ淇悊鏁呴殰锛岄渶瑕侀�夋嫨鐩撮�丱GZ淇悊锛岃纭鏄惁缁х画銆�");
+ } else {
+ if (this.returnsProductway == undefined) {
+ this.handleConfirmClick06("杩斿搧鏂瑰紡涓虹┖锛屾槸鍚︾户缁敵璇蜂慨鐞嗭紒");
+ } else {
+ this.ll06();
+ }
+ }
+ } else {
+ if (this.returnsProductway == undefined) {
+ this.handleConfirmClick06("杩斿搧鏂瑰紡涓虹┖锛屾槸鍚︾户缁敵璇蜂慨鐞嗭紒");
+ } else {
+ this.ll06();
+ }
+ }
+ }
+
+ ll06() {
+ console.log(6);
+ if (this.assetOwner != "Olympus") {
+ if (this.DetailedAddress != undefined) {
+ this.handleConfirmClick07('褰撳墠鐩磋繑鏀惰揣鍦板潃涓猴細' + this.DetailedAddress + ',鎮ㄧ‘璁や笉淇敼浜嗗悧锛�');
+ } else {
+ this.ShowToastEvent('褰撳墠淇悊娌℃湁褰曞叆鐩磋繑鏀惰揣鐨勮缁嗗湴鍧�锛屼笉鑳界敵璇蜂慨鐞嗭紒', "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ } else {
+ this.ll07();
+ }
+ }
+
+ ll07() {
+ console.log(7);
+ queryForEquipments({
+ deliveredProductId: this.deliveredProductId,
+ }).then(equipments => {
+ if (equipments != null && equipments.length > 0) {
+ var equipment = equipments[0];
+ if (equipment.Status == "寤冩") {
+ this.ShowToastEvent("璁惧搴熷純锛屼笉鑳芥彁浜ょ敵璇�!", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ }
+ });
+ console.log(701);
+ if (this.FSEApplyForRepairTime != undefined) {
+ this.ShowToastEvent("宸蹭慨鐞嗙敵璇凤紝涓嶅啀淇悊鐢宠浜�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ console.log(702);
+ if (this.URFReapir == false) {
+ queryForUrfAsset({
+ maintenanceContractId: this.maintenanceContractId,
+ deliveredProductId: this.deliveredProductId,
+ }).then(urfAsset => {
+ var seriesMaxRepairCount = 0;
+ var seriesRepairCount = 0;
+ if (urfAsset != null && urfAsset.length > 0) {
+ seriesMaxRepairCount = urfAsset[0].Series_MaxRepairCount_F__c;
+ seriesRepairCount = urfAsset[0].Series_RepairCount_F__c;
+ this.surplusCount = seriesMaxRepairCount - seriesRepairCount;
+ }
+ });
+ console.log(703);
+
+ queryForUrfSeriesInfo({
+ URFLimitSerial: this.URFLimitSerial,
+ }).then(urfSeriesInfo => {
+ var urfSeries = "";
+ if (urfSeriesInfo != null && urfSeriesInfo.length > 0) {
+ urfSeries = urfSeriesInfo[0].URFLimitSerial__c;
+ }
+ console.log(704);
+
+ queryForRepairCount({
+ maintenanceContractId: this.maintenanceContractId,
+ status1: "1.鍙楃悊瀹屾瘯",
+ URFLimitSerial: urfSeries,
+ }).then(repairCount => {
+ if (repairCount.length > 0 && this.surplusCount == 1) {
+ this.ShowToastEvent("璇ヨ澶囧叧鑱旈檺娆″悎鍚岋紝鐩墠鍓╀綑娆℃暟灏忎簬閫佷慨璁惧銆傝绛夊緟杩涜涓慨鐞嗗畬鎴愬悗鍐嶈繘琛岀敵璇�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ });
+ });
+ }
+ console.log(705);
+
+ if (this.status != "鑽夋涓�" && this.status != "1.鍙楃悊瀹屾瘯(SAP寰呭彂閫�)" && this.status != "4.淇悊鍝佽繑閫侀樁娈�") {
+ this.ShowToastEvent("涓嶆槸鑽夋涓笉鑳界敵璇�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ } else {
+ if (this.dealer != undefined) {
+ queryForFindInvalidLicense({
+ dealerId: this.dealerId,
+ }).then(findInvalidLicense => {
+ console.log(findInvalidLicense);
+ if (findInvalidLicense.length > 0) {
+ this.ShowToastEvent("缁忛攢鍟嗕笁璇佷笉鍦ㄦ湁鏁堟湡锛屾棤娉曢�佷慨", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ });
+ }
+ }
+ if (this.ifDeadHurt == "鏈�") {
+ this.handleConfirmClick08("鏄惁纭AE瑕佹彁浜わ紵");
+ } else {
+ this.ll08();
+ }
+ }
+
+ ll08() {
+ console.log(8);
+ if (this.dayLater30 == "鏄�") {
+ this.ShowToastEvent("鍒涘缓鍚庤秴杩�30澶╋紝涓嶈兘鐢宠浜�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ if (this.URFReapir == true && this.surplusCount == 0) {
+ this.handleConfirmClick09("鍚堝悓鍐呭ぇ淇鏁板凡鐢ㄥ畬锛屽綋鍓嶄慨鐞嗕负鍚堝悓澶栫殑淇悊锛屾槸鍚︾户缁紵");
+ } else {
+ this.ll09();
+ }
+ }
+
+ ll09() {
+ console.log(9);
+ updateForRepair1({
+ recordId: this.Id
+ }).then(result => {
+ if (result != null && result.length > 0) {
+ var split = result.split(", ");
+ this.ShowToastEvent(split[1], "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ } else {
+ console.log(901);
+ queryForReocrds({
+ inchargeStaffId: this.inchargeStaffId,
+ }).then(records => {
+ if (records != null && records.length > 0) {
+ var staff = records[0];
+ console.log(staff);
+ console.log(902);
+ updateRepair2({
+ recordId: this.Id,
+ staff: staff,
+ DWSign: this.DWSign,
+ statusc: "1.鍙楃悊瀹屾瘯",
+ DOJStatus: this.DOJStatus,
+ SAPcondition: this.SAPcondition,
+ }).then(result => {
+ console.log(result);
+ console.log(903);
+ if (result != null && result.length > 0) {
+ var split = result.split(", ");
+ this.ShowToastEvent(split[1], "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ } else {
+ if (this.salesOfficeCodeSelection == "鎴愰兘RC") {
+ this.ShowToastEvent("鐜伴樁娈碉紝鎴愰兘RC浠呭彈鐞嗗洓宸濓紙瑗胯棌锛夊唴闀溿�佽タ鍗楀叏鍩烠V/CLV锛屽叾浣欏疄鐗╄鍙戣嚦骞垮窞RC銆�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ }
+ console.log(904);
+ queryForRds({
+ recordId: this.Id,
+ }).then(rds => {
+ console.log(rds);
+ if (rds != null && rds.length > 0) {
+ var repairAft = rds[0];
+ if (repairAft.NewProductGuarante_Formula__c != repairAft.ProductGuarante_Create__c) {
+ this.ShowToastEvent("璇ヨ澶囦繚淇俊鎭凡鍙戠敓鍙樺寲锛岃浜嗚В", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ }
+ });
+ window.open(this.url, "_self");
+ });
+ } else {
+ this.ShowToastEvent("娌℃湁鎵惧埌 淇悊濮旀墭鑰�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ });
+ }
+ });
}
ShowToastEvent(msg, type) {
@@ -399,4 +465,129 @@
});
this.dispatchEvent(event);
}
+
+ async handleConfirmClick01(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+ if (result) {
+ this.ll01();
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
+
+ async handleConfirmClick02(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+ if (result) {
+ this.ll02();
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
+
+ async handleConfirmClick03(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+ if (result) {
+ this.ll03();
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
+
+ async handleConfirmClick04(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+ if (result) {
+ if (this.returnsProductway == undefined) {
+ this.handleConfirmClick06("杩斿搧鏂瑰紡涓虹┖锛屾槸鍚︾户缁敵璇蜂慨鐞嗭紒");
+ } else {
+ this.ll06();
+ }
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
+
+ async handleConfirmClick05(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+ if (result) {
+ if (this.returnsProductway == undefined) {
+ this.handleConfirmClick06("杩斿搧鏂瑰紡涓虹┖锛屾槸鍚︾户缁敵璇蜂慨鐞嗭紒");
+ } else {
+ this.ll06();
+ }
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
+
+ async handleConfirmClick06(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+ if (result) {
+ this.ll06();
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
+
+ async handleConfirmClick07(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+ if (result) {
+ this.ll07();
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
+
+ async handleConfirmClick08(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+ if (result) {
+ this.ll08();
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
+
+ async handleConfirmClick09(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+ if (result) {
+ this.ll09();
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSendQISToEtQ/lexSendQISToEtQ.html b/force-app/main/default/lwc/lexSendQISToEtQ/lexSendQISToEtQ.html
index aaa4cbd..62dbf20 100644
--- a/force-app/main/default/lwc/lexSendQISToEtQ/lexSendQISToEtQ.html
+++ b/force-app/main/default/lwc/lexSendQISToEtQ/lexSendQISToEtQ.html
@@ -2,5 +2,6 @@
<div class="toReportHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
<lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button>
+ <lightning-button onclick={handleConfirmClick} label="Open Confirm Modal"></lightning-button>
</div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSendQISToEtQ/lexSendQISToEtQ.js b/force-app/main/default/lwc/lexSendQISToEtQ/lexSendQISToEtQ.js
index 8cee80b..34540bf 100644
--- a/force-app/main/default/lwc/lexSendQISToEtQ/lexSendQISToEtQ.js
+++ b/force-app/main/default/lwc/lexSendQISToEtQ/lexSendQISToEtQ.js
@@ -17,6 +17,7 @@
import {
ShowToastEvent
} from 'lightning/platformShowToastEvent';
+import LightningConfirm from 'lightning/confirm';
export default class LexSendQISToEtQ extends LightningElement {
@api recordId;
@@ -32,6 +33,7 @@
ETQUPLOADSTATUSC;
AEDetermineResultC;
profileName;
+ statu = '';
@wire(CurrentPageReference)
getStateParameters(currentPageReference) {
@@ -50,7 +52,6 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.Id = result.Id;
this.userId = result.userId;
this.profileId = result.profileId;
@@ -72,7 +73,6 @@
this.myReload();
}
})
- this.dispatchEvent(new CloseActionScreenEvent());
}
}).catch(error => {
console.log(error);
@@ -89,31 +89,51 @@
// 鍙戦�丵IS鍒癊tQ
SendQISToEtQ() {
- console.log(this.profileName);
- var QId = this.Id;
- var uid = this.userId;
-
if (this.profileName != "2F7_OSH鎷呭綋" && this.profileName != "2F7_OSH璐ㄩ噺娉曡") {
- alert("鎮ㄦ病鏈夊彂閫丵IS鍒癊tQ鐨勬潈闄愩��");
+ this.ShowToastEvent("鎮ㄦ病鏈夊彂閫丵IS鍒癊tQ鐨勬潈闄愩��", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
if (this.PAEDetermineC == undefined) {
- alert("OCSM QARA鐨凱AE鍒ゅ畾鏄┖鐨勬椂鍊欙紝涓嶅彲浠ュ彂閫佸埌EtQ銆�");
+ this.ShowToastEvent("OCSM QARA鐨凱AE鍒ゅ畾鏄┖鐨勬椂鍊欙紝涓嶅彲浠ュ彂閫佸埌EtQ銆�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
if (this.AEDetermineResultC == "nonAE" && this.PAEDetermineC == "nonPAE" && this.PAEDetermineACC == "nonPAE" && this.OCMJudgementC == undefined && this.QISFinalJudgementC == undefined) {
- alert("nonAE骞秐onPAE鐨凲IS鍚屾鍒癊tQ鐨勬椂鍊欙紝妫�娴嬬粨璁�(OCSM)鏄繀濉殑銆備笉鍙互鍙戦�佸埌EtQ銆�");
+ this.ShowToastEvent("nonAE骞秐onPAE鐨凲IS鍚屾鍒癊tQ鐨勬椂鍊欙紝妫�娴嬬粨璁�(OCSM)鏄繀濉殑銆備笉鍙互鍙戦�佸埌EtQ銆�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
if (this.ETQUPLOADSTATUSC == "3") {
- if (!confirm("鏄惁娓呯┖EtQ鍚屾鐘舵�侊紝閲嶆柊鍚屾鏁版嵁锛�")) {
- return;
- }
+ this.handleConfirmClick("鏄惁娓呯┖EtQ鍚屾鐘舵�侊紝閲嶆柊鍚屾鏁版嵁锛�");
+ } else {
+ this.ll();
}
+ }
- var statu = '';
+ myReload() {
+ selectQISReportC({
+ QId: this.Id
+ }).then(record => {
+ console.log(record);
+ if (record[0].AsyncData__c == 'true' && record[0].ETQ_UPLOAD_STATUS__c != '3' || record[0].Complaint_Number__c != null) {
+ var btns = document.getElementsByName("sendqistoetq");
+ for (var i = 0; i < btns.length; i++) {
+ btns[i].disabled = true;
+ btns[i].className = 'btnDisabled';
+ }
+ this.ShowToastEvent('璇IS涔嬪墠宸茬粡鍙戦�佽繃浜�', "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ } else {
+ this.SendQISToEtQ();
+ }
+ })
+ }
+
+ ll() {
if (this.AEDetermineResultC != undefined && this.PAEDetermineC != undefined && this.PAEDetermineACC == undefined) {
- statu = "Q1";
+ this.statu = "Q1";
} else if (
(this.AEDetermineResultC != undefined && this.PAEDetermineC != undefined && this.PAEDetermineACC != "nonPAE" && this.PAEDetermineACC != undefined) ||
(this.AEDetermineResultC == "nonAE" && this.PAEDetermineC == "nonPAE" && this.PAEDetermineACC == "nonPAE") &&
@@ -123,61 +143,43 @@
(this.QISFinalJudgementC == undefined || this.QISFinalJudgementC == "璐ㄩ噺闂")) ||
(this.OCMJudgementC == "闈炶川閲忛棶棰�" || this.OCMJudgementC == "鐜拌薄鏈彂鐜�") &&
this.QISFinalJudgementC == "璐ㄩ噺闂")) {
- statu = "Q2";
+ this.statu = "Q2";
} else if ((this.AEDetermineResultC == "nonAE" && this.PAEDetermineC == "nonPAE" && this.PAEDetermineACC == "nonPAE") &&
((this.OCMJudgementC == undefined || this.OCMJudgementC == "璐ㄩ噺闂" || this.OCMJudgementC == "璐ㄩ噺闂+闈炶川閲忛棶棰�") && this.QISFinalJudgementC == "闈炶川閲忛棶棰�") ||
((this.OCMJudgementC == "闈炶川閲忛棶棰�" || this.OCMJudgementC == "鐜拌薄鏈彂鐜�") && (this.QISFinalJudgementC == undefined || this.QISFinalJudgementC == "闈炶川閲忛棶棰�"))) {
- statu = "Q3";
+ this.statu = "Q3";
}
- try {
- updateQISReportC({
- QId: QId,
- uid: uid
- })
+ updateQISReportC({
+ QId: this.Id,
+ uid: this.userId
+ })
- var qisreports = new Array()
- qisreports[0] = this.Id;
+ var qisreports = new Array()
+ qisreports[0] = this.Id;
- var statuArr = new Array();
- statuArr.push(statu);
+ var statuArr = new Array();
+ statuArr.push(this.statu);
- sendToETQ({
- iflog_Id: "",
- rowDataSFDC: "",
- repairIds: qisreports,
- statu: statuArr[0]
- }).then(result => {
- alert(result);
- })
-
- alert("鍙戦�佹垚鍔�!")
- var btns = document.getElementsByName("sendqistoetq");
- for (var i = 0; i < btns.length; i++) {
- btns[i].disabled = true;
- btns[i].className = 'btnDisabled';
- }
- location.reload();
- } catch (error) {
- alert("鍙戦�丵IS鍒癊tQ澶辫触" + error.faultstring + ' code:' + error.faultcode)
- }
- }
-
- myReload() {
- selectQISReportC({
- QId: this.Id
- }).then(record => {
- console.log(record);
- if (record[0].AsyncData__c == 'true' && record[0].ETQ_UPLOAD_STATUS__c != '3' || record[0].Complaint_Number__c != null) {
- var btns = document.getElementsByName("sendqistoetq");
- for (var i = 0; i < btns.length; i++) {
- btns[i].disabled = true;
- btns[i].className = 'btnDisabled';
- }
- alert('璇IS涔嬪墠宸茬粡鍙戦�佽繃浜�')
+ sendToETQ({
+ iflog_Id: "",
+ rowDataSFDC: "",
+ repairIds: qisreports,
+ statu: statuArr[0]
+ }).then(result => {
+ if (result == "鍙戦�佹垚鍔�!") {
+ this.ShowToastEvent(result, "success");
+ this.dispatchEvent(new CloseActionScreenEvent());
} else {
- this.SendQISToEtQ();
+ this.ShowToastEvent("鍙戦�丵IS鍒癊tQ澶辫触," + result, "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
}
})
+
+ var btns = document.getElementsByName("sendqistoetq");
+ for (var i = 0; i < btns.length; i++) {
+ btns[i].disabled = true;
+ btns[i].className = 'btnDisabled';
+ }
}
// 寮圭獥
@@ -189,4 +191,18 @@
});
this.dispatchEvent(event);
}
+
+ async handleConfirmClick(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+
+ if (result) {
+ this.ll();
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSendRepairsToEtQ/lexSendRepairsToEtQ.html b/force-app/main/default/lwc/lexSendRepairsToEtQ/lexSendRepairsToEtQ.html
index 87f391a..92c9e32 100644
--- a/force-app/main/default/lwc/lexSendRepairsToEtQ/lexSendRepairsToEtQ.html
+++ b/force-app/main/default/lwc/lexSendRepairsToEtQ/lexSendRepairsToEtQ.html
@@ -2,5 +2,6 @@
<div class="exampleHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
<lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button>
+ <lightning-button onclick={handleConfirmClick} label="Open Confirm Modal"></lightning-button>
</div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSendRepairsToEtQ/lexSendRepairsToEtQ.js b/force-app/main/default/lwc/lexSendRepairsToEtQ/lexSendRepairsToEtQ.js
index 82f115d..bfc137a 100644
--- a/force-app/main/default/lwc/lexSendRepairsToEtQ/lexSendRepairsToEtQ.js
+++ b/force-app/main/default/lwc/lexSendRepairsToEtQ/lexSendRepairsToEtQ.js
@@ -17,6 +17,7 @@
import {
ShowToastEvent
} from 'lightning/platformShowToastEvent';
+import LightningConfirm from 'lightning/confirm';
export default class LexSendRepairsToEtQ extends LightningElement {
@api recordId;
@@ -33,6 +34,8 @@
profileId;
profileName;
userName;
+ msg;
+ statu = '';
@wire(CurrentPageReference)
getStateParameters(currentPageReference) {
@@ -52,7 +55,6 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.Id = result.Id;
this.PAEDetermineC = result.PAEDetermineC;
this.ETQUPLOADSTATUSC = result.ETQUPLOADSTATUSC;
@@ -67,7 +69,6 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.userName = result[0].Name;
}
})
@@ -75,7 +76,6 @@
profileId: this.profileId
}).then(result => {
if (result != null) {
- this.IsLoading = false;
this.profileName = result[0].Name;
this.myDate();
@@ -83,7 +83,6 @@
}
})
- this.dispatchEvent(new CloseActionScreenEvent());
}
}).catch(error => {
console.log(error);
@@ -105,13 +104,15 @@
selectRecords({
recordId: this.Id
}).then(result => {
- if (result[0].AsyncData__c == 'true' && result[0].ETQ_UPLOAD_STATUS__c != '3' || result[0].Complaint_Number__c != null) {
+ if (result[0].AsyncData__c == true && result[0].ETQ_UPLOAD_STATUS__c != '3' || result[0].Complaint_Number__c != null) {
var btns = document.getElementsByName("sendrepairstoetq");
for (var i = 0; i < btns.length; i++) {
btns[i].disabled = true;
btns[i].className = 'btnDisabled';
}
- alert('璇ヤ慨鐞嗕箣鍓嶅凡缁忓彂閫佽繃浜�');
+ this.ShowToastEvent('璇ヤ慨鐞嗕箣鍓嶅凡缁忓彂閫佽繃浜�', "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
} else {
this.SendRepairsToEtQ();
}
@@ -123,61 +124,71 @@
// 鍙戦�丒TQ
SendRepairsToEtQ() {
if (this.profileName != "2F7_OSH鎷呭綋" && this.profileName != "2F7_OSH璐ㄩ噺娉曡" && this.profileName != '绯荤粺绠＄悊鍛�') {
- alert("鎮ㄦ病鏈夊彂閫佷慨鐞嗗埌EtQ鐨勬潈闄愩��");
+ this.ShowToastEvent("鎮ㄦ病鏈夊彂閫佷慨鐞嗗埌EtQ鐨勬潈闄愩��", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
- var statu = '';
if (this.PAEDetermineC == undefined) {
- alert("OCSM QARA鐨凱AE鍒ゅ畾鏄┖鐨勬椂鍊欙紝涓嶅彲浠ュ彂閫佸埌EtQ銆�");
+ this.ShowToastEvent("OCSM QARA鐨凱AE鍒ゅ畾鏄┖鐨勬椂鍊欙紝涓嶅彲浠ュ彂閫佸埌EtQ銆�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ if (this.PAEDetermineC == "nonPAE" && this.AEDetermineResultC == "nonAE" && this.PAEDetermineACC == "nonPAE" && this.userName != "闆� 鏂板缓") {
+ this.ShowToastEvent("Close Complait鐨勬椂鍊欙紝涓嶅彲浠ュ彂閫佸埌EtQ", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
if (this.ETQUPLOADSTATUSC == "3") {
- if (!confirm("鏄惁娓呯┖EtQ鍚屾鐘舵�侊紝閲嶆柊鍚屾鏁版嵁锛�")) {
- return;
- }
+ this.handleConfirmClick("鏄惁娓呯┖EtQ鍚屾鐘舵�侊紝閲嶆柊鍚屾鏁版嵁锛�");
+ } else {
+ this.ll();
}
- if (this.PAEDetermineC == "nonPAE" && this.AEDetermineResultC == "nonAE" && this.PAEDetermineACC == "nonPAE" && this.userName != "闆� 鏂板缓") {
- alert("Close Complait鐨勬椂鍊欙紝涓嶅彲浠ュ彂閫佸埌EtQ");
- return;
- }
+ }
+
+ ll() {
if (this.PAEDetermineC != undefined && this.AEDetermineResultC != undefined && this.PAEDetermineACC == undefined) {
- statu = "R1";
+ this.statu = "R1";
} else if ((this.AEDetermineResultC != undefined && this.PAEDetermineC != undefined && this.PAEDetermineACC != undefined) &&
!(this.PAEDetermineC == "nonPAE" && this.AEDetermineResultC == "nonAE" && this.PAEDetermineACC == "nonPAE")) {
- statu = "R2";
+ this.statu = "R2";
if (this.RepairInspectionDateC == undefined) {
- alert("5.淇悊妫�娴嬫棩鏄┖鐨勬椂鍊欙紝涓嶅彲浠ュ彂閫佸埌EtQ銆�");
+ this.ShowToastEvent("5.淇悊妫�娴嬫棩鏄┖鐨勬椂鍊欙紝涓嶅彲浠ュ彂閫佸埌EtQ銆�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
if (this.ContainUseRSAC == 1) {
- alert("Final universal code涓虹┖锛屾垨鑰呭寘鍚玌seRSA锛岃纭銆�");
+ this.ShowToastEvent("Final universal code涓虹┖锛屾垨鑰呭寘鍚玌seRSA锛岃纭銆�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
}
- try {
- var repairids = new Array()
- repairids[0] = this.Id;
- var statuArr = new Array();
- statuArr.push(statu);
+ var repairids = new Array()
+ repairids[0] = this.Id;
- sendToETQ({
- iflog_Id: "",
- rowDataSFDC: "",
- repairIds: repairids,
- statu: statuArr[0]
- }).then(result => {
- alert(result);
- location.reload();
- })
+ var statuArr = new Array();
+ statuArr.push(this.statu);
- var btns = document.getElementsByName("sendrepairstoetq");
- for (var i = 0; i < btns.length; i++) {
- btns[i].disabled = true;
- btns[i].className = 'btnDisabled';
+ sendToETQ({
+ iflog_Id: "",
+ rowDataSFDC: "",
+ repairIds: repairids,
+ statu: statuArr[0]
+ }).then(result => {
+ console.log("result:" + result);
+ if (result == "鍙戦�佹垚鍔�!") {
+ this.ShowToastEvent(result, "success");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ } else {
+ this.ShowToastEvent("鍙戦�佷慨鐞嗗埌EtQ澶辫触," + result, "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
}
- } catch (error) {
- alert("鍙戦�佷慨鐞嗗埌EtQ澶辫触" + error.faultstring + ' code:' + error.faultcode);
+ })
+
+ var btns = document.getElementsByName("sendrepairstoetq");
+ for (var i = 0; i < btns.length; i++) {
+ btns[i].disabled = true;
+ btns[i].className = 'btnDisabled';
}
}
@@ -190,4 +201,19 @@
});
this.dispatchEvent(event);
}
+
+ async handleConfirmClick(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+
+ if (result) {
+ this.ll();
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
+
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexServiceCutPriceApply/lexServiceCutPriceApply.js b/force-app/main/default/lwc/lexServiceCutPriceApply/lexServiceCutPriceApply.js
index 26b7f7d..6aa856d 100644
--- a/force-app/main/default/lwc/lexServiceCutPriceApply/lexServiceCutPriceApply.js
+++ b/force-app/main/default/lwc/lexServiceCutPriceApply/lexServiceCutPriceApply.js
@@ -59,7 +59,6 @@
this.ServiceCutPriceApply();
}
})
- this.dispatchEvent(new CloseActionScreenEvent());
}
}).catch(error => {
console.log(error);
@@ -74,15 +73,18 @@
if (power != '2F2A_RC' && power != '2F4_鎶�鏈帹杩涢儴' && power != '2F4_鎶�鏈帹杩涢儴_闈濻SO') {
this.ShowToastEvent("瀵逛笉璧凤紝鎮ㄦ病鏈夋潈闄愭彁浜ゆ鐢宠锛�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
var status = this.CutPriceStatusServiceC;
if (status == '瀹℃壒涓�') {
this.ShowToastEvent("瀹℃壒鎻愪氦鎴愬姛,褰撳墠姝ｅ湪瀹℃壒璇峰嬁鍐嶆彁浜わ紒", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
if (status == '鎵瑰噯') {
this.ShowToastEvent("瀹℃壒宸叉壒鍑�,璇峰嬁鍐嶆彁浜わ紒", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
if (status == '鑽夋涓�' || status == undefined || status == '椹冲洖') {
@@ -92,7 +94,8 @@
console.log(result);
if (result.length > 0) {
var split = result.split(", ");
- alert(split[1]);
+ this.ShowToastEvent(split[1], "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
}
})
@@ -102,11 +105,13 @@
console.log(result);
if (result.length > 0) {
var split = result.split(", ");
- alert("鎻愪氦澶辫触 " + split[1]);
+ this.ShowToastEvent("鎻愪氦澶辫触 " + split[1], "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
return;
} else {
this.ShowToastEvent("瀹℃壒鎻愪氦鎴愬姛锛�", "success");
location.reload();
+ this.dispatchEvent(new CloseActionScreenEvent());
}
})
}
diff --git a/force-app/main/default/lwc/lexUploadToRecognitionModel/lexUploadToRecognitionModel.html b/force-app/main/default/lwc/lexUploadToRecognitionModel/lexUploadToRecognitionModel.html
index 87f391a..92c9e32 100644
--- a/force-app/main/default/lwc/lexUploadToRecognitionModel/lexUploadToRecognitionModel.html
+++ b/force-app/main/default/lwc/lexUploadToRecognitionModel/lexUploadToRecognitionModel.html
@@ -2,5 +2,6 @@
<div class="exampleHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
<lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button>
+ <lightning-button onclick={handleConfirmClick} label="Open Confirm Modal"></lightning-button>
</div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexUploadToRecognitionModel/lexUploadToRecognitionModel.js b/force-app/main/default/lwc/lexUploadToRecognitionModel/lexUploadToRecognitionModel.js
index 987e871..9025162 100644
--- a/force-app/main/default/lwc/lexUploadToRecognitionModel/lexUploadToRecognitionModel.js
+++ b/force-app/main/default/lwc/lexUploadToRecognitionModel/lexUploadToRecognitionModel.js
@@ -12,7 +12,10 @@
import init from '@salesforce/apex/otherButtonMaintenanceContractCtl.init';
import updateColunm from '@salesforce/apex/MaintenanceContractSetColunmWebService.updateColunm';
import up2sap from '@salesforce/apex/MaintenanceContractWebService.up2sap';
-import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import {
+ ShowToastEvent
+} from 'lightning/platformShowToastEvent';
+import LightningConfirm from 'lightning/confirm';
export default class LexUploadToRecognitionModel extends LightningElement {
@api recordId;
@@ -54,54 +57,68 @@
this.PaymentPlanSumFirstC = result.PaymentPlanSumFirstC;
this.uploadToRecognitionModel();
- this.dispatchEvent(new CloseActionScreenEvent());
}
}).catch(error => {
console.log(error);
- }).finally(() => {
-
- });
+ })
}
// 涓婁紶璁ゆ鍚堝悓
uploadToRecognitionModel() {
if (this.ContractQuotationOrNotC == '杩樻病鍋氭姤浠�') {
- this.ShowToastEvent("鎮ㄨ繕娌℃湁鍋氬悎鍚屾姤浠凤紝涓嶈兘涓婁紶璁ゆ鍚堝悓銆�", "error")
+ this.ShowToastEvent("鎮ㄨ繕娌℃湁鍋氬悎鍚屾姤浠凤紝涓嶈兘涓婁紶璁ゆ鍚堝悓銆�", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
} else if (this.MaintenanceContractNoC == undefined) {
- this.ShowToastEvent('鍚堝悓鍙风爜涓虹┖锛屼笉鑳戒笂浼犺娆惧悎鍚屻��', "error")
+ this.ShowToastEvent('鍚堝悓鍙风爜涓虹┖锛屼笉鑳戒笂浼犺娆惧悎鍚屻��', "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
} else if (this.uploadToSapTimeC != undefined) {
- this.ShowToastEvent('宸茬粡涓婁紶SAP锛屼笉鑳藉啀娆′笂浼犺娆惧悎鍚屻��', "error")
+ this.ShowToastEvent('宸茬粡涓婁紶SAP锛屼笉鑳藉啀娆′笂浼犺娆惧悎鍚屻��', "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
} else if (this.uploadToRMTimeC != undefined) {
- this.ShowToastEvent('宸茬粡涓婁紶璁ゆ鍚堝悓锛屼笉鑳藉啀娆′笂浼犺娆惧悎鍚屻��', "error")
+ this.ShowToastEvent('宸茬粡涓婁紶璁ゆ鍚堝悓锛屼笉鑳藉啀娆′笂浼犺娆惧悎鍚屻��', "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
} else {
if (!this.oldIsRecognitionModelC) {
- this.ShowToastEvent('缁忛攢鍟嗕负绌烘垨缁忛攢鍟嗕笉鏄厛娆惧璞★紝涓嶉渶瑕佷笂浼犺娆惧悎鍚屻��', "error")
+ this.ShowToastEvent('缁忛攢鍟嗕负绌烘垨缁忛攢鍟嗕笉鏄厛娆惧璞★紝涓嶉渶瑕佷笂浼犺娆惧悎鍚屻��', "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
} else if (this.PaymentPlanSumFirstC == undefined) {
- this.ShowToastEvent('绗竴娆¤鍒掍粯娆鹃噾棰濅笉鑳戒负绌恒��', "error")
+ this.ShowToastEvent('绗竴娆¤鍒掍粯娆鹃噾棰濅笉鑳戒负绌恒��', "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
} else {
- if (!confirm('璇风‘璁ゆ槸鍚﹁涓婁紶璁ゆ鍚堝悓銆�')) {
- return;
- }
- updateColunm({
- mcid: this.Id
- }).then(result => {
- if (result != '1') {
- alert('涓婁紶璁ゆ鍚堝悓澶辫触,鍥犱负 鏉ュ勾鍚堝悓鐩稿叧淇℃伅淇敼澶辫触')
- location.href = "/" + this.Id;
- }
- })
- up2sap({
- mcid: this.Id
- }).then(rtn => {
- if (rtn == '1') {
- alert("涓婁紶璁ゆ鍚堝悓鎴愬姛")
- location.href = "/" + this.Id;
- } else {
- alert(rtn)
- }
- })
+ this.handleConfirmClick('璇风‘璁ゆ槸鍚﹁涓婁紶璁ゆ鍚堝悓銆�');
}
}
+ }
+
+ ll() {
+ updateColunm({
+ mcid: this.Id
+ }).then(result => {
+ if (result != '1') {
+ this.ShowToastEvent('涓婁紶璁ゆ鍚堝悓澶辫触,鍥犱负 鏉ュ勾鍚堝悓鐩稿叧淇℃伅淇敼澶辫触', "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ window.reload();
+ }
+ })
+ up2sap({
+ mcid: this.Id
+ }).then(rtn => {
+ if (rtn == '1') {
+ this.ShowToastEvent("涓婁紶璁ゆ鍚堝悓鎴愬姛", "success");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ window.reload();
+ } else {
+ this.ShowToastEvent(rtn, "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ })
}
// 寮圭獥
@@ -113,4 +130,18 @@
});
this.dispatchEvent(event);
}
+
+ async handleConfirmClick(msg) {
+ const result = await LightningConfirm.open({
+ message: msg,
+ variant: 'headerless',
+ label: 'this is the aria-label value'
+ });
+
+ if (result) {
+ this.ll();
+ } else {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexYanshoudanRequest/lexYanshoudanRequest.js b/force-app/main/default/lwc/lexYanshoudanRequest/lexYanshoudanRequest.js
index 97a70c1..687c05f 100644
--- a/force-app/main/default/lwc/lexYanshoudanRequest/lexYanshoudanRequest.js
+++ b/force-app/main/default/lwc/lexYanshoudanRequest/lexYanshoudanRequest.js
@@ -42,7 +42,6 @@
this.Id = result.Id;
this.YanshoudanRequest();
- this.dispatchEvent(new CloseActionScreenEvent());
}
}).catch(error => {
console.log(error);
@@ -58,10 +57,12 @@
if (result != null) {
if (result.length > 0) {
var split = result.split(", ");
- alert(split[1]);
+ this.ShowToastEvent(split[1], "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
}
}
- alert("宸茬粡鐢宠杩囦簡锛屼笉鍏佽閲嶆柊鐢宠");
+ this.ShowToastEvent("宸茬粡鐢宠杩囦簡锛屼笉鍏佽閲嶆柊鐢宠", "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
})
}
diff --git a/force-app/main/default/lwc/lexcopyQIS/lexcopyQIS.html b/force-app/main/default/lwc/lexcopyQIS/lexcopyQIS.html
index c8bdbfc..48f29e0 100644
--- a/force-app/main/default/lwc/lexcopyQIS/lexcopyQIS.html
+++ b/force-app/main/default/lwc/lexcopyQIS/lexcopyQIS.html
@@ -1,5 +1,6 @@
<template>
- <div class="sisToOPDHolder" if:true={IsLoading}>
+ <div class="sisToOPDHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ <lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button>
</div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexcopyQIS/lexcopyQIS.js b/force-app/main/default/lwc/lexcopyQIS/lexcopyQIS.js
index b35e67a..bc41f13 100644
--- a/force-app/main/default/lwc/lexcopyQIS/lexcopyQIS.js
+++ b/force-app/main/default/lwc/lexcopyQIS/lexcopyQIS.js
@@ -54,7 +54,7 @@
if (this.QISStatusC != '鍙栨秷') {
this.ShowToastEvent('鐘舵�佷负鍙栨秷鐨凲IS鎵嶅彲浠ヨ澶嶅埗骞舵柊寤�', 'error');
return;
- }
+ }
var url = "/" + this.Id + "/e?newclone=1&retURL=%2F" + this.Id + " &CF00N100000073PA0=" + this.Name + "&CF00N100000073PA0_lkid=" + this.Id;
window.open(url);
}
diff --git a/force-app/main/default/pages/AccessoryAdd.page b/force-app/main/default/pages/AccessoryAdd.page
index c183632..ccb62e1 100644
--- a/force-app/main/default/pages/AccessoryAdd.page
+++ b/force-app/main/default/pages/AccessoryAdd.page
@@ -1,95 +1,126 @@
<!-- <apex:page controller="AccessoryAddController" showHeader="false" sidebar="false" id="allPage" action="{!init}"> -->
- <apex:page controller="AccessoryAddController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets = "true">
- <head>
- <title>闄勫睘鍝佽拷鍔�</title>
- <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
- <apex:stylesheet value="{!URLFOR($Resource.AccessoryAddCss)}"/>
- <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
- <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
- <apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
-
- <!-- 20230426 zq add style -->
- <style>
- body .bPageBlock .detailList .labelCol {
- width: auto;
- }
- body input.btn {
- padding: 2px 3px;
- margin-left: 55px;
- }
- </style>
- <script type="text/javascript">
- var heightAjustment = 120;
- var widthAjustment = 30;
-
- </script>
- </head>
- <apex:form id="allForm">
- <apex:outputPanel id="pageallPanel">
- <apex:pageBlock id="searchBlock" tabStyle="Report">
- <apex:pageBlockSection title="闄勫睘鍝佽拷鍔�">
- <apex:outputField value="{!parentObj.Rental_Apply__r.Name}"/>
- <apex:outputField value="{!parentObj.Rental_Apply__r.Demo_purpose1__c}"/>
- <apex:outputField value="{!parentObj.Rental_Apply__r.Owner.Name}"/>
- <apex:outputField value="{!parentObj.Rental_Apply__r.demo_purpose2__c}"/>
- <apex:outputField value="{!parentObj.Rental_Apply__r.Salesdept__c}"/>
- <apex:outputField value="{!parentObj.Rental_Apply__r.Product_category__c}"/>
- <apex:outputField value="{!parentObj.Rental_Apply__r.WorkPlace__c}"/>
- <apex:outputField value="{!parentObj.Rental_Apply__r.Equipment_Type_F__c}"/>
- <apex:outputField value="{!parentObj.Rental_Apply__r.Internal_asset_location_F__c}" />
- <apex:outputText />
- <apex:outputField value="{!parentObj.Rental_Apply__r.Request_shipping_day__c}"/>
- <apex:outputField value="{!parentObj.Rental_Apply__r.Request_return_day__c}"/>
- <apex:outputField value="{!parentObj.Fixture_Set__r.Fixture_Set_Body_Model_No__c}"/>
- <apex:outputField value="{!parentObj.Irreplaceable_flag__c}"/>
- <apex:outputField value="{!parentObj.Fu_Shu_Pin_Fen_Pei_Jia__c}"/>
- <apex:outputText />
- <apex:outputField value="{!parentObj.Rental_Start_Date__c}"/>
- <apex:outputField value="{!parentObj.Rental_End_Date__c}"/>
-
- <apex:pageBlockSectionItem >
- <apex:outputPanel >
- <apex:outputText value="鍏抽敭瀛�" style="width:50px"/>
- <apex:inputText value="{!keyword}" style="width:200px;margin-left: 50px;"/>
- </apex:outputPanel>
- <apex:commandButton value="妫�绱�" action="{!searchOpp}" onclick="blockme();" rerender="allForm" oncomplete="unblockUI();" />
- </apex:pageBlockSectionItem>
- </apex:pageBlockSection>
- <table>
- <tr>
- <td width="20px"/>
- <!--20230426 zq <td width="200px"> -->
- <td width="220px">
- <apex:outputLabel for="bieCunFangDi" value="澶囧搧瀛樻斁鍦�" />
- <!-- <apex:outputText value="{!bieCunFangDi}"/> -->
- <apex:selectList value="{!bieCunFangDi}" size="1" style="margin-left: 20px; width:110px" id="bieCunFangDi">
- <apex:selectOptions value="{!bieCunFangDiOps}"/>
- <!-- #OLY_OCM-659 澶囧搧瀛樻斁鍦� 閫夐」鍙樺寲鏃讹紝鏈儴 閫夐」鍊奸殢涔嬪彂鐢熷彉鍖� -->
- <apex:actionSupport event="onchange" reRender="bieBenBu"/>
- </apex:selectList>
- </td>
- <td width="10px"></td>
- <!-- #OLY_OCM-654 鍥犱负MA鏈儴鍜屼骇鍝佸煿璁湰閮ㄨ繕鏄渶瑕佹绱㈡潯浠�,鎵�浠ラ渶瑕佸埆鏈儴鐨勬绱㈡潯浠� Start -->
- <td width="180px">
- <apex:outputLabel for="bieBenBu" value="鏈儴" />
- <apex:selectList value="{!bieBenBu}" size="1" style="margin-left: 20px; width:110px" id="bieBenBu">
- <apex:selectOptions value="{!bieBenBuOps}"/>
- </apex:selectList>
- </td>
- <!-- #OLY_OCM-654 鍥犱负MA鏈儴鍜屼骇鍝佸煿璁湰閮ㄨ繕鏄渶瑕佹绱㈡潯浠�,鎵�浠ラ渶瑕佸埆鏈儴鐨勬绱㈡潯浠� End -->
- </tr>
- </table>
- <apex:pageBlockButtons location="bottom">
- <apex:commandButton style="float:left;" action="{!save}" onclick="blockme();" value="淇濆瓨" rerender="allForm" oncomplete="unblockUI();" />
- <apex:commandButton style="float:right;" action="{!cancel}" value="杩斿洖" rerender="allForm"/>
- </apex:pageBlockButtons>
- <div style="clear:both;"></div>
-
- <apex:outputPanel id="message">
- <apex:pageMessages />
+<apex:page controller="AccessoryAddController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
+<head>
+<title>闄勫睘鍝佽拷鍔�</title>
+<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.AccessoryAddCss)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230624 ljh lightning -->
+<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
+<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
+<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
+
+<!-- 20230426 zq add style -->
+<style>
+ body .bPageBlock .detailList .labelCol {
+ width: auto;
+ }
+ body input.btn {
+ /* padding: 2px 3px; */
+ margin-left: 55px;
+ }
+ /* 20230602 ljh */
+ body .message{
+ margin: 0rem 0!important;
+ }
+ body .pbBottomButtons{
+ margin: 0rem 0rem 0;
+ width: 99%;
+ }
+</style>
+<script type="text/javascript">
+var heightAjustment = 120;
+var widthAjustment = 30;
+
+</script>
+</head>
+ <apex:form id="allForm">
+ <apex:outputPanel id="pageallPanel">
+ <apex:pageBlock id="searchBlock" tabStyle="Report">
+ <apex:pageBlockSection title="闄勫睘鍝佽拷鍔�">
+ <apex:outputField value="{!parentObj.Rental_Apply__r.Name}"/>
+ <apex:outputField value="{!parentObj.Rental_Apply__r.Demo_purpose1__c}"/>
+ <apex:outputField value="{!parentObj.Rental_Apply__r.Owner.Name}"/>
+ <apex:outputField value="{!parentObj.Rental_Apply__r.demo_purpose2__c}"/>
+ <apex:outputField value="{!parentObj.Rental_Apply__r.Salesdept__c}"/>
+ <apex:outputField value="{!parentObj.Rental_Apply__r.Product_category__c}"/>
+ <apex:outputField value="{!parentObj.Rental_Apply__r.WorkPlace__c}"/>
+ <apex:outputField value="{!parentObj.Rental_Apply__r.Equipment_Type_F__c}"/>
+ <apex:outputField value="{!parentObj.Rental_Apply__r.Internal_asset_location_F__c}" />
+ <apex:outputText />
+ <apex:outputField value="{!parentObj.Rental_Apply__r.Request_shipping_day__c}"/>
+ <apex:outputField value="{!parentObj.Rental_Apply__r.Request_return_day__c}"/>
+ <apex:outputField value="{!parentObj.Fixture_Set__r.Fixture_Set_Body_Model_No__c}"/>
+ <apex:outputField value="{!parentObj.Irreplaceable_flag__c}"/>
+ <apex:outputField value="{!parentObj.Fu_Shu_Pin_Fen_Pei_Jia__c}"/>
+ <apex:outputText />
+ <apex:outputField value="{!parentObj.Rental_Start_Date__c}"/>
+ <apex:outputField value="{!parentObj.Rental_End_Date__c}"/>
+ <!-- 20230602 ljh start -->
+ <!-- <apex:pageBlockSectionItem >
+ <apex:outputPanel >
+ <apex:outputText value="鍏抽敭瀛�" style="width:50px"/>
+ <apex:inputText value="{!keyword}" style="width:200px;margin-left: 50px;"/>
</apex:outputPanel>
- </apex:pageBlock>
- <c:RelationListPagingCmp id="cmpid" pgController="{!this}" hasCheckbox="true" isRadio="true" />
- </apex:outputPanel>
- </apex:form>
- </apex:page>
\ No newline at end of file
+ <apex:commandButton value="妫�绱�" action="{!searchOpp}" onclick="blockme();" rerender="allForm" oncomplete="unblockUI();" />
+ </apex:pageBlockSectionItem> -->
+ <!-- 20230602 ljh end -->
+ </apex:pageBlockSection>
+ <table>
+ <tr>
+ <td width="20px"/>
+ <!--20230426 zq <td width="200px"> -->
+ <td width="220px">
+ <apex:outputLabel for="bieCunFangDi" value="澶囧搧瀛樻斁鍦�" />
+ <!-- <apex:outputText value="{!bieCunFangDi}"/> -->
+ <apex:selectList value="{!bieCunFangDi}" size="1" style="margin-left: 20px; width:110px" id="bieCunFangDi">
+ <apex:selectOptions value="{!bieCunFangDiOps}"/>
+ <!-- #OLY_OCM-659 澶囧搧瀛樻斁鍦� 閫夐」鍙樺寲鏃讹紝鏈儴 閫夐」鍊奸殢涔嬪彂鐢熷彉鍖� -->
+ <apex:actionSupport event="onchange" reRender="bieBenBu"/>
+ </apex:selectList>
+ </td>
+ <td width="10px"></td>
+ <!-- #OLY_OCM-654 鍥犱负MA鏈儴鍜屼骇鍝佸煿璁湰閮ㄨ繕鏄渶瑕佹绱㈡潯浠�,鎵�浠ラ渶瑕佸埆鏈儴鐨勬绱㈡潯浠� Start -->
+ <td width="180px">
+ <apex:outputLabel for="bieBenBu" value="鏈儴" />
+ <apex:selectList value="{!bieBenBu}" size="1" style="margin-left: 20px; width:110px" id="bieBenBu">
+ <apex:selectOptions value="{!bieBenBuOps}"/>
+ </apex:selectList>
+ </td>
+ <!-- #OLY_OCM-654 鍥犱负MA鏈儴鍜屼骇鍝佸煿璁湰閮ㄨ繕鏄渶瑕佹绱㈡潯浠�,鎵�浠ラ渶瑕佸埆鏈儴鐨勬绱㈡潯浠� End -->
+ <!-- 20230602 ljh start -->
+ <td width="80px" align ="right">鍏抽敭瀛楋細</td>
+ <td width="200px" align ="left">
+ <apex:inputText value="{!keyword}" style="width:200px;"/>
+ </td>
+ <td width="180px"><apex:commandButton value="妫�绱�" action="{!searchOpp}" onclick="blockme();" rerender="allForm" oncomplete="unblockUI();" /></td>
+ <!-- 20230602 ljh start -->
+ </tr>
+ </table>
+ <!-- 20230602 ljh start -->
+ <!-- <apex:pageBlockButtons location="bottom">
+ <apex:commandButton style="float:left;" action="{!save}" onclick="blockme();" value="淇濆瓨" rerender="allForm" oncomplete="unblockUI();" />
+ <apex:commandButton style="float:right;" action="{!cancel}" value="杩斿洖" rerender="allForm"/>
+ </apex:pageBlockButtons>
+ <div style="clear:both;"></div>
+
+ <apex:outputPanel id="message">
+ <apex:pageMessages />
+ </apex:outputPanel> -->
+ <!-- 20230602 ljh end -->
+ </apex:pageBlock>
+ <!-- 20230602 ljh start -->
+ <apex:outputPanel id="message">
+ <apex:pageMessages />
+ </apex:outputPanel>
+ <apex:pageBlock>
+ <apex:pageBlockButtons location="bottom" style="margin:0;padding:0;">
+ <apex:commandButton style="float:left;" action="{!save}" onclick="blockme();" value="淇濆瓨" rerender="allForm" oncomplete="unblockUI();" />
+ <apex:commandButton style="float:right;" action="{!cancel}" value="杩斿洖" rerender="allForm"/>
+ </apex:pageBlockButtons>
+ <div style="clear:both;"></div>
+ </apex:pageBlock>
+ <!-- 20230602 ljh end -->
+ <c:RelationListPagingCmp id="cmpid" pgController="{!this}" hasCheckbox="true" isRadio="true" />
+ </apex:outputPanel>
+ </apex:form>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/AccessorySelect.page b/force-app/main/default/pages/AccessorySelect.page
index 9d0eff7..f210406 100644
--- a/force-app/main/default/pages/AccessorySelect.page
+++ b/force-app/main/default/pages/AccessorySelect.page
@@ -6,6 +6,7 @@
<title>闄勫睘鍝侀�夋嫨</title>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:stylesheet value="{!URLFOR($Resource.AccessorySelectCss)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230624 ljh lightning -->
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
diff --git a/force-app/main/default/pages/AccountTargetHospital.page b/force-app/main/default/pages/AccountTargetHospital.page
index 2ac9673..67b93ad 100644
--- a/force-app/main/default/pages/AccountTargetHospital.page
+++ b/force-app/main/default/pages/AccountTargetHospital.page
@@ -37,25 +37,25 @@
<!-- 骞村害姣庛伄銉囥兗銈裤倰琛ㄧず -->
<apex:tabPanel value="{!selectedTab}" tabClass="activeTab" inactiveTabClass="inactiveTab" rendered="{!IF(recordDeveloperName <> 'HP', true, false)}">
<apex:tab label="{!historyList[0].year_c}" name="{!historyList[0].rec.Id}" rendered="{!IF(historyCount > 0, true, false)}" >
- <iframe src="/apex/AccountTargetTab?id={!historyList[0].rec.Id}&accid={!recordId}" width="100%" height="450px;"></iframe>
+ <iframe src="/apex/AccountTargetTab?id={!historyList[0].rec.Id}&accid={!recordId}" width="100%" height="450px"></iframe>
</apex:tab>
<apex:tab label="{!historyList[1].year_c}" name="{!historyList[1].rec.Id}" rendered="{!IF(historyCount > 1, true, false)}">
- <iframe src="/apex/AccountTargetTab?id={!historyList[1].rec.Id}&accid={!recordId}" width="100%" height="450px;"></iframe>
+ <iframe src="/apex/AccountTargetTab?id={!historyList[1].rec.Id}&accid={!recordId}" width="100%" height="450px"></iframe>
</apex:tab>
<apex:tab label="{!historyList[2].year_c}" name="{!historyList[2].rec.Id}" rendered="{!IF(historyCount > 2, true, false)}">
- <iframe src="/apex/AccountTargetTab?id={!historyList[2].rec.Id}&accid={!recordId}" width="100%" height="450px;"></iframe>
+ <iframe src="/apex/AccountTargetTab?id={!historyList[2].rec.Id}&accid={!recordId}" width="100%" height="450px"></iframe>
</apex:tab>
<apex:tab label="{!historyList[3].year_c}" name="{!historyList[3].rec.Id}" rendered="{!IF(historyCount > 3, true, false)}">
- <iframe src="/apex/AccountTargetTab?id={!historyList[3].rec.Id}&accid={!recordId}" width="100%" height="450px;"></iframe>
+ <iframe src="/apex/AccountTargetTab?id={!historyList[3].rec.Id}&accid={!recordId}" width="100%" height="450px"></iframe>
</apex:tab>
<apex:tab label="{!historyList[4].year_c}" name="{!historyList[4].rec.Id}" rendered="{!IF(historyCount > 4, true, false)}">
- <iframe src="/apex/AccountTargetTab?id={!historyList[4].rec.Id}&accid={!recordId}" width="100%" height="450px;"></iframe>
+ <iframe src="/apex/AccountTargetTab?id={!historyList[4].rec.Id}&accid={!recordId}" width="100%" height="450px"></iframe>
</apex:tab>
<apex:tab label="{!historyList[5].year_c}" name="{!historyList[5].rec.Id}" rendered="{!IF(historyCount > 5, true, false)}">
- <iframe src="/apex/AccountTargetTab?id={!historyList[5].rec.Id}&accid={!recordId}" width="100%" height="450px;"></iframe>
+ <iframe src="/apex/AccountTargetTab?id={!historyList[5].rec.Id}&accid={!recordId}" width="100%" height="450px"></iframe>
</apex:tab>
<apex:tab label=" + " name="new">
- <iframe src="/apex/AccountTargetTab?id=&accid={!recordId}" width="100%" height="450px;"></iframe>
+ <iframe src="/apex/AccountTargetTab?id=&accid={!recordId}" width="100%" height="450px"></iframe>
</apex:tab>
</apex:tabPanel>
</apex:form>
diff --git a/force-app/main/default/pages/AccountTargetTab.page b/force-app/main/default/pages/AccountTargetTab.page
index 8fdd432..3e3369f 100644
--- a/force-app/main/default/pages/AccountTargetTab.page
+++ b/force-app/main/default/pages/AccountTargetTab.page
@@ -36,7 +36,7 @@
</script>
<apex:form id="Form">
- <div style="height: 265px; overflow-y: auto;">
+ <div style="height: 250px;overflow-y: scroll;">
<apex:pageMessages />
<apex:outputPanel layout="none" rendered="{!NOT(ISNULL(history))}">
diff --git a/force-app/main/default/pages/AgencyConfirmPage.page b/force-app/main/default/pages/AgencyConfirmPage.page
index 90e51c9..67dc710 100644
--- a/force-app/main/default/pages/AgencyConfirmPage.page
+++ b/force-app/main/default/pages/AgencyConfirmPage.page
@@ -1,5 +1,5 @@
<apex:page standardController="eSignForm__c" extensions="AgencyConfirmPageController" showHeader="false" sidebar="false"
- id="allPage" title="楠屾敹纭(缁忛攢鍟�)" action="{!init}" docType="html-5.0">
+ id="allPage" title="楠屾敹纭(缁忛攢鍟�)" action="{!init}" docType="html-5.0" lightningStylesheets = "true">
<apex:outputPanel id="reloadForm">
<script type="text/javascript">
function reload(){
diff --git a/force-app/main/default/pages/EquipmentRentalExtend.page b/force-app/main/default/pages/EquipmentRentalExtend.page
index 945edbd..cb846d6 100644
--- a/force-app/main/default/pages/EquipmentRentalExtend.page
+++ b/force-app/main/default/pages/EquipmentRentalExtend.page
@@ -1,7 +1,8 @@
-<apex:page standardController="Rental_Apply__c" extensions="EquipmentRentalExtendController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
+<apex:page standardController="Rental_Apply__c" extensions="EquipmentRentalExtendController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true" title="鏌ヨ鍊熷嚭涓鍝�">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230525 ljh lightning -->
<style>
.dateFormat {
display: none;
@@ -45,6 +46,7 @@
word-break: break-all;
word-wrap: break-word;
}
+ /* 20230703 ljh 棰滆壊涓嶉偅涔堥珮浜� */
div#in_Div_L td.tdRed {
background-color:red;
}
@@ -57,6 +59,7 @@
div#in_Div_L td.tdBlue {
background-color:Cyan;
}
+ /* 20230703 ljh 棰滆壊涓嶉偅涔堥珮浜� */
div#in_Div_L td.tdNormal {
background-color:none;
}
@@ -81,6 +84,15 @@
div#in_Div_R td.tdNormal {
background-color:none;
}
+ div#in_Div_L td.dataCellBorder1{
+ border-bottom: 1px solid rgb(201, 201, 201);
+ }
+ div#in_Div_R td.dataCellBorder1{
+ border-bottom: 1px solid rgb(201, 201, 201);
+ }
+
+ #in_Div_L table tr:nth-child(2n){background-color:#f2f2f2;}
+ #in_Div_R table tr:nth-child(2n){background-color:#f2f2f2;}
</style>
<script>
function searchJs() {
@@ -296,13 +308,15 @@
</apex:actionFunction>
<apex:inputHidden value="{!returnIMFupdate}" id="returnIMFupdate" />
<apex:pageBlock id="searchBlock" title="妫�绱�">
- <apex:pageBlockButtons location="top">
+ <!-- 20230616 ljh start-->
+ <!-- <apex:pageBlockButtons location="top">
<table>
<tr>
- <td align="right" style="padding-left: 1000px"><input type="button" value="鍏抽棴" onclick="closePage()" style="width:70px;"/></td>
+ <td align="right" style="padding-left: 1000px"><input type="button" class="btn" value="鍏抽棴" onclick="closePage()" style="width:70px;"/></td>
</tr>
</table>
- </apex:pageBlockButtons>
+ </apex:pageBlockButtons> -->
+ <!-- 20230616 ljh end-->
<table style='width:1150px;'>
<tr style="height:55px">
<td style="width:85px" align="right">閫夋嫨鏉′欢</td>
@@ -311,10 +325,10 @@
<td style="width:95px" align="left"><apex:inputText value="{!val1}" id="val1" style="width:100px;"/></td>
<td style="width:85px" align="right">鎵�鏈夎��</td>
<td style="width:120px" align="left"><apex:inputText value="{!ownerSearch}" style="width:100px;" /></td>
- <td style="width:135px" align="center"><input type="button" value="鍊熷嚭涓叏閮�" onclick="searchsp1Js();" style="width:130px"/></td>
- <td style="width:135px" align="center"><input type="button" value="瓒呰繃涓�" onclick="searchsp2Js();" style="width:130px"/></td>
- <td style="width:135px" align="center"><input type="button" value="1鍛ㄤ互鍐呭洖鏀堕瀹�" onclick="searchsp3Js();" style="width:130px"/></td>
- <td style="width:135px" align="center"><input type="button" value="鍏ㄩ儴" onclick="searchsp4Js();" style="width:130px"/></td>
+ <td style="width:135px" align="center"><input class="btn" type="button" value="鍊熷嚭涓叏閮�" onclick="searchsp1Js();" style="width:130px"/></td>
+ <td style="width:135px" align="center"><input class="btn" type="button" value="瓒呰繃涓�" onclick="searchsp2Js();" style="width:130px"/></td>
+ <td style="width:135px" align="center"><input class="btn" type="button" value="1鍛ㄤ互鍐呭洖鏀堕瀹�" onclick="searchsp3Js();" style="width:130px"/></td>
+ <td style="width:135px" align="center"><input class="btn" type="button" value="鍏ㄩ儴" onclick="searchsp4Js();" style="width:130px"/></td>
</tr>
<tr>
<td align="right" colspan="2">{!$ObjectType.Rental_Apply__c.fields.Demo_purpose1__c.label} <apex:inputField value="{!searchCondition.Demo_purpose1__c}"/></td>
@@ -324,7 +338,7 @@
锝�
<apex:inputField style="width:115px" value="{!finalDayTo.Birth_Date__c}"/>
</td>
- <td align="center"><input type="button" value="妫�绱�" onclick="searchJs();" style="width:130px;font-weight:bold"/></td>
+ <td align="center"><input type="button" class="btn" value="妫�绱�" onclick="searchJs();" style="width:130px;"/></td>
<td></td>
<td></td>
<!-- 20210628 ljh update SFDC-C4BBFH -->
@@ -335,7 +349,7 @@
<apex:pageBlock id="dataBlock" title="缁撴灉">
<apex:pageBlockButtons location="top" id="pageBlockButton1">
- <input type="button" value="淇濆瓨" onclick="saveJs();" style="width:80px;background-color:red;height:22px;margin-right: 20px;margin-top: 5px;"/>
+ <input type="button" class="btn" value="淇濆瓨" onclick="saveJs();" style="width:80px;background-color:#08107b;height:32px;margin-right: 20px;margin-top: 5px;color: white;text-align: center; line-height: 32px;"/>
<!-- 鍒嗛〉鐢� SWAG-B9UBDP start -->
<table align="right" style="width: 700px;">
<tr>
@@ -385,7 +399,8 @@
<td style="width:100px" align="left"><input type="button" value="淇濆瓨" onclick="saveJs();" style="width:80px;background-color: red"/></td>
</tr>
</table> -->
- <table id="msgtable">
+ <!-- 20230616 ljh-->
+ <!-- <table id="msgtable">
<tr>
<td>
<apex:outputPanel id="message">
@@ -393,7 +408,11 @@
</apex:outputPanel>
</td>
</tr>
- </table>
+ </table> -->
+ <apex:outputPanel id="message">
+ <apex:pageMessages />
+ </apex:outputPanel>
+ <!-- 20230616 ljh-->
<div id="out_Div_L">
<table class="list" border="1" style="border-collapse: collapse;table-layout:fixed;border-bottom-width: 0px;border-spacing:0;width:915px;">
<tr style="background-color:#DCDCDC;height: 50px;" class="headerRow">
diff --git a/force-app/main/default/pages/FollowPage.page b/force-app/main/default/pages/FollowPage.page
index 49c3962..2dce296 100644
--- a/force-app/main/default/pages/FollowPage.page
+++ b/force-app/main/default/pages/FollowPage.page
@@ -1,4 +1,4 @@
-<apex:page controller="StatusPageController" showHeader="false" id="allPage" sidebar="false" action="{!init}" docType="html-5.0">
+<apex:page controller="StatusPageController" showHeader="false" id="allPage" sidebar="false" action="{!init}" docType="html-5.0" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
diff --git a/force-app/main/default/pages/HPConfirmPage.page b/force-app/main/default/pages/HPConfirmPage.page
index 93558f6..656d175 100644
--- a/force-app/main/default/pages/HPConfirmPage.page
+++ b/force-app/main/default/pages/HPConfirmPage.page
@@ -1,5 +1,5 @@
<apex:page standardController="eSignForm__c" extensions="HpConfirmPageController" showHeader="false" sidebar="false"
- id="allPage" title="楠屾敹纭(鍖婚櫌)" action="{!init}" docType="html-5.0">
+ id="allPage" title="楠屾敹纭(鍖婚櫌)" action="{!init}" docType="html-5.0" lightningStylesheets = "true">
<apex:outputPanel id="reloadForm">
<script type="text/javascript">
function reload(){
diff --git a/force-app/main/default/pages/HpDirectSalesConfirmPage.page b/force-app/main/default/pages/HpDirectSalesConfirmPage.page
index 461419e..84490a0 100644
--- a/force-app/main/default/pages/HpDirectSalesConfirmPage.page
+++ b/force-app/main/default/pages/HpDirectSalesConfirmPage.page
@@ -1,5 +1,5 @@
<apex:page standardController="eSignForm__c" extensions="HpConfirmPageController" showHeader="false" sidebar="false"
- id="allPage" title="楠屾敹纭(鍖婚櫌)" action="{!init}" docType="html-5.0">
+ id="allPage" title="楠屾敹纭(鍖婚櫌)" action="{!init}" docType="html-5.0" lightningStylesheets = "true">
<apex:outputPanel id="reloadForm">
<script type="text/javascript">
function reload(){
diff --git a/force-app/main/default/pages/MainFixtureSelect.page b/force-app/main/default/pages/MainFixtureSelect.page
index e36c21e..9598fcd 100644
--- a/force-app/main/default/pages/MainFixtureSelect.page
+++ b/force-app/main/default/pages/MainFixtureSelect.page
@@ -1,8 +1,11 @@
-<apex:page controller="MainFixtureSelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
+<!-- 20230529 ljh lightning -->
+<!-- <apex:page controller="MainFixtureSelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}"> -->
+<apex:page controller="MainFixtureSelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
<head>
<title>涓讳綋澶囧搧閫夋嫨</title>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:stylesheet value="{!URLFOR($Resource.MainFixtureSelectCss)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning -->
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
@@ -18,22 +21,23 @@
box-sizing: border-box;
}
.nav {
- width: 180px;
- line-height: 20px;
- border: 1px solid #000;
+ width: 170px;/*20230606 ljh*/
+ line-height: 30px;/*20230606 ljh*/
+ /* border: 1px solid #000; *//*20230610 ljh lightning*/
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
position: absolute;
- top: 0;
+ top: -15px;/*20230606 ljh*/
right: 0;
left: 0;
margin: 0;
z-index: 9999;
display: inline-block;
background-color: white;
- /*display: none;*/
+ border-radius: 0.25rem;/*20230607 ljh lightning*/
+ border: 1px solid rgb(201, 201, 201);/*20230610 ljh lightning*/
}
ul,
li {
@@ -65,42 +69,6 @@
overflow: hidden;
text-overflow: ellipsis;
}
- .nav_close {
- position: fixed;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
- z-index: 9990;
- display: none;
- }
- .nav_close_a {
- position: fixed;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
- z-index: 9999;
- display: none;
- background-color: red;
- }
- /*浠ヤ笅鏄笅鎷夊閫夋鐨勬牱寮� end*/
- /*.transparent_class {
- filter:alpha(opacity=50);
- -moz-opacity:0.5;
- -khtml-opacity: 0.5;
- opacity: 0.5;
- }
- .checks_div_select {
- width: 150px;
- background-color: #e9fbfb;
- border: 1px solid #18cbcd;
- font-family: 'Verdana', '瀹嬩綋';
- font-size: 12px;
- position:absolute;
- left:2px;
- top:25px;
- } */
</style>
<script type="text/javascript">
@@ -182,8 +150,10 @@
hint +=optioncheck[i].innerText;
}
}
- // console.log(hint);
- j$(escapeVfId('allPage:allForm:searchBlock:mainSection:ApplyBB:bieBenBu')).val(hint);
+ console.log(hint);
+ // j$(escapeVfId('allPage:allForm:searchBlock:mainSection:ApplyBB:bieBenBu')).val(hint);
+ j$(escapeVfId('allPage:allForm:searchBlock:bieBenBu')).val(hint);
+
}
function navClose(){
j$("#selectCheckId").toggle();
@@ -213,7 +183,8 @@
hint +=optioncheck[i].innerText;
}
}
- j$(escapeVfId('allPage:allForm:searchBlock:mainSection:ApplyAA:bieBeiPinFenLei')).val(hint);
+ // j$(escapeVfId('allPage:allForm:searchBlock:mainSection:ApplyAA:bieBeiPinFenLei')).val(hint);
+ j$(escapeVfId('allPage:allForm:searchBlock:bieBeiPinFenLei')).val(hint);
}
function navClose_a(){
j$("#selectCheckId_a").toggle();
@@ -248,7 +219,6 @@
<apex:outputPanel id="pageallPanel">
<apex:pageBlock id="searchBlock" tabStyle="Report">
-
<apex:pageBlockSection title="涓讳綋澶囧搧閫夋嫨" id="mainSection">
<apex:outputField value="{!parentObj.Rental_Apply__r.Name}"/>
<apex:outputField value="{!parentObj.Rental_Apply__r.Demo_purpose1__c}"/>
@@ -266,8 +236,8 @@
<apex:outputField value="{!parentObj.Rental_End_Date__c}"/>
<apex:outputField value="{!parentObj.Fu_Shu_Pin_Fen_Pei_Jia__c}"/>
<apex:outputField value="{!parentObj.Rental_Start_Date__c}"/>
-
- <apex:pageBlockSectionItem >
+ <!-- 20230605 ljh lightning start -->
+ <!-- <apex:pageBlockSectionItem >
<apex:outputLabel for="salesd" style="font-weight: bold; font-family: Arial,Helvetica,sans-serif; font-size: 91%;color: #4a4a56;" value="澶囧搧瀛樻斁鍦�" />
<apex:selectList value="{!bieCunFangDi}" onchange="blockme(); changebenbu(); reloadBenBu(this);return false" size="1" style="margin-left: 0px; width:110px" id="bieCunFangDi">
<apex:selectOptions value="{!bieCunFangDiOps}"/>
@@ -378,20 +348,146 @@
}
</script>
</apex:outputPanel>
- </apex:pageBlockSectionItem>
- </apex:pageBlockSection>
+ </apex:pageBlockSectionItem>-->
+ </apex:pageBlockSection>
+
- <table>
- <tr/><tr/><tr/><tr/><tr/><tr/><tr/><tr/>
+ <table style="width:100%;margin:10px 0;">
+ <!-- <tr/><tr/><tr/><tr/><tr/><tr/><tr/><tr/>
<tr>
<td width="50px">鍏抽敭瀛�</td>
<td><apex:inputText value="{!keyword}" style="width:200px"/></td>
<td width="20px"/>
<td><apex:commandButton value="妞滅储" onclick=" searchOppJs(); return false;"/></td>
</tr>
- <tr/><tr/><tr/><tr/><tr/><tr/>
- </table>
+ <tr/><tr/><tr/><tr/><tr/><tr/> -->
+ <colgroup>
+ <col width="6%" />
+ <col width="12%" />
+ <col width="12%" />
+ <col width="6%" />
+ <col width="6%"/>
+ <col width="12%"/>
+ <col width="6%"/>
+ <col width="12%"/>
+ <col width="6%"/>
+ <col width="12%"/>
+ <col width="10%"/>
+ </colgroup>
+ <tr>
+ <td align="right" style="padding-right:5px;" >澶囧搧瀛樻斁鍦�</td>
+ <td align="left">
+ <apex:selectList value="{!bieCunFangDi}" onchange="blockme(); changebenbu(); reloadBenBu(this);return false" size="1" style="margin-left: 0px; width:110px" id="bieCunFangDi">
+ <apex:selectOptions value="{!bieCunFangDiOps}"/>
+ </apex:selectList>
+ </td>
+ <td align="right" style="padding-right:5px;">浜у搧鍒嗙被(GI/SP)</td>
+ <td align="left">
+ <apex:selectList value="{!bieChanPinFenLei}" size="1" style="margin-left: 0px; width:60px" id="bieChanPinFenLei">
+ <apex:selectOptions value="{!bieChanPinFenLeiOps}"/>
+ </apex:selectList>
+ </td>
+ <td align="right" style="padding-right:5px;" >鏈儴</td>
+ <td align="left">
+ <apex:outputPanel style="position: absolute;" id="S_bieBenBuApply">
+ <apex:inputHidden id="bieBenBu" value="{!bieBenBu}" />
+ <ul class="nav" id="nav" style="left:0px;">
+ <li id="classification" class="transparent_class" style="margin-left:0px;height:30px;" onclick="navClose();return false;">
+ <span id="initial">--鏃�--</span>
+ </li>
+ <li id="selectCheckId" style="margin-left:0px;display: none;">
+ <ul style="background-color: #FFFFFF;margin-left: 0;">
+ <apex:repeat value="{!bieBenBuOps}" var="orr" id="selSDBB">
+ <li class="sdclass" style="margin-left:0px">
+ <p class="ul-nav" name="cate_id[]" >
+ <input type="checkbox" value="{!orr.label}" class="li-input" onclick="selectBenBu(this,'{!orr.label}');" style="display: inline-block;vertical-align: middle;" />
+ <font style="">{!orr.label}</font>
+ </p>
+ </li>
+ </apex:repeat>
+ </ul>
+ </li>
+ </ul>
+ <script>
+ initShowBenbu();
+ function initShowBenbu() {
+ var bieBenBuTemp = '{!bieBenBu}';
+ if (bieBenBuTemp != null && bieBenBuTemp != undefined && bieBenBuTemp != "") {
+ j$("#classification").children("#initial").remove();
+ var bieBenBuList = bieBenBuTemp.split(',');
+ for(var i=0; i< bieBenBuList.length; i++) {
+ var idTemp = bieBenBuList[i].trim();
+ idTemp = 'Id'+idTemp.split('.')[0];
+ j$("#classification").append("<span class='valClass' id='" + (idTemp) + "'>" + (bieBenBuList[i].trim() + ",") + "</span>");
+ }
+ var inputObj = j$(".li-input");
+ if(inputObj != null){
+ for(var i = 0; i < inputObj.length;i++){
+ if(bieBenBuTemp.includes(inputObj[i].value)){
+ inputObj[i].checked = true;
+ }
+ }
+ }
+ }
+ }
+ </script>
+ </apex:outputPanel>
+ </td>
+ <td align="right" style="padding-right:5px;" >澶囧搧鍒嗙被</td>
+ <td align="left" >
+ <apex:outputPanel style="position: absolute;" id="S_AgencyApply">
+ <apex:inputHidden id="bieBeiPinFenLei" value="{!bieBeiPinFenLei}" />
+ <ul class="nav" id="nav_a" style="left:0px;">
+ <li id="classification_a" class="transparent_class" style="margin-left:0px;height:30px;" onclick="navClose_a();return false;">
+ <span id="initial_a">--鏃�--</span>
+ </li>
+ <li id="selectCheckId_a" style="margin-left:0px;display: none;">
+ <ul style="background-color: #FFFFFF;margin-left: 0;">
+ <apex:repeat value="{!bieBeiPinFenLeiOps}" var="orr" id="selSD">
+ <li class="sdclass" style="margin-left:0px">
+ <p class="ul-nav" name="cate_id[]" >
+ <input type="checkbox" value="{!orr.label}" class="li-input_a" onclick="selectAgency(this,'{!orr.label}');" style="display: inline-block;vertical-align: middle;" />
+ <font style="">{!orr.label}</font>
+ </p>
+ </li>
+ </apex:repeat>
+ </ul>
+ </li>
+ </ul>
+
+ <script>
+ initShowFenlei();
+ function initShowFenlei() {
+ var bieBeiPinFenLeiTemp = '{!bieBeiPinFenLei}';
+ if (bieBeiPinFenLeiTemp != null && bieBeiPinFenLeiTemp != undefined && bieBeiPinFenLeiTemp != "") {
+ j$("#classification_a").children("#initial_a").remove();
+ var bieBeiPinFenLeiList = bieBeiPinFenLeiTemp.split(',');
+ for(var i=0; i< bieBeiPinFenLeiList.length; i++) {
+ var idTemp = bieBeiPinFenLeiList[i].trim();
+ idTemp = 'Id'+idTemp.split('.')[0];
+ j$("#classification_a").append("<span class='valClass_a' id='" + (idTemp) + "'>" + (bieBeiPinFenLeiList[i].trim() + ",") + "</span>");
+ }
+
+ var inputObj = j$(".li-input_a");
+ if(inputObj != null){
+ for(var i = 0; i < inputObj.length;i++){
+ if(bieBeiPinFenLeiTemp.includes(inputObj[i].value)){
+ inputObj[i].checked = true;
+ }
+ }
+ }
+ }
+ }
+ </script>
+ </apex:outputPanel>
+ </td>
+ <td align="right" style="padding-right:5px;">鍏抽敭瀛�</td>
+ <td align="left" ><apex:inputText value="{!keyword}"/></td>
+ <td style="padding-left:20px;"><apex:commandButton value="妞滅储" onclick=" searchOppJs(); return false;"/></td>
+ </tr>
+ </table>
+ <!-- 20230605 ljh lightning end -->
<table style="width:100%">
<tr>
<td style="width:40%">
@@ -425,6 +521,7 @@
<apex:outputPanel id="message">
<apex:pageMessages />
</apex:outputPanel>
+
</apex:pageBlock>
<c:RelationListPagingCmp id="cmpid" pgController="{!this}" hasCheckbox="true" isRadio="true"/>
</apex:outputPanel>
diff --git a/force-app/main/default/pages/RentalApplyExtensions.page b/force-app/main/default/pages/RentalApplyExtensions.page
index 601b255..bc2787f 100644
--- a/force-app/main/default/pages/RentalApplyExtensions.page
+++ b/force-app/main/default/pages/RentalApplyExtensions.page
@@ -6,6 +6,24 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
+ <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning -->
+ <!-- 20230614 ljh lightning start -->
+ <style type="text/css">
+ table.list .col_Name {width:150px;}
+ table.list .col_First_RAESD_Model_No_F__c {width:100px;}
+ table.list .col_Set_Managment_Code__c {width:90px;}
+ table.list .col_SerialNumber_F__c {width:80px;}
+ table.list .col_Loaner_Set_No__c {width:90px;}
+ table.list .col_RAES_Status__c {width:90px;}
+ body .pbSubsection{
+ padding-bottom: 0;
+ padding-top: 0;
+ }
+ body .pbSubsection > .detailList:first-child{
+ margin-top: 0;
+ }
+ </style>
+ <!-- 20230614 ljh lightning end -->
</head>
<apex:form id="allForm">
<apex:outputPanel id="message">
diff --git a/force-app/main/default/pages/RentalApplyList.page b/force-app/main/default/pages/RentalApplyList.page
new file mode 100644
index 0000000..2677b27
--- /dev/null
+++ b/force-app/main/default/pages/RentalApplyList.page
@@ -0,0 +1,52 @@
+<apex:page showHeader="true" sidebar="true" lightningStylesheets="true">
+ <head>
+ <title></title>
+ <style>
+ ul li {
+ list-style: none;
+ /* line-height: 25px; */
+ /* text-align: center; */
+ }
+ a{
+ text-decoration:none;
+ /* font-size: 20px; */
+ }
+ </style>
+ </head>
+<!-- Begin Default Content REMOVE THIS -->
+<ul style="margin : 0 auto;">
+ <li><a href="#" onclick="javascript:window.open('/apex/WebToEquipmentSetShippmentReceived','','height=500, width=1000, top=100, left=100, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">Loaner_ship_return_manage</a></li>
+ <hr />
+ <li><a href="#" onclick="javascript:window.open('/apex/ReceivingNoteQRScan','','height=500, width=500, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">ReceivingNoteQRScan</a></li>
+ <hr />
+ <li><a href="/apex/EquipmentRentalExtend" target="_blank">鏌ヨ鍊熷嚭涓鍝�</a></li>
+ <hr />
+ <li><a href="/apex/RentalApplySequence" target="_blank" >澶囧搧鎺掗槦鏌ョ湅</a></li>
+ <hr />
+ <li><a href="#" onclick="javascript:window.open('/apex/WebToEquipmentSetShippmentReceived','','height=500, width=500, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">Loaner_ship_return_manage</a></li>
+ <hr />
+ <li><a href="#" onclick="javascript:window.open('/apex/WebToEquipmentSetShippmentReceived','','height=500, width=500, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">Loaner_ship_return_manage</a></li>
+ <hr />
+ <li><a href="#" onclick="javascript:window.open('/apex/WebToEquipmentSetShippmentReceived','','height=500, width=500, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">Loaner_ship_return_manage</a></li>
+ <hr />
+ <li><a href="#" onclick="javascript:window.open('/apex/WebToEquipmentSetShippmentReceived','','height=500, width=500, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">Loaner_ship_return_manage</a></li>
+ <hr />
+ <li><a href="#" onclick="javascript:window.open('/apex/WebToEquipmentSetShippmentReceived','','height=500, width=500, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">Loaner_ship_return_manage</a></li>
+ <hr />
+ <li><a href="#" onclick="javascript:window.open('/apex/WebToEquipmentSetShippmentReceived','','height=500, width=500, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">Loaner_ship_return_manage</a></li>
+ <hr />
+ <li><a href="#" onclick="javascript:window.open('/apex/WebToEquipmentSetShippmentReceived','','height=500, width=500, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">Loaner_ship_return_manage</a></li>
+ <hr />
+ <li><a href="#" onclick="javascript:window.open('/apex/WebToEquipmentSetShippmentReceived','','height=500, width=500, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">Loaner_ship_return_manage</a></li>
+ <hr />
+ <li><a href="#" onclick="javascript:window.open('/apex/WebToEquipmentSetShippmentReceived','','height=500, width=500, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">Loaner_ship_return_manage</a></li>
+ <hr />
+ <li><a href="#" onclick="javascript:window.open('/apex/WebToEquipmentSetShippmentReceived','','height=500, width=500, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">Loaner_ship_return_manage</a></li>
+ <hr />
+ <li><a href="#" onclick="javascript:window.open('/apex/WebToEquipmentSetShippmentReceived','','height=500, width=500, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">Loaner_ship_return_manage</a></li>
+ <hr />
+ <li><a href="#" onclick="javascript:window.open('/apex/WebToEquipmentSetShippmentReceived','','height=500, width=500, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">Loaner_ship_return_manage</a></li>
+<!-- <li>window.open('/apex/WebToEquipmentSetShippmentReceived','','height=700, width=1000, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')</li> -->
+</ul>
+<!-- End Default Content REMOVE THIS -->
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/RentalApplyList.page-meta.xml b/force-app/main/default/pages/RentalApplyList.page-meta.xml
new file mode 100644
index 0000000..cb4df76
--- /dev/null
+++ b/force-app/main/default/pages/RentalApplyList.page-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>56.0</apiVersion>
+ <availableInTouch>true</availableInTouch>
+ <confirmationTokenRequired>false</confirmationTokenRequired>
+ <label>RentalApplyList</label>
+</ApexPage>
diff --git a/force-app/main/default/pages/RentalApplyMultiPostpone.page b/force-app/main/default/pages/RentalApplyMultiPostpone.page
index 265f4b5..11a026d 100644
--- a/force-app/main/default/pages/RentalApplyMultiPostpone.page
+++ b/force-app/main/default/pages/RentalApplyMultiPostpone.page
@@ -1,8 +1,11 @@
-<apex:page controller="RentalApplyMultiPostponeController" action="{!init}" showHeader="false" sidebar="true" id="allPage" title="鎵归噺寤舵湡">
+<!-- 20230619 ljh -->
+<!-- <apex:page controller="RentalApplyMultiPostponeController" action="{!init}" showHeader="false" sidebar="true" id="allPage" title="鎵归噺寤舵湡"> -->
+<apex:page controller="RentalApplyMultiPostponeController" action="{!init}" showHeader="false" sidebar="true" id="allPage" title="鎵归噺寤舵湡" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
+ <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning -->
<script type="text/javascript">
//onload 鐨勬柟娉�
window.onload = function(){
@@ -61,7 +64,10 @@
<!-- 杩斿洖鐖堕〉闈� -->
<apex:actionFunction name="senBackPage" action="{!senBackPage}" rerender="true" onComplete="unblockUI();"></apex:actionFunction>
<apex:pageBlock id="searchBlock" tabStyle="Report">
- <table style="border-bottom-width: 0px; font-size:12px;width:100%;margin-left: 40%;">
+ <!-- 20230619 ljh start-->
+ <!-- <table style="border-bottom-width: 0px; font-size:12px;width:100%;margin-left: 40%;"> -->
+ <table style="border-bottom-width: 0px; font-size:12px;margin-left: 40%;">
+ <!-- 20230619 ljh end-->
<tr>
<td style="width: 20%">
<apex:commandButton onclick="searchBtnJs();return false;" rendered="true" value="涓嬩竴姝�" style="width:70px;"/>
diff --git a/force-app/main/default/pages/RentalApplySequence.page b/force-app/main/default/pages/RentalApplySequence.page
index 3c12041..699fdfa 100644
--- a/force-app/main/default/pages/RentalApplySequence.page
+++ b/force-app/main/default/pages/RentalApplySequence.page
@@ -1,12 +1,17 @@
+<!--
+ * @Description: 澶囧搧鎺掗槦灞曠ず鍖呭惈闃熷垪淇℃伅鍜屽簭鍒椾俊鎭�
+ * @Author: [lijinhuan]
+ * @Date: 2021-10-26 14:15:03
+ * @LastEditors: [lijinhuan]
+ * @LastEditTime: 2023-06-06 13:04:33
+-->
<!-- 20230522 ljh lightning -->
<!-- <apex:page controller="RentalApplySequenceController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="鎺掗槦鏌ョ湅"> -->
<apex:page controller="RentalApplySequenceController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="鎺掗槦鏌ョ湅" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
-<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
-<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
-<apex:stylesheet value="{!URLFOR($Resource.listTable)}"/><!-- 20230525 ljh lightning -->
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230525 ljh lightning -->
<style type="text/css">
.hideDropdown select{
display: none
@@ -21,9 +26,9 @@
box-sizing: border-box;
}
.nav {
- width: 160px;
- line-height: 20px;
- border: 1px solid #000;
+ width: 180px;/*20230606 ljh*/
+ line-height: 30px;/*20230606 ljh*/
+ /* border: 1px solid #000; *//*20230610 ljh*/
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
@@ -35,7 +40,8 @@
margin: 0;
z-index: 9999;
display: inline-block;
- /*display: none;*/
+ border-radius: 0.25rem;/*20230607 ljh*/
+ border: 1px solid rgb(201, 201, 201);/*20230610 ljh lightning*/
}
ul,
li {
@@ -66,32 +72,6 @@
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
- }
- .nav_close {
- position: fixed;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
- z-index: 9990;
- display: none;
- }
- .nav_close_a {
- position: fixed;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
- z-index: 9999;
- display: none;
- background-color: red;
- }
- /*浠ヤ笅鏄笅鎷夊閫夋鐨勬牱寮� end*/
- .transparent_class {
- /*filter:alpha(opacity=50);
- -moz-opacity:0.5;
- -khtml-opacity: 0.5;
- opacity: 0.5;*/
}
</style>
<script>
@@ -226,8 +206,7 @@
</apex:actionFunction>
<apex:inputHidden id="checkEventId" value="{!checkEventId}" />
<apex:pageBlock id="searchBlock" title="鏌ョ湅鎺掗槦鎯呭喌">
- <!-- 20230523 ljh lightning start -->
- <!-- <apex:pageBlockSection title="妫�绱�" id="mainSection" columns="4" >
+ <apex:pageBlockSection title="妫�绱�" id="mainSection" columns="4" >
<apex:pageBlockSectionItem >
<apex:outputLabel value="鐢宠鍗曞彿" />
<apex:inputText id="S_raName" value="{!S_raName}"/>
@@ -254,14 +233,14 @@
<apex:pageBlockSectionItem rendered="{!!isEquipmentCenter}"></apex:pageBlockSectionItem>
<apex:pageBlockSectionItem id="ApplyBB">
<apex:outputLabel for="S_bieBenBuApply" value="鐢宠浜烘墍灞炴湰閮�" />
- <apex:outputPanel style="position: relative; " id="S_bieBenBuApply">
+ <apex:outputPanel style="position: absolute; " id="S_bieBenBuApply">
<apex:inputHidden id="S_ApplyBenBu" value="{!S_ApplyBenBu}" />
<ul class="nav" id="nav" style="background-color: #FFFFFF;left:0px;">
- <li id="classification" class="transparent_class" style="margin-left:0px;height:20px;" onclick="navClose();return false;">
+ <li id="classification" class="transparent_class" style="margin-left:0px;height:30px;" onclick="navClose();return false;">
<span id="initial">--鏃�--</span>
</li>
<li id="selectCheckId" style="margin-left:0px;display: none;">
- <ul>
+ <ul style="margin-left:0px;">
<apex:repeat value="{!SApplyBenBu}" var="orr" id="selSD">
<li class="sdclass" style="margin-left:0px">
<p class="ul-nav" name="cate_id[]" >
@@ -273,19 +252,18 @@
</ul>
</li>
</ul>
- <div class="nav_close"></div>
</apex:outputPanel>
</apex:pageBlockSectionItem>
<apex:pageBlockSectionItem id="ApplyAA" >
<apex:outputLabel for="S_AgencyApply" value="鐢宠鑰呭姙浜嬪" />
- <apex:outputPanel style="position: relative; " id="S_AgencyApply">
+ <apex:outputPanel style="position: absolute; " id="S_AgencyApply">
<apex:inputHidden id="S_Agency" value="{!S_Agency}" />
<ul class="nav" id="nav_a" style="background-color: #FFFFFF;left:0px;">
- <li id="classification_a" class="transparent_class" style="margin-left:0px;height:20px;" onclick="navClose_a();return false;">
+ <li id="classification_a" class="transparent_class" style="margin-left:0px;height:30px;" onclick="navClose_a();return false;">
<span id="initial_a">--鏃�--</span>
</li>
<li id="selectCheckId_a" style="margin-left:0px;display: none;">
- <ul>
+ <ul style="margin-left:0px;">
<apex:repeat value="{!SApplyAgency}" var="orr" id="selSD">
<li class="sdclass" style="margin-left:0px">
<p class="ul-nav" name="cate_id[]" >
@@ -315,98 +293,9 @@
<apex:pageBlockSectionItem >
<apex:commandButton style="" value="妫�绱�" onclick="searchJs(); return false;"/>
</apex:pageBlockSectionItem>
- </apex:pageBlockSection> -->
- <div class="pbSubheader brandTertiaryBgr first tertiaryPalette" >
- <h3>妫�绱�</h3>
- </div>
- <table style="width:100%;margin:10px 0;" >
- <tr style="height:40px;">
- <td>鐢宠鍗曞彿</td>
- <td><apex:inputText id="S_raName" value="{!S_raName}"/></td>
- <td>鍨嬪彿</td>
- <td><apex:inputText id="S_Fixture_Model_No" value="{!S_Fixture_Model_No}"/></td>
- <td>澶囧搧鍑哄�熸媴褰�</td>
- <td>
- <apex:inputField id="S_Person_In_Charge" value="{!S_Ra_Person.Person_In_Charge__c}" styleClass="hideDropdown" />
- </td>
- <td>闃熷垪鎵�鍦ㄥ湴鍖烘湰閮�</td>
- <td><apex:inputText id="S_bieBenBu" value="{!S_bieBenBu}"/></td>
- </tr>
- <tr style="height:40px;">
- <td>澶囧搧瀛樻斁鍦�</td>
- <td>
- <apex:selectList value="{!S_bieCunFangDi}" onchange="blockme(); changeCunfangdi();selectCunFangDiJs(this);return false;" size="1" style="width:160px" id="S_bieCunFangDi">
- <apex:selectOptions value="{!bieCunFangDiOps}"/>
- </apex:selectList>
- </td>
- <td>鐢宠浜烘墍灞炴湰閮�</td>
- <td>
- <apex:outputPanel style="position: relative; " id="S_bieBenBuApply">
- <apex:inputHidden id="S_ApplyBenBu" value="{!S_ApplyBenBu}" />
- <ul class="nav" id="nav" style="background-color: #FFFFFF;left:0px;">
- <li id="classification" class="transparent_class" style="margin-left:0px;height:20px;" onclick="navClose();return false;">
- <span id="initial">--鏃�--</span>
- </li>
- <li id="selectCheckId" style="margin-left:0px;display: none;">
- <ul style="margin-left: 0;" >
- <apex:repeat value="{!SApplyBenBu}" var="orr" id="selSD">
- <li class="sdclass" style="margin-left:0px">
- <p class="ul-nav" name="cate_id[]" >
- <input type="checkbox" value="{!orr.parameterName}" class="li-input" onclick="selectBenBu(this,'{!orr.parameterName}');" style="display: inline-block;vertical-align: middle;" />
- <font style="">{!orr.parameterName}</font>
- </p>
- </li>
- </apex:repeat>
- </ul>
- </li>
- </ul>
- <div class="nav_close"></div>
- </apex:outputPanel>
- </td>
- <td>鐢宠鑰呭姙浜嬪</td>
- <td>
- <apex:outputPanel style="position: relative; " id="S_AgencyApply">
- <apex:inputHidden id="S_Agency" value="{!S_Agency}" />
- <ul class="nav" id="nav_a" style="background-color: #FFFFFF;left:0px;">
- <li id="classification_a" class="transparent_class" style="margin-left:0px;height:20px;" onclick="navClose_a();return false;">
- <span id="initial_a">--鏃�--</span>
- </li>
- <li id="selectCheckId_a" style="margin-left:0px;display: none;">
- <ul style="margin-left: 0;" >
- <apex:repeat value="{!SApplyAgency}" var="orr" id="selSA">
- <li class="sdclass" style="margin-left:0px">
- <p class="ul-nav" name="cate_id[]" >
- <input type="checkbox" value="{!orr.parameterName}" class="li-input" onclick="selectAgency(this,'{!orr.parameterName}');" style="display: inline-block;vertical-align: middle;" />
- <font style="">{!orr.parameterName}</font>
- </p>
- </li>
- </apex:repeat>
- </ul>
- </li>
- </ul>
- </apex:outputPanel>
- </td>
- <td>澶囧搧鍒嗙被</td>
- <td>
- <apex:selectList value="{!S_bieBeiPinFenLei}" size="1" id="bieBeiPinFenLei" style="width:180px">
- <apex:selectOptions value="{!bieBeiPinFenLeiOps}"/>
- </apex:selectList>
- </td>
-
- </tr>
- <tr style="height:40px;">
- <td>浜у搧鍒嗙被(GI/SP)</td>
- <td>
- <apex:selectList value="{!S_Product_category}" size="1" style="width:60px" id="S_Product_category">
- <apex:selectOptions value="{!bieChanPinFenLeiOps}"/>
- </apex:selectList>
- </td>
- <td colspan="6"> <apex:commandButton style="" value="妫�绱�" onclick="searchJs(); return false;"/> </td>
- </tr>
- </table>
+ </apex:pageBlockSection>
<!-- 鏁版嵁 -->
- <!-- </apex:pageBlock> -->
- <!-- 20230523 ljh lightning end -->
+ </apex:pageBlock>
<apex:pageBlock id="MySequence">
<apex:outputPanel id="message">
<apex:pageMessages />
@@ -555,7 +444,6 @@
</table>
</div>
</apex:pageBlock>
-</apex:pageBlock> <!-- 20230523 ljh lightning -->
</apex:form>
<apex:outputPanel id="checEventFrame">
diff --git a/force-app/main/default/pages/RentalFixtureSetAssign.page b/force-app/main/default/pages/RentalFixtureSetAssign.page
index 9915642..c3e5f93 100644
--- a/force-app/main/default/pages/RentalFixtureSetAssign.page
+++ b/force-app/main/default/pages/RentalFixtureSetAssign.page
@@ -1,260 +1,190 @@
-<apex:page lightningStylesheets="true" controller="RentalFixtureSetAssignController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
+<apex:page lightningStylesheets="true" controller="RentalFixtureSetAssignController" showHeader="false" sidebar="false" id="allPage" action="{!init}" >
<head>
+<title>澶囧搧鍑哄�熷垎閰嶈澶�</title>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:stylesheet value="{!URLFOR($Resource.RentalFixtureSetAssignCss)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning -->
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
<!-- <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/> -->
<style type="text/css">
- .hideDropdown select{
- display: none
- }
- .modal {
- display:none;
- position: fixed; /* Stay in place */
- z-index: 10; /* Sit on top */
- left: 0;
- top: 0;
- width: 100%; /* Full width */
- height: 100%; /* Full height */
- overflow: auto; /* Enable scroll if needed */
- background-color: rgb(0,0,0); /* Fallback color */
- background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
- }
- span.dateFormat {
- display: none;
- }
+ .hideDropdown select{
+ display: none
+ }
+ .modal {
+ display:none;
+ position: fixed; /* Stay in place */
+ z-index: 10; /* Sit on top */
+ left: 0;
+ top: 0;
+ width: 100%; /* Full width */
+ height: 100%; /* Full height */
+ overflow: auto; /* Enable scroll if needed */
+ background-color: rgb(0,0,0); /* Fallback color */
+ background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
+ }
+ span.dateFormat {
+ display: none;
+ }
- /* Modal Content/Box */
- .modal-content {
- background-color: #fefefe;
- margin-left: 6px;
- margin-top: 100px;
- padding: 20px;
- border: 1px solid #888;
- right: 5%;
- position: absolute;
- width: 200px;
- }
- .modal-content-cancel {
- background-color: #fefefe;
- margin-left: -150px;
- margin-top: 100px;
- padding: 20px;
- border: 1px solid #888;
- left: 50%;
- position: absolute;
- width: 300px;
- }
+ /* Modal Content/Box */
+ .modal-content {
+ background-color: #fefefe;
+ margin-left: 6px;
+ margin-top: 100px;
+ padding: 20px;
+ border: 1px solid #888;
+ right: 5%;
+ position: absolute;
+ width: 200px;
+ }
+ .modal-content-cancel {
+ background-color: #fefefe;
+ margin-left: -150px;
+ margin-top: 100px;
+ padding: 20px;
+ border: 1px solid #888;
+ left: 50%;
+ position: absolute;
+ width: 300px;
+ }
+ /* 20230606 ljh lightning start */
+ body .detailList .dataCol input[type="text"],body .detailList .dataCol select{
+ min-width: 180px;
+ }
+ /* body .bPageBlock .detailList .dataCol{
+ width: 8%;
+ } */
+ body .bPageBlock .detailList .dataCol input[type="checkbox"]:first-child{
+ margin-top: 0;
+ }
+ body .detailList td{
+ position: static;
+ }
+ /*浠ヤ笅鏄笅鎷夊閫夋鐨勬牱寮� start*/
+ * {
+ margin: 0;
+ padding: 0;
+ box-sizing: border-box;
+ }
+ .nav {
+ width: 180px;/*20230606 ljh*/
+ line-height: 30px;/*20230606 ljh*/
+ /* border: 1px solid #000; *//*20230610 ljh*/
+ -webkit-user-select: none;
+ -moz-user-select: none;
+ -ms-user-select: none;
+ user-select: none;
+ position: absolute;
+ top: 0;
+ right: 0;
+ left: 0;
+ margin: 0;
+ z-index: 9999;
+ display: inline-block;
+ border-radius: 0.25rem;/*20230607 ljh lightning*/
+ border: 1px solid rgb(201, 201, 201);/*20230610 ljh lightning*/
+ }
+ ul,li {
+ list-style: none;
+ }
+ .nav li input {
+ margin: 0px 3px 0px 3px;
+ }
- body {
- position: relative;
- }
- ul,
- li {
- list-style: none;
- }
- .nav_1st {
- width: 180px;
- height: 6px;
- line-height: 20px;
- padding: 5px 30px 5px 5px;
- border: 1px solid #000;
- background-color: rgb(255, 255, 255);
- background-size: 5%;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
- margin: 0 auto;
- }
- .nav_1st0 {
- width: 160px;
- height: 6px;
- margin-left: 19px;
- line-height: 20px;
- padding: 5px 30px 5px 5px;
- background-color: rgb(255, 255, 255);
- border: 1px solid #000;
- background-size: 5%;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
- margin: 0 auto;
- }
-
- .nav {
- width: 180px;
- line-height: 20px;
- border: 1px solid #000;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
- position: absolute;
- top: 11.4rem;
- z-index: 9999;
- display: none;
- }
- .nav0 {
- width: 160px;
- line-height: 20px;
- border: 1px solid #000;
- -webkit-user-select: none;
- -moz-user-select: none;
- -ms-user-select: none;
- user-select: none;
- position: absolute;
- top: 9.5rem;
- z-index: 9999;
- display: none;
- }
-
-
- .nav_close {
- position: fixed;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
- z-index: 9990;
- display: none;
- }
- .nav_close0 {
- position: fixed;
- top: 0;
- bottom: 0;
- left: 0;
- right: 0;
- z-index: 9990;
- display: none;
- }
-
- .nav li input {
- margin: 0px 3px 0px 3px;
- }
-
- .nav li p:hover {
- background: #1e90ff;
- color: #fff;
- }
- .nav0 li input {
- margin: 0px 3px 0px 3px;
- }
-
- .nav0 li p:hover {
- background: #1e90ff;
- color: #fff;
- }
-
- #classification {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- }
- #classification0 {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
- }
-
+ .nav li p:hover {
+ background: #1e90ff;
+ color: #fff;
+ }
+ #classification_f,#classification_b {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
</style>
<script type="text/javascript">
var heightAjustment = 120;
var widthAjustment = 30;
var clickLineNo;
var iszhu;
-
-window.onload = () => {
- j$(".nav_1st").click(function () {
- j$(".nav,.nav_close").toggle();
- });
- j$(".nav_1st0").click(function () {
- j$(".nav0,.nav_close0").toggle();
- });
-
- j$(".nav_close").click(function () {
- j$(".nav,.nav_close").hide();
- });
- j$(".nav_close0").click(function () {
- j$(".nav0,.nav_close0").hide();
- });
-
- j$(".li-input").click(function () {
- var checked2 = j$(this).prop("checked");
- if (checked2 == true) {
- j$(this).prop("checked", false);
- } else {
- j$(this).prop("checked", true);
+// 20230607 ljh lightning start
+j$(document).bind("click",function(e){
+ var e = e || window.event; //浜嬩欢瀵硅薄锛屽吋瀹笽E
+ var target = e.target || e.srcElement; //婧愬璞★紝鍏煎鐏嫄鍜孖E
+ while(target){
+ // console.log(target.id);
+ if (target.id && (target.id == "nav_f" ||target.id == "nav_b")){
+ //寰幆鍒ゆ柇鑷虫牴鑺傜偣锛岄槻姝㈢偣鍑荤殑鏄�#selected鍜屽畠鐨勫瓙鍏冪礌
+ return;
}
- });
- j$(".ul-nav").click(function () {
- var checked1 = j$(this).children("input").prop("checked");
- console.log('checked1***',checked1);
- if (checked1 == false) {
- j$("#classification").children("#initial").remove();
- j$(this).children("input").prop("checked", true);
- j$("#classification").append("<span class='valClass' id='" + (j$(this).children("input")[0].value.trim().replace('.','')) + "'>" + (j$(this)
- .text().trim() + ",") + "</span>");
- } else {
- j$(this).children("input").prop("checked", false);
- j$("#classification").children("#" + (j$(this).children("input")[0].value.trim().replace('.',''))).remove();
- var length = j$("#classification").html().length;
- if (length === 0) {
- j$("#classification").append("<span class='valClass' id='initial'>--鏃�--</span>");
- }
+ target = target.parentNode;
+ }
+ j$("#selectCheckId_f").hide(); //鐐瑰嚮鐨勪笉鏄�#selected鍜屽畠鐨勫瓙鍏冪礌锛岄殣钘忎笅鎷夎彍鍗�
+ j$("#selectCheckId_b").hide();
+})
+//鐐瑰嚮 鍒嗙被閫夋嫨
+function selectFenLei(obj,name){
+ var checked1 = j$(obj).prop("checked");
+ if (checked1 == true) {
+ j$("#classification_f").children("#initial_f").remove();
+ var idTemp = j$(obj).value().trim();
+ idTemp = 'Id'+idTemp.split('.')[0];
+ j$("#classification_f").append("<span class='valClass' id='" + (idTemp) + "'>" + (j$(obj)
+ .value().trim() + ",") + "</span>");
+ } else {
+ var idTemp = 'Id'+name.split('.')[0];
+ j$("#classification_f").children("#" + (idTemp)).remove();
+ var length = j$("#classification_f").html().length;
+ if (length === 0) {
+ j$("#classification_f").append("<span class='valClass' id='initial_f'>--鏃�--</span>");
}
-
- var optioncheck = j$(".valClass");
- var hint = '';
- for(var i = 0;i<optioncheck.length;i++){
+ }
+ var optioncheck = j$(".valClass");
+ var hint = '';
+ for(var i = 0;i<optioncheck.length;i++){
+ if(optioncheck[i].innerText != '--鏃�--'){
hint +=optioncheck[i].innerText;
}
- j$("#valId").attr("title",hint);
- j$("[id*='salesdepartments']").val(hint);
- // j$("#salesdepartments").val(hint);
- // alert(j$("[id*='salesdepartments']").val());
- });
- j$(".ul-nav0").click(function () {
- var checked1 = j$(this).children("input").prop("checked");
- console.log('checked1***00',checked1);
- if (checked1 == false) {
- j$("#classification0").children("#initial0").remove();
- j$(this).children("input").prop("checked", true);
- j$("#classification0").append("<span class='valClass0' id='" + (j$(this).children("input")[0].value.trim()) + "'>" + (j$(this)
- .text().trim() + ",") + "</span>");
- } else {
- j$(this).children("input").prop("checked", false);
- j$("#classification0").children("#" + (j$(this).children("input")[0].value.trim())).remove();
- var length = j$("#classification0").html().length;
- if (length === 0) {
- j$("#classification0").append("<span class='valClass0' id='initial0'>--鏃�--</span>");
- }
- }
-
- var optioncheck = j$(".valClass0");
- var hint = '';
- for(var i = 0;i<optioncheck.length;i++){
- hint +=optioncheck[i].innerText;
- }
- j$("#valId0").attr("title",hint);
- j$("[id*='equipmenttypes']").val(hint);
- // j$("#equipmenttypes").val(hint);
- });
-
+ }
+ j$("[id*='equipmenttypes']").val(hint);
}
-
-// function tagclick() {
-// j$(".nav,.nav_close").toggle();
-// }
-// function tagclick0() {
-// j$(".nav0,.nav_close0").toggle();
-// }
-
-
+//鐐瑰嚮 鏈儴閫夋嫨
+function selectBenBu(obj,name){
+ var checked1 = j$(obj).prop("checked");
+ if (checked1 == true) {
+ j$("#classification_b").children("#initial_b").remove();
+ var idTemp = j$(obj).value().trim();
+ idTemp = 'Id'+idTemp.split('.')[0];
+ j$("#classification_b").append("<span class='valClass' id='" + (idTemp) + "'>" + (j$(obj)
+ .value().trim() + ",") + "</span>");
+ } else {
+ var idTemp = 'Id'+name.split('.')[0];
+ j$("#classification_b").children("#" + (idTemp)).remove();
+ var length = j$("#classification_b").html().length;
+ if (length === 0) {
+ j$("#classification_b").append("<span class='valClass' id='initial_b'>--鏃�--</span>");
+ }
+ }
+ var optioncheck = j$(".valClass");
+ var hint = '';
+ for(var i = 0;i<optioncheck.length;i++){
+ if(optioncheck[i].innerText != '--鏃�--'){
+ hint +=optioncheck[i].innerText;
+ }
+ }
+ j$("[id*='salesdepartments']").val(hint);
+}
+// 鍒嗙被
+function navClose_f(){
+ j$("#selectCheckId_f").toggle();
+}
+// 鏈儴
+function navClose_b(){
+ j$("#selectCheckId_b").toggle();
+}
+// 20230607 ljh lightning end
function saveGoPageJs(clickLineNo1, iszhu1) {
blockme();
clickLineNo = clickLineNo1;
@@ -264,9 +194,6 @@
lock.prop('checked', true);
saveGoPageJs_save();
}
-
-
-
function saveGoPageJsComplete() {
var errorFlag = j$(escapeVfId('allPage:allForm:hasError')).value();
if(errorFlag == 'false'){
@@ -447,61 +374,61 @@
<apex:outputField value="{!parentObj.Request_shipping_day__c}"/>
<apex:outputField value="{!parentObj.Request_return_day__c}"/>
<apex:outputField value="{!parentObj.Product_category__c}"/>
- <apex:outputPanel id="SelectOP" style="display:flex;margin-left: 27%;" rendered="{!!(parentObj.Demo_purpose1__c=='缁翠慨浠ｇ敤'||parentObj.Demo_purpose1__c=='鍗忚鍊熺敤')}">
+ <apex:pageBlockSectionItem id="SelectOP" rendered="{!!(parentObj.Demo_purpose1__c=='缁翠慨浠ｇ敤'||parentObj.Demo_purpose1__c=='鍗忚鍊熺敤')}">
<!-- 20220106 ljh 鏀惧紑 鏈嶅姟鍩硅/瀛︿細 parentObj.CampaignType__c=='鏈嶅姟鍩硅/瀛︿細'|| -->
- <apex:outputLabel for="bieBeiPinFenLei" style="font-weight: bold; font-family: Arial,Helvetica,sans-serif; font-size: 91%;color: #4a4a56;" value="澶囧搧鍒嗙被" />
- <div id="selectCheckId0" style="margin-left: 19px;">
- <div class="nav_1st0" id="valId0" title="" style="height: 19px;"> <!-- lighting鍗囩骇 20230210 lt 澶氶�夋鐨勬牱寮忎笉姝ｇ‘闂 add style="height: 19px;" -->
- <p id="classification0" style="margin-top: -7px;"><span id="initial0">--鏃�--</span></p>
- </div>
- <ul class="nav0" style="background-color: #FFFFFF;">
- <div id="divId0" style="display:">
- <apex:repeat value="{!bieBeiPinFenLeiOps}" var="orr" id="selSD0">
- <li class="sdclass" style="margin-left:0px">
- <p class="ul-nav0" name="cate_id[]" >
- <input type="checkbox" value="{!orr.value}" class="li-input" style="display: inline-block;vertical-align: middle;" />
- <font style="">{!orr.label}</font>
- </p>
- </li>
- </apex:repeat>
- </div>
- </ul>
- <div class="nav_close0"></div>
- </div>
+ <apex:outputLabel for="bieBeiPinFenLei" style="font-weight: bold; font-family: Arial,Helvetica,sans-serif; font-size: 91%;color: #4a4a56;" value="澶囧搧鍒嗙被" />
+ <apex:outputPanel style="position:absolute; " id="S_bieFenLei">
+ <ul class="nav" id="nav_f" style="background-color: #FFFFFF;left:0px;top:-5px;">
+ <li id="classification_f" class="transparent_class" style="margin-left:0px;height:30px;" onclick="navClose_f();return false;">
+ <span id="initial_f">--鏃�--</span>
+ </li>
+ <li id="selectCheckId_f" style="margin-left:0px;display: none;">
+ <ul style="margin-left:0px;">
+ <apex:repeat value="{!bieBeiPinFenLeiOps}" var="orr" id="selFL">
+ <li class="sdclass" style="margin-left:0px">
+ <p class="ul-nav" name="cate_id[]" >
+ <input type="checkbox" value="{!orr.value}" onclick="selectFenLei(this,'{!orr.value}');" class="li-input" style="display: inline-block;vertical-align: middle;"/>
+ <font style="">{!orr.label}</font>
+ </p>
+ </li>
+ </apex:repeat>
+ </ul>
+ </li>
+ </ul>
</apex:outputPanel>
- <apex:outputPanel id="Selectsalesd" style="display:flex;margin-left: 30%;" rendered="{!!(parentObj.Demo_purpose1__c=='缁翠慨浠ｇ敤'||parentObj.Demo_purpose1__c=='鍗忚鍊熺敤')}">
+ </apex:pageBlockSectionItem>
+ <apex:pageBlockSectionItem id="Selectsalesd" rendered="{!!(parentObj.Demo_purpose1__c=='缁翠慨浠ｇ敤'||parentObj.Demo_purpose1__c=='鍗忚鍊熺敤')}">
<!-- 20220106 ljh 鏀惧紑 鏈嶅姟鍩硅/瀛︿細 parentObj.CampaignType__c=='鏈嶅姟鍩硅/瀛︿細'|| -->
<apex:outputLabel for="salesd" style="font-weight: bold; font-family: Arial,Helvetica,sans-serif; font-size: 91%;color: #4a4a56;" value="鏈儴" />
- <div id="selectCheckId" style="margin-left: 19px;">
- <div class="nav_1st" id="valId" title="" style="height: 19px;">
- <!-- lighting鍗囩骇 20230210 lt 澶氶�夋鐨勬牱寮忎笉姝ｇ‘闂 add style="height: 19px;" -->
- <p id="classification" style="margin-top: -7px;"><span id="initial">--鏃�--</span></p>
- </div>
- <ul class="nav" style="background-color: #FFFFFF;">
- <div id="divId" style="display:">
+ <apex:outputPanel style="position:absolute; " id="S_bieBenBu">
+ <ul class="nav" id="nav_b" style="background-color: #FFFFFF;left:0px;">
+ <li id="classification_b" class="transparent_class" style="margin-left:0px;height:30px;" onclick="navClose_b();return false;">
+ <span id="initial_b">--鏃�--</span>
+ </li>
+ <li id="selectCheckId_b" style="margin-left:0px;display: none;">
+ <ul style="margin-left:0px;">
<apex:repeat value="{!bieBenBuOps}" var="orr" id="selSD">
- <li class="sdclass" style="margin-left:0px">
- <p class="ul-nav" name="cate_id[]" >
- <input type="checkbox" value="{!orr.value}" class="li-input" style="display: inline-block;vertical-align: middle;" />
- <font style="">{!orr.label}</font>
- </p>
- </li>
+ <li class="sdclass" style="margin-left:0px">
+ <p class="ul-nav" name="cate_id[]" >
+ <input type="checkbox" value="{!orr.value}" onclick="selectBenBu(this,'{!orr.value}');" class="li-input" style="display: inline-block;vertical-align: middle;"/>
+ <font style="">{!orr.label}</font>
+ </p>
+ </li>
</apex:repeat>
- </div>
+ </ul>
+ </li>
</ul>
- <div class="nav_close"></div>
- </div>
- </apex:outputPanel>
+ </apex:outputPanel>
+ </apex:pageBlockSectionItem>
<apex:inputField rendered="{!!(parentObj.Demo_purpose1__c=='缁翠慨浠ｇ敤'||parentObj.Demo_purpose1__c=='鍗忚鍊熺敤')}" id="product_category" value="{!parentObj.Product_category_Sys__c}" />
<!-- 20220106 ljh 鏀惧紑 鏈嶅姟鍩硅/瀛︿細 parentObj.CampaignType__c=='鏈嶅姟鍩硅/瀛︿細'|| -->
</apex:pageBlockSection>
-
-
- <table style="width: 450px;margin: auto;float: left;margin-top: 1.5%;" >
- <!-- <tr>
-
- <td></td>
- </tr> -->
+ <!-- 20230526 ljh lightning start-->
+ <!-- <table style="width: 450px;margin: auto;float: left;margin-top: 1.5%;" > -->
+ <table style="width: 450px;margin: auto;float: left;" >
+ <tr><td colspan="{!IF(parentObj.demo_purpose2__c == '瀛︿細灞曚細'&&!(contains(parentObj.Salesdepartment__c,'MA鏈儴')||contains(parentObj.Salesdepartment__c,'浜у搧鍩硅')),4,2)}">
+ </td>
+ </tr>
<tr>
<apex:outputPanel rendered="{!parentObj.demo_purpose2__c == '瀛︿細灞曚細'&&!(contains(parentObj.Salesdepartment__c,'MA鏈儴')||contains(parentObj.Salesdepartment__c,'浜у搧鍩硅'))}">
<td style="width:50px;font-weight: bold;font-family: Arial,Helvetica,sans-serif;font-size: 91%;color: #4a4a56;">
diff --git a/force-app/main/default/pages/RentalFixtureSetAssignAgency.page b/force-app/main/default/pages/RentalFixtureSetAssignAgency.page
index 75edf43..f5262f5 100644
--- a/force-app/main/default/pages/RentalFixtureSetAssignAgency.page
+++ b/force-app/main/default/pages/RentalFixtureSetAssignAgency.page
@@ -7,7 +7,7 @@
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.instascan)}"/>
<apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
- <apex:stylesheet value="{!URLFOR($Resource.listTable)}"/><!-- 20230525 ljh lightning -->
+ <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230525 ljh lightning -->
<style type="text/css">
.hideDropdown select{
display: none
diff --git a/force-app/main/default/pages/RentalFixtureSetDetilSelect.page b/force-app/main/default/pages/RentalFixtureSetDetilSelect.page
index 9d0e3ab..85c4a1f 100644
--- a/force-app/main/default/pages/RentalFixtureSetDetilSelect.page
+++ b/force-app/main/default/pages/RentalFixtureSetDetilSelect.page
@@ -4,6 +4,7 @@
<title>鍊熷嚭澶囧搧閰嶅鏄庣粏閫夋嫨</title>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:stylesheet value="{!URLFOR($Resource.RentalFixtureSetDetilSelectCss)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230624 ljh lightning -->
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
@@ -77,12 +78,16 @@
<script type="text/javascript">
// 鏁伴噺娣诲姞鍔犲噺绗﹀彿
j$(".dataCellBorder1.col_Rental_Num__c").each(function () {
+ // 20230614 ljh lightning start
if(!this.firstElementChild.disabled){
- j$(this).append('<input type="button" style="width: auto;" class="inc btn" value="+" /><input type="button" style="width: auto;" class="dec btn" value="-" />');
- }
+ // j$(this).append('<input type="button" style="width: auto;" class="inc btn" value="+" /><input type="button" style="width: auto;" class="dec btn" value="-" />');
+ j$(this).append('<input type="button" style="width:1.5rem;line-height:1.5rem;" class="inc btn" value="+" /><input type="button" style="width:1.5rem;line-height:1.5rem;" class="dec btn" value="-" />');
+ }
else{
- j$(this).append('<input type="button" style="width: auto;" class="dec btn" value="-" />');
+ // j$(this).append('<input type="button" style="width: auto;" class="dec btn" value="-" />');
+ j$(this).append('<input type="button" style="width:1.5rem;line-height:1.5rem;" class="dec btn" value="-" />');
}
+ // 20230614 ljh lightning end
});
j$(".dataCellBorder1.col_Rental_Num__c input[type=button]").on("click", function() {
var $button = j$(this);
diff --git a/force-app/main/default/pages/RentalFixtureSetSelect.page b/force-app/main/default/pages/RentalFixtureSetSelect.page
index 1bdecd0..ad03edc 100644
--- a/force-app/main/default/pages/RentalFixtureSetSelect.page
+++ b/force-app/main/default/pages/RentalFixtureSetSelect.page
@@ -5,6 +5,7 @@
<title>澶囧搧閰嶅閫夋嫨</title>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:stylesheet value="{!URLFOR($Resource.RentalFixtureSetSelectCss)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230624 ljh lightning -->
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
@@ -33,7 +34,7 @@
<apex:outputPanel id="pageallPanel">
<apex:pageBlock id="searchBlock" tabStyle="Report">
- <table style="width:700px;">
+ <table style="width:700px;margin-bottom: 10px;">
<tr>
<td width="50px">鍏抽敭瀛�</td>
<td width="200px"><apex:inputText value="{!keyword}" style="width:98%;"/></td>
@@ -97,8 +98,11 @@
$td.find("input[type=text]").attr('disabled',true);
});
} else {
- j$(this).append('<input type="button" style="width: auto;" class="inc btn" value="+" /><input type="button" style="width: auto;" class="dec btn" value="-" />');
- }
+ // 20230614 ljh lightning start
+ // j$(this).append('<input type="button" style="width: auto;" class="inc btn" value="+" /><input type="button" style="width: auto;" class="dec btn" value="-" />');
+ j$(this).append('<input type="button" style="width:1.5rem;line-height:1.5rem;" class="inc btn" value="+" /><input type="button" style="width:1.5rem;line-height: 1.5rem;" class="dec btn" value="-" />');
+ // 20230614 ljh lightning end
+ }
});
j$(".dataCellBorder1.col_Rental_Num__c input[type=button]").on("click", function(index) {
var $button = j$(this);
diff --git a/force-app/main/default/pages/ServiceFollowPage.page b/force-app/main/default/pages/ServiceFollowPage.page
index 305955c..e396622 100644
--- a/force-app/main/default/pages/ServiceFollowPage.page
+++ b/force-app/main/default/pages/ServiceFollowPage.page
@@ -1,4 +1,4 @@
-<apex:page controller="StatusPageController" showHeader="false" id="allPage" sidebar="false" action="{!init}" docType="html-5.0">
+<apex:page controller="StatusPageController" showHeader="false" id="allPage" sidebar="false" action="{!init}" docType="html-5.0" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
diff --git a/force-app/main/default/pages/SetPersonalProductTarget.page b/force-app/main/default/pages/SetPersonalProductTarget.page
index 9d8b487..24ecf1a 100644
--- a/force-app/main/default/pages/SetPersonalProductTarget.page
+++ b/force-app/main/default/pages/SetPersonalProductTarget.page
@@ -1,4 +1,4 @@
-<apex:page id="allPage" showHeader="false" sidebar="false" Controller="SetPersonalProductTargetController" action="{!init}">
+<apex:page id="allPage" showHeader="false" sidebar="false" Controller="SetPersonalProductTargetController" action="{!init}" lightningStylesheets="true">
<head>
<title>鎷呭綋鑰呴噸鐐逛骇鍝佺洰鏍囪瀹�</title>
<!-- 2018骞�7鏈�25鏃� SWAG-B2Z344 by 寮犵帀灞�
@@ -8,6 +8,34 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<style type="text/css">
+
+
+
+ body input[type="text"], .slds-vf-scope input[type="text"] {
+ padding: 0;
+ }
+ table > tbody > tr > th, .slds-vf-scope .listViewport table > tr > td, .slds-vf-scope .listViewport table > tr > th {
+ padding: .2rem;
+ }
+ body .bPageBlock.apexDefaultPageBlock {
+ border-top: 2px solid #cfc1c1;
+ }
+
+
+ #crossTable th ,#topTable th, #topTable ,#bodyTable{
+ border-right: 1px solid #c9c9c9;
+ }
+
+ #leftTable , #crossTable {
+ border-left: 1px solid #c9c9c9;
+ }
+
+ #leftTable,#bodyTable {
+ border-bottom: 1px solid #c9c9c9;
+ }
+
+
+
.StandLeft{
}
@@ -139,7 +167,7 @@
// 2018骞�7鏈�6鏃� SWAG-AZHBH7 娣诲姞UpdateJs 璋冪敤Apex 涓璘pdate鍑芥暟 by 寮犵帀灞�
function UpdateJs() {
blockme_dark();
- if (window.confirm('纭畾瑕佸弽搴斿埌鐩爣鍚楋紵')) {
+ if (window.confirm('纭畾瑕佸弽鏄犲埌鐩爣鍚楋紵')) {
Update();
} else {
unblockUI();
@@ -244,7 +272,7 @@
}
//CHAN-BDQBLX 20210129 ljh end
/*****************************/
-var heightAjustment = 160;
+var heightAjustment = 180;
var widthAjustment = 15;
function windowResize() {
blockHeight = j$(window).innerHeight() - j$(escapeVfId('allPage:allForm:headBlock')).height() - j$('div#MessageBlock').height() - heightAjustment;
@@ -394,7 +422,7 @@
<apex:outputPanel id="popupBox" layout="block">
<input type="file" id="file_input" name="attFile" accept=".csv" /><br/>
<center>
- <apex:commandButton value="纭" onclick="remoteLocationPost(); return false;" style="width: 20%; margin: 20px 10px 0px 10px" />
+ <apex:commandButton value="纭" onclick="remoteLocationPost(); return false;" style="width: 20%; " />
<apex:commandButton value="鍙栨秷" onclick="popupBox.hide();" style="width: 20%; margin: 20px 10px 0px 10px" />
</center>
</apex:outputPanel>
@@ -416,32 +444,32 @@
<table id="ButtonTable" border="0" >
<tr>
<td>
- 鏈儴 <apex:selectList value="{!salesDpt}" size="1" style="width:120px;" disabled="{!!(loginUser.ProfileId == $Label.ProfileId_SystemAdmin || loginUser.ProfileId == $Label.ProfileId_103)}" onchange="searchByDptJs();return false;"><apex:selectOptions value="{!salesDptOpts}"/></apex:selectList>
- 鐪� <apex:inputField id="province" value="{!loginUser.Province__c}" style="width:90px;" onchange="searchByProvinceJs();return false;"></apex:inputField>
+ 鏈儴 <apex:selectList value="{!salesDpt}" size="1" style="width:120px;" disabled="{!!(loginUser.ProfileId == $Label.ProfileId_SystemAdmin || loginUser.ProfileId == $Label.ProfileId_103)}" onchange="searchByDptJs();return false;"><apex:selectOptions value="{!salesDptOpts}"/></apex:selectList>
+ 鐪� <apex:inputField id="province" value="{!loginUser.Province__c}" style="width:90px;" onchange="searchByProvinceJs();return false;"></apex:inputField>
<script type="text/javascript">
var isadmin = {!(loginUser.ProfileId == $Label.ProfileId_SystemAdmin || loginUser.ProfileId == $Label.ProfileId_103)};
if (!isadmin) {
j$(escapeVfId('allPage:allForm:headBlock:province')).attr("disabled",true);
}
</script>
- 鑱岀 <apex:selectList id="jobCategory" value="{!loginUser.Job_Category__c}" size="1" style="width:80px;" onchange="searchByFilterJs();return false;">
+ 鑱岀 <apex:selectList id="jobCategory" value="{!loginUser.Job_Category__c}" size="1" style="width:80px;" onchange="searchByFilterJs();return false;">
<apex:selectOptions value="{!userJobCategorys}"/>
- </apex:selectList>
- {!$ObjectType.User.fields.Consumable_sales__c.Label} <apex:inputField value="{!loginUser.Consumable_sales__c}" style="width:80px;" onchange="searchByFilterJs();return false;"></apex:inputField>
- 浜у搧鎷呭綋
+ </apex:selectList>
+ {!$ObjectType.User.fields.Consumable_sales__c.Label} <apex:inputField value="{!loginUser.Consumable_sales__c}" style="width:80px;" onchange="searchByFilterJs();return false;"></apex:inputField>
+ 浜у搧鎷呭綋
<apex:selectList value="{!productUser}" size="1" style="width:100px;" onchange="searchByFilterJs();return false;">
<apex:selectOptions value="{!productUserOptions}"/>
- </apex:selectList>
- <!-- xiongyl閲嶇偣浜у搧
+ </apex:selectList>
+ <!-- xiongyl閲嶇偣浜у搧
<apex:selectList value="{!opp.Important_Key_product_category__c}" id="impKey" size="1" style="width:280px;" onchange="searchByImpKeyJs();return false;">
<apex:selectOptions value="{!impProductOptions}"/>
- </apex:selectList> !-->
- <apex:inputCheckBox id="checkAll" value="{!checkAll}" onchange="searchByFilterJs(); false;"/><apex:outputLabel value="缁忕悊浠ヤ笅" for="checkAll"/>
+ </apex:selectList> !-->
+ <apex:inputCheckBox id="checkAll" value="{!checkAll}" onchange="searchByFilterJs(); false;"/><apex:outputLabel value="缁忕悊浠ヤ笅" for="checkAll"/>
<input type="hidden" id="targetCategory" value="{!target_category}"/>
<input type="hidden" id="titileSize" value="{titileSize}"/>
</td>
<td align="right" width="10%">
- <apex:commandButton value="鍙嶅簲鍒扮洰鏍�" rerender="dummy" onclick="UpdateJs();return false;" rendered="{!Not(isPast)}"/>
+ <apex:commandButton value="鍙嶆槧鍒扮洰鏍�" rerender="dummy" onclick="UpdateJs();return false;" rendered="{!Not(isPast)}"/>
</td>
<!--CHAN-BDQBLX 20210129 ljh start -->
<td>
@@ -511,7 +539,7 @@
</table>
</div>
<div id="out_Div">
- <table class="list" style="border-collapse: collapse;border-bottom-width: 0px;table-layout:fixed;" border="0" cellspacing="0" cellpadding="0" id="topTable">
+ <table class="list" style="border-collapse: collapse;border-bottom-width: 0px;table-layout:fixed;width:100%;" border="0" cellspacing="0" cellpadding="0" id="topTable">
<thead>
<tr class="headerRow" id="header_R">
<apex:repeat value="{!opportunity_category}" var="oc" id="opportunityCategoryRepeat_R_2">
@@ -536,8 +564,9 @@
</tbody>
</table>
</div>
+ <div style="clear:both;height:0px;"></div>
<div id="in_Div_L" >
- <table class="list" style="border-bottom-width: 0px;table-layout:fixed;" border="0" cellspacing="0" cellpadding="0" id="leftTable">
+ <table class="list" style="table-layout:fixed;" cellspacing="0" cellpadding="0" id="leftTable">
<apex:variable value="{!1}" var="cnt" />
<apex:repeat value="{!dataBeans}" var="dbs" id="dbRepeat_L">
<tr class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}" id="dataRow_L">
@@ -557,7 +586,7 @@
</div>
<div id="in_Div">
- <table class="list" style="border-collapse: collapse;border-bottom-width: 0px;table-layout:fixed;" border="0" cellspacing="0" cellpadding="0" id="bodyTable">
+ <table class="list" style="border-collapse: collapse;table-layout:fixed;" cellspacing="0" cellpadding="0" id="bodyTable">
<tbody>
</tbody>
diff --git a/force-app/main/default/pages/SetPersonalTarget.page b/force-app/main/default/pages/SetPersonalTarget.page
index 54c94d3..d43ad4a 100644
--- a/force-app/main/default/pages/SetPersonalTarget.page
+++ b/force-app/main/default/pages/SetPersonalTarget.page
@@ -1,11 +1,34 @@
-<apex:page id="Page" showHeader="false" sidebar="false" Controller="SetPersonalTargetController" action="{!init}">
+<apex:page id="Page" showHeader="false" sidebar="false" Controller="SetPersonalTargetController" action="{!init}" lightningStylesheets="true">
<head>
<title>閮ㄩ棬鎷呭綋鑰呯洰鏍囪瀹氾紙鍖婚櫌鎷呭綋锛�</title>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+<!-- <apex:stylesheet value="{!URLFOR($Resource.listTable)}"/> -->
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
-<apex:includeScript value="{!URLFOR($Resource.jqueryTableFix)}"/>
+<!-- <apex:includeScript value="{!URLFOR($Resource.jqueryTableFix)}"/> -->
+<style>
+ body input[type="text"], .slds-vf-scope input[type="text"] {
+ padding: 0;
+ }
+ table > tbody > tr > th, .slds-vf-scope .listViewport table > tr > td, .slds-vf-scope .listViewport table > tr > th {
+ padding: .2rem;
+ }
+ #Page\:Form\:editBlock > div.pbBody {
+ height: 420px;
+ }
+ body .bPageBlock.apexDefaultPageBlock {
+ border-top: 2px solid #cfc1c1;
+ }
+
+
+ #MainTable th {
+ border-right: 1px solid #c9c9c9;
+ }
+ #MainTable {
+ border: 1px solid #c9c9c9;
+ }
+</style>
<script type="text/javascript">
//CHAN-BDQBLX 20210125 you start
@@ -77,12 +100,15 @@
datarows -= 2;
}
var allSum = 0;
- var cols = [0, 0, 0, 0, 0, 0, 0, 0];
+ //DB202303443108 20230407 you start 澧炲姞涓�涓�0
+ var cols = [0, 0, 0, 0, 0, 0, 0, 0, 0];
+ //DB202303443108 20230407 you start
// 琛�
for (var i = 0; i < datarows; i++) {
var rowSum = 0;
// 鍒�
- for (var j = 0; j < 8; j++) {
+ //DB202303443108 20230407 you start 8鏀规垚9 鍥犱负鍙樻垚浜�9鍒�
+ for (var j = 0; j < 9; j++) {
var amount = 0;
var raw = j$(escapeVfId('Page:Form:editBlock:dbRepeat:' + i + ':amountRepeat:' + j + ':inAmountValue')).value();
@@ -96,7 +122,7 @@
j$(escapeVfId('Page:Form:editBlock:dbRepeat:' + i + ':totalrow')).text(toNumComma(rowSum));
}
// 鍒�
- for (var j = 0; j < 8; j++) {
+ for (var j = 0; j < 9; j++) {
j$(escapeVfId('totalcol' + j)).text(toNumComma(cols[j]));
}
// 绶忚▓
@@ -155,6 +181,15 @@
} else {
prev(false);
}
+}
+function checkOwner(val, id, rownum) {
+ // changeFlg銈汇儍銉�
+ j$(escapeVfId('Page:Form:dataBlock:changeFlg')).val(1);
+ var ids = id.split(":");
+ var isChangedid = ids[0] + ":" + ids[1] + ":" + ids[2] + ":" + ids[3] + ":" + ids[4] + ":isChanged";
+ console.log('zheli:'+isChangedid);
+ j$(escapeVfId(isChangedid)).val("1");
+ j$(escapeVfId(id))[0].style.background="#FFFF33";
}
function searchByDptJs() {
@@ -259,7 +294,7 @@
<apex:outputPanel id="MessageP">
<apex:pagemessages />
</apex:outputPanel>
-<font style="font-size:15px;font-weight:700;">褰曞叆鎷呭綋鑰呭悇鑷殑鐩爣 锛堟敞锛氳杈撳叆鍚◣閲戦锛�</font>
+<font style="font-size:15px;font-weight:700;">褰曞叆鎷呭綋鑰呭悇鑷殑鐩爣 锛堟敞锛氳杈撳叆鍚◣閲戦锛�</font>
<!--CHAN-BDQBLX 20210125 you start -->
<apex:actionFunction name="exportcsv" action="{!exportBycsv}"/>
<apex:actionFunction name="passToController" action="{!importCSVFile}" rerender="Form, MessageP" oncomplete="unblockUI();">
@@ -290,7 +325,7 @@
<apex:outputPanel id="popupBox" layout="block">
<input type="file" id="file_input" name="attFile" accept=".csv" /><br/>
<center>
- <apex:commandButton value="纭" onclick="remoteLocationPost(); return false;" style="width: 20%; margin: 20px 10px 0px 10px" />
+ <apex:commandButton value="纭" onclick="remoteLocationPost(); return false;" style="width: 20%;"/>
<apex:commandButton value="鍙栨秷" onclick="popupBox.hide();" style="width: 20%; margin: 20px 10px 0px 10px" />
</center>
</apex:outputPanel>
@@ -301,13 +336,16 @@
<table id="ConditionTable" border="0" width="100%">
<tr>
<!-- <apex:outputPanel rendered="{!loginUser.ProfileId == $Label.ProfileId_SystemAdmin}" layout="none"> -->
- <td width="170">鏈儴 <apex:selectList id="accTypeOptsId" value="{!salesDpt}" size="1" style="width:120px;" disabled="{!!(loginUser.ProfileId == $Label.ProfileId_SystemAdmin || loginUser.ProfileId == $Label.ProfileId_103 || loginUser.ProfileId == $Label.ProfileId_2s6dashboard )}" onchange="searchByDptJs();return false;"><apex:selectOptions value="{!salesDptOpts}" />
- <!--<apex:inputHidden id="salesDptOpts1" value="{!salesDptOpts}" />-->
+ <!--DB202303443108 20230410 you start-->
+ <td width="170">鏈儴 <apex:selectList id="accTypeOptsId" value="{!salesDpt}" size="1" style="width:120px;" disabled="{!!(loginUser.ProfileId == $Label.ProfileId_SystemAdmin || loginUser.ProfileId == $Label.ProfileId_103 || loginUser.ProfileId == $Label.ProfileId_2s6dashboard )}" onchange="searchByDptJs();return false;"><apex:selectOptions value="{!salesDptOpts}" />
+
+ <!--<apex:inputHidden id="salesDptOpts1" value="{!salesDptOpts}" />-->
</apex:selectList>
</td>
- <!-- </apex:outputPanel> -->
- <td width="179">鐪� <apex:inputField id="province" value="{!loginUser.Province__c}" style="width:140px;" onchange="searchByProvinceJs();return false;"></apex:inputField>
+ <!--DB202303443108 20230410 you end -->
+
+ <td width="179">鐪� <apex:inputField id="province" value="{!loginUser.Province__c}" style="width:140px;" onchange="searchByProvinceJs();return false;"></apex:inputField>
<script type="text/javascript">
var isadmin = {!(loginUser.ProfileId == $Label.ProfileId_SystemAdmin || loginUser.ProfileId == $Label.ProfileId_103 || loginUser.ProfileId == $Label.ProfileId_2s6dashboard)};
if (!isadmin) {
@@ -315,19 +353,21 @@
}
</script>
</td>
- <td width="300">
- 鑱岀 <apex:selectList id="jobCategory" value="{!loginUser.Job_Category__c}" size="1" style="width:80px;" onchange="searchByFilterJs();return false;">
+ <td width="350">
+ <!--DB202303443108 20230407 you start-->
+ SFDC鑱岀 <apex:selectList id="jobCategory" value="{!loginUser.SFDCPosition_C__c}" size="1" style="width:80px;" onchange="searchByFilterJs();return false;">
<apex:selectOptions value="{!userJobCategorys}"/>
- </apex:selectList>
- 鍖婚櫌鎷呭綋
+ </apex:selectList>
+ <!--DB202303443108 20230407 you end-->
+ 鍖婚櫌鎷呭綋
<apex:selectList value="{!productUser}" id="productUserid" size="1" style="width:100px;" onchange="searchByFilterJs();return false;">
<apex:selectOptions value="{!productUserOptions}"/>
- </apex:selectList>
+ </apex:selectList>
</td>
- <td width="60"><apex:inputCheckBox id="checkAll" value="{!checkAll}" onchange="checkAll(this);return false;"/><apex:outputLabel value="鍏ㄩ��" for="checkAll"/></td>
+ <td width="60"><apex:inputCheckBox id="checkAll" value="{!checkAll}" onchange="checkAll(this);return false;" selected="true"/><apex:outputLabel value="鍏ㄩ��" for="checkAll"/></td>
<td>
<apex:repeat value="{!plist}" var="p" id="postRepeat">
- <apex:inputCheckBox value="{!p.check}" id="post" onchange="searchByFilterJs();return false;"/><apex:outputLabel value="{!p.positionName}" for="post"/>
+ <apex:inputCheckBox value="{!p.check}" id="post" onchange="searchByFilterJs();return false;"/><apex:outputLabel value="{!p.positionName}" for="post"/>
</apex:repeat>
</td>
<!-- 20220613 WLIG-CER9NQ you 椤甸潰涓嬁鎺夋敼鎴恇atch鎵ц
@@ -337,11 +377,11 @@
</td>
-->
<!--CHAN-BDQBLX 20210125 you start -->
- <td width="80">
+ <td width="108">
<apex:commandbutton onclick="exportJs();return false;" id="export" value="瀵煎嚭鏁版嵁妯℃澘">
</apex:commandbutton>
</td>
- <td width="40">
+ <td width="60">
<apex:commandButton onclick="openPopupCSV(); return false;" value="瀵煎叆" rerender="Form"/>
</td>
<!--CHAN-BDQBLX 20210125 you end -->
@@ -373,21 +413,25 @@
<!-- 銉愩儍銈伌銇儜銉┿儭銉笺偪銈掑銈勩仐銇熴亸銇亜銇熴倎銆侊紤銇仾銈屻仾銇勩儜銉┿儭銉笺偪銈掑叆銈屻伨銇� -->
<!-- 銇撱亾銇�ゃ伅锛戙亱銇┿亞銇嬨伄鍒ゆ柇銇伩銇т娇銇勩伨銇� -->
<apex:inputHidden id="changeFlg" value="{!saveFlg}"/>
- <table class="list" style="border-bottom-width: 0px;" border="0" cellspacing="0" cellpadding="0" id="MainTable">
+ <table class="list" style="width:100%;" cellspacing="0" cellpadding="0" id="MainTable">
<thead>
<tr class="headerRow">
- <th width="70px" class="headerRow booleanColumn">鏈儴</th>
- <th width="70px" class="headerRow booleanColumn">鐪�</th>
- <th class="headerRow booleanColumn">瑙掕壊</th>
- <th width="70px" class="headerRow booleanColumn">鎷呭綋</th>
+ <th width="70px" class="headerRow booleanColumn" style="min-width: 70px;">鏈儴</th>
+ <th width="70px" class="headerRow booleanColumn" style="min-width: 70px;">鐪�</th>
+ <!--<th class="headerRow booleanColumn">瑙掕壊</th>-->
+ <th width="70px" class="headerRow booleanColumn" style="min-width: 70px;">鎷呭綋</th>
<th width="70px" class="headerRow booleanColumn">HR閫氱敤鑱岀骇</th> <!-- 20220517 lt SWAG-CD28H3 Update -->
<th width="70px" class="headerRow booleanColumn">璐熻矗<br/>浜у搧鍒嗙被锛堜富锛�</th>
<!--wangweipeng 20210615-->
<th width="70px" class="headerRow booleanColumn">璐熻矗<br/>浜у搧鍒嗙被锛堝吋锛�</th>
+ <th width="70px" class="headerRow booleanColumn" style="min-width: 70px;">鐩爣绫诲瀷</th>
<apex:repeat value="{!opportunity_category}" var="oc" id="opportunityCategoryRepeat">
<th width="75px" class="headerRow booleanColumn"><apex:outputText id="categoryValue" value="{!oc}"></apex:outputText></th>
</apex:repeat>
<th width="85" class="headerRow booleanColumn" style="background-color:#AAAACC;">鍚堣</th>
+ <!-- 20230510 ljh start -->
+ <th width="70px" class="headerRow booleanColumn" style="min-width: 70px;">澶囨敞</th>
+ <!-- 20230510 ljh end -->
</tr>
</thead>
<tbody>
@@ -395,10 +439,11 @@
<tr class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}" bgcolor="#AAAACC">
<td class="dataCell"></td>
<td class="dataCell"></td>
- <td class="dataCell"></td>
+ <!--鏆傛椂闅愯棌<td class="dataCell"></td>-->
<td class="dataCell"></td>
<td class="dataCell"></td>
<!--wangweipeng 20210615-->
+ <td class="dataCell"></td>
<td class="dataCell"></td>
<td class="dataCell" style="text-align:center;">鍚堣</td>
<td class="dataCell" style="text-align:right;" id="totalcol0"></td>
@@ -409,22 +454,38 @@
<td class="dataCell" style="text-align:right;" id="totalcol5"></td>
<td class="dataCell" style="text-align:right;" id="totalcol6"></td>
<td class="dataCell" style="text-align:right;" id="totalcol7"></td>
+ <!--DB202303443108 20230407 you start-->
+ <td class="dataCell" style="text-align:right;" id="totalcol8"></td>
+ <!--DB202303443108 20230407 you end-->
<td class="dataCell" style="text-align:right;" id="totalAll"></td>
+ <!-- 20230510 ljh start -->
+ <td class="dataCell" style="text-align:right;" id="totalcol9"></td>
+ <!-- 20230510 ljh end -->
</tr>
<apex:repeat value="{!dataBeans}" var="dbs" id="dbRepeat">
<tr class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}">
- <td class="dataCell">{!dbs.user.Salesdepartment__c}</td>
+ <td class="dataCell">{!dbs.user.Salesdepartment__c}<!--{!dbs.user.Dept__c}--></td>
<td class="dataCell">{!dbs.user.Province__c}</td>
- <td class="dataCell">{!dbs.user.UserRole.Name}</td>
+ <!--鏆傛椂闅愯棌<td class="dataCell">{!dbs.user.UserRole.Name}</td>-->
<td class="dataCell">{!dbs.user.Alias}</td>
<td class="dataCell">{!dbs.user.HR_Post__c}</td> <!-- 20220517 lt SWAG-CD28H3 Update -->
- <td class="dataCell" style="word-wrap:break-word;max-width:70px;">{!SUBSTITUTE(dbs.user.Product_specialist_incharge_product__c, ";", "; ")}</td>
+ <td class="dataCell" style="word-wrap:break-word;">{!SUBSTITUTE(dbs.user.Product_specialist_incharge_product__c, ";", "; ")}</td>
<!--wangweipeng 20210615-->
- <td class="dataCell" style="word-wrap:break-word;max-width:70px;">{!SUBSTITUTE(dbs.user.Responsible_for_Products_Concurrently__c, ";", "; ")}</td>
+ <td class="dataCell" style="word-wrap:break-word;">{!SUBSTITUTE(dbs.user.Responsible_for_Products_Concurrently__c, ";", "; ")}</td>
+ <td class="dataCell"> <apex:inputField id="inTargetType" value="{!dbs.opportunity.TargetType__c}" style="width:100%;text-align:left;" onchange="checkOwner(this.value, this.id, {!cnt});"></apex:inputField>
+ <script type="text/javascript">
+ var ispast = {!isPast};
+ if (ispast) {
+ j$(escapeVfId('Page:Form:editBlock:dbRepeat:' + {!cnt-1} + ':inTargetType')).attr("disabled",true);
+ }
+ //j$(escapeVfId('Page:Form:editBlock:dbRepeat:' + {!cnt-1} + ':inTargetType')).val('涓汉');
+ </script>
+ </td>
+
<apex:variable value="{!1}" var="cnt2" />
<apex:repeat value="{!dbs.amount}" var="amount" id="amountRepeat">
<td class="dataCell" style="text-align:right;">
- <apex:inputField id="inAmountValue" value="{!amount.Amount}" style="width:92%; text-align:right;" onchange="checkMoney(this.value, this.id);"></apex:inputField>
+ <apex:inputField id="inAmountValue" value="{!amount.Amount}" style="width:100%; text-align:right;" onchange="checkMoney(this.value, this.id);"></apex:inputField>
<script type="text/javascript">
var ispast = {!isPast};
if (ispast) {
@@ -435,11 +496,23 @@
<apex:variable value="{!cnt2 + 1}" var="cnt2" />
</apex:repeat>
<td class="dataCell" style="text-align:right; background-color:#AAAACC;">
- <apex:outputText id="totalrow" style="width:92%;" value="{0,number,#,##0.00}">
+ <apex:outputText id="totalrow" style="width:100%;" value="{0,number,#,##0.00}">
<apex:param value="" />
</apex:outputText>
<apex:inputHidden id="isChanged" value="{!dbs.isChanged}"/>
</td>
+ <!-- 20230510 ljh start -->
+ <td class="dataCell" style="word-wrap:break-word;">
+ <apex:inputField id="inRemarks" value="{!dbs.opportunity.remarks__c}" style="width:100%;text-alig:left;" onchange="checkOwner(this.value, this.id, {!cnt});" onkeyup="if(value.length>15)value=value.slice(0,15)"/>
+ <script type="text/javascript">
+ var ispast = {!isPast};
+ if (ispast) {
+ j$(escapeVfId('Page:Form:editBlock:dbRepeat:' + {!cnt-1} + ':inRemarks')).attr("disabled",true);
+ }
+ </script>
+ <!-- 鏄ョ湢涓嶈鏅撳澶勯椈鍟奸笩澶滄潵椋庨洦澹� -->
+ </td>
+ <!-- 20230510 ljh end -->
</tr>
<apex:variable value="{!cnt + 1}" var="cnt" />
</apex:repeat>
@@ -447,8 +520,8 @@
</table>
<script type="text/javascript">
j$(function() {
- var blockHeight = j$(window).innerHeight() - j$(escapeVfId('Page:Form:headBlock')).height() - 60;
- j$(escapeVfId('MainTable')).tablefix({height: blockHeight, fixRows: 2, fixCols: 0});
+ // var blockHeight = j$(window).innerHeight() - j$(escapeVfId('Page:Form:headBlock')).height() - 60;
+ // j$(escapeVfId('MainTable')).tablefix({height: blockHeight, fixRows: 2, fixCols: 0});
});
calc();
</script>
diff --git a/force-app/main/default/pages/SetProductTarget.page b/force-app/main/default/pages/SetProductTarget.page
index 1d7d87f..d2e1352 100644
--- a/force-app/main/default/pages/SetProductTarget.page
+++ b/force-app/main/default/pages/SetProductTarget.page
@@ -1,4 +1,4 @@
-<apex:page id="Page" showHeader="false" sidebar="false" Controller="SetProductTargetController" action="{!init}">
+<apex:page id="Page" showHeader="false" sidebar="false" Controller="SetProductTargetController" action="{!init}" lightningStylesheets="true">
<head>
<title>鍚勭渷閲嶇偣浜у搧鐩爣璁惧畾</title>
@@ -6,6 +6,33 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.jqueryTableFix)}"/>
+<style>
+ body input[type="text"], .slds-vf-scope input[type="text"] {
+ padding: 0;
+ }
+ table > tbody > tr > th, .slds-vf-scope .listViewport table > tr > td, .slds-vf-scope .listViewport table > tr > th {
+ padding: .2rem;
+ }
+ body .bPageBlock.apexDefaultPageBlock {
+ border-top: 2px solid #cfc1c1;
+ }
+ /*#Page\:Form\:editBlock > div.pbBody {
+ height: 500px;
+ }*/
+
+ #crossTable th ,#topTable th, #topTable ,#bodyTable{
+ border-right: 1px solid #c9c9c9;
+ }
+
+ #leftTable , #crossTable {
+ border-left: 1px solid #c9c9c9;
+ }
+
+ #leftTable,#bodyTable {
+ border-bottom: 1px solid #c9c9c9;
+ }
+
+</style>
<script type="text/javascript">
window.onload = function getInfo() {
@@ -247,7 +274,7 @@
for(var i = 0; i< tbl.rows.length;i++){
if(document.getElementById("Page:Form:dataBlock:dbRepeat_L:"+i+":owner_mlktp")){
document.getElementById("Page:Form:dataBlock:dbRepeat_L:"+i+":owner_mlktp").style.display="none";
- document.getElementById("Page:Form:dataBlock:dbRepeat_L:"+i+":owner").style.width="80%";
+ document.getElementById("Page:Form:dataBlock:dbRepeat_L:"+i+":owner").style.width="99%";
}
//j$("Page:Form:dataBlock:dbRepeat_L:"+i+":owner_mlktp").attr('display','none');
//j$("Page:Form:dataBlock:dbRepeat_L:"+i+":owner").css("width","80%");
@@ -315,14 +342,16 @@
// }
passToController(this.result);
popupBox.hide();
- }
+ }
+
+
}
}
//CHAN-BDQBLX 20210205 ljh end
</script>
<style>
.TestCss{
- width:80%;
+ width:99%;
}
div#out_Div {
position:relative;
@@ -395,7 +424,7 @@
<apex:outputPanel id="popupBox" layout="block">
<input type="file" id="file_input" name="attFile" accept=".csv" /><br/>
<center>
- <apex:commandButton value="纭" onclick="remoteLocationPost(); return false;" style="width: 20%; margin: 20px 10px 0px 10px" />
+ <apex:commandButton value="纭" onclick="remoteLocationPost(); return false;" style="width: 20%; " />
<apex:commandButton value="鍙栨秷" onclick="popupBox.hide();" style="width: 20%; margin: 20px 10px 0px 10px" />
</center>
</apex:outputPanel>
@@ -405,10 +434,10 @@
<table id="ButtonTable" border="0" width="100%">
<tr>
<td>
- 鏈儴 <apex:selectList value="{!salesDpt}" size="1" style="width:120px" onchange="searchByDptJs();return false;"><apex:selectOptions value="{!salesDptOpts}"/></apex:selectList>
- 鐪� <apex:inputField value="{!opp.SAP_Province__c}" id="province" style="width:140px" onchange="searchByProvinceJs();return false;"></apex:inputField>
- <!-- 閲嶇偣鐩爣鍒嗙被 <apex:selectList value="{!target_category}" size="1" style="width:140px" onchange="searchByCategoryJs();return false;"><apex:selectOptions value="{!targetOpts}"/></apex:selectList>
- 閲嶇偣浜у搧
+ 鏈儴 <apex:selectList value="{!salesDpt}" size="1" style="width:120px" onchange="searchByDptJs();return false;"><apex:selectOptions value="{!salesDptOpts}"/></apex:selectList>
+ 鐪� <apex:inputField value="{!opp.SAP_Province__c}" id="province" style="width:140px" onchange="searchByProvinceJs();return false;"></apex:inputField>
+ <!-- 閲嶇偣鐩爣鍒嗙被 <apex:selectList value="{!target_category}" size="1" style="width:140px" onchange="searchByCategoryJs();return false;"><apex:selectOptions value="{!targetOpts}"/></apex:selectList>
+ 閲嶇偣浜у搧
<apex:selectList value="{!opp.Important_Key_product_category__c}" id="impKey" size="1" style="width:200px;" onchange="searchByImpKeyJs();return false;">
<apex:selectOptions value="{!impProductOptions}"/>
</apex:selectList>-->
@@ -418,7 +447,7 @@
<!-- ljh 鏍峰紡璋冩暣 20210204 start -->
<!--CHAN-BDQBLX 20210204 ljh end -->
<td align="right">
- <apex:commandButton value="鍙嶅簲鍒扮洰鏍�" rerender="dummy" onclick="UpdateJs(this);return false;" rendered="{!Not(isPast)}" id="setTarget"/>
+ <apex:commandButton value="鍙嶆槧鍒扮洰鏍�" rerender="dummy" onclick="UpdateJs(this);return false;" rendered="{!Not(isPast)}" id="setTarget"/>
<apex:commandbutton onclick="exportJs();return false;" id="export" value="瀵煎嚭鏁版嵁妯℃澘"></apex:commandbutton>
<apex:commandButton onclick="openPopupCSV(); return false;" value="瀵煎叆" rerender="Form"/>
</td>
@@ -447,7 +476,7 @@
<apex:inputHidden id="changeFlg" value="{!saveFlg}"/>
<div id="Div_all">
<div id="out_Div_L">
- <table class="list" style="border-bottom-width: 0px;table-layout:fixed;" border="0" cellspacing="0" cellpadding="0" id="crossTable">
+ <table class="list" style="border-bottom-width: 0px;table-layout:fixed;" cellspacing="0" cellpadding="0" id="crossTable">
<thead>
<tr class="headerRow" id="Head_L">
<th width="140px" class="headerRow booleanColumn">閿�鍞湰閮�</th>
@@ -466,7 +495,7 @@
</table>
</div>
<div id="out_Div" >
- <table class="list" style="border-collapse: collapse;border-bottom-width: 0px;table-layout:fixed;" id="topTable">
+ <table class="list" style="border-collapse: collapse;border-bottom-width: 0px;table-layout:fixed;width:100%;" id="topTable">
<thead>
<tr class="headerRow" id="header_R">
<apex:repeat value="{!opportunity_category}" var="oc" id="opportunityCategoryRepeat">
@@ -488,15 +517,16 @@
</tbody>
</table>
</div>
+ <div style="clear:both;height:0px;"></div>
<div id="in_Div_L">
- <table class="list" style="table-layout:fixed;border-bottom-width: 0px;" border="0" cellspacing="0" cellpadding="0" id="leftTable">
+ <table class="list" style="table-layout:fixed;" border="0" cellspacing="0" cellpadding="0" id="leftTable">
<tbody>
<apex:repeat value="{!dataBeans}" var="dbs" id="dbRepeat_L">
<tr class="dataRow {!IF(MOD(cnt, 2)==0, 'odd', 'even')} {!IF(cnt==1, 'first', '')}">
<td class="dataCell" width="140px">{!dbs.department}</td>
<td class="dataCell" width="110px"><apex:outputField value="{!dbs.opportunity.SAP_Province__c}"></apex:outputField></td>
- <td class="dataCell" width="160px"><apex:inputField id="owner" value="{!dbs.opportunity.Owner_System__c}" onchange="checkOwner(this.value, this.id, {!cnt});" style="width:80%;"></apex:inputField>
+ <td class="dataCell" width="160px"><apex:inputField id="owner" value="{!dbs.opportunity.Owner_System__c}" onchange="checkOwner(this.value, this.id, {!cnt});" style="width:99%;"></apex:inputField>
<script type="text/javascript">
var ispast = {!isPast};
if (ispast) {
@@ -511,7 +541,7 @@
</div>
<div id="in_Div" >
- <table class="list" style="border-collapse: collapse;border-bottom-width: 0px;table-layout:fixed;" id="bodyTable">
+ <table class="list" style="border-collapse: collapse;table-layout:fixed;width:100%;" id="bodyTable">
<tbody>
<apex:repeat value="{!dataBeans}" var="dbs" id="dbRepeat">
@@ -559,4 +589,4 @@
</script>
</apex:pageBlock>
</apex:form>
-</apex:page>
\ No newline at end of file
+</apex:page>
diff --git a/force-app/main/default/pages/SetProvinceTarget.page b/force-app/main/default/pages/SetProvinceTarget.page
index dcd8e4d..1da0caa 100644
--- a/force-app/main/default/pages/SetProvinceTarget.page
+++ b/force-app/main/default/pages/SetProvinceTarget.page
@@ -1,4 +1,4 @@
-<apex:page id="Page" showHeader="false" sidebar="false" Controller="SetProvinceTargetController" action="{!init}">
+<apex:page id="Page" showHeader="false" sidebar="false" Controller="SetProvinceTargetController" action="{!init}" lightningStylesheets="true">
<head>
<title>鍚勭渷鐩爣璁惧畾</title>
@@ -6,6 +6,28 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.jqueryTableFix)}"/>
+
+<style>
+
+ body input[type="text"], .slds-vf-scope input[type="text"] {
+ padding: 0;
+ }
+ table > tbody > tr > th, .slds-vf-scope .listViewport table > tr > td, .slds-vf-scope .listViewport table > tr > th {
+ padding: .2rem;
+ }
+ body .bPageBlock.apexDefaultPageBlock {
+ border-top: 2px solid #cfc1c1;
+ }
+
+
+ #MainTable th {
+ border-right: 1px solid #c9c9c9;
+ }
+ #MainTable {
+ border: 1px solid #c9c9c9;
+ }
+</style>
+
<script type="text/javascript">
function DisableAllButtons (actionText) {
@@ -15,7 +37,7 @@
}
function UpdateJs(actionText) {
blockme();
- if (window.confirm('纭畾瑕佸弽搴斿埌鐩爣鍚楋紵')) {
+ if (window.confirm('纭畾瑕佸弽鏄犲埌鐩爣鍚楋紵')) {
Update();
DisableAllButtons(actionText);
} else {
@@ -44,7 +66,10 @@
function calc() {
debugger;
- var JianDangfalg3 =j$(escapeVfId('Page:Form:editBlock:JianDangfalg')).value();
+ // DB202305259561 fy 20230517 start
+ // var JianDangfalg3 =j$(escapeVfId('Page:Form:editBlock:JianDangfalg')).value();
+ var JianDangfalg3 = '{!JianDangfalg}';
+ // DB202305259561 fy 20230517 end
// alert('sss= '+s);
var isorgtbl = j$('div[name=bodyTable]');
var tbl = document.getElementById('MainTable');
@@ -54,12 +79,15 @@
datarows -= 2;
}
var allSum = 0;
- var cols = [0, 0, 0, 0, 0, 0, 0, 0];
+ //DB202305277681 fy 20230517 start
+ // var cols = [0, 0, 0, 0, 0, 0, 0, 0];
+ var cols = [0, 0, 0, 0, 0, 0, 0, 0, 0];
+ //DB202305277681 fy 20230517 end
// 琛�
for (var i = 0; i < datarows; i++) {
var rowSum = 0;
// 鍒�
- for (var j = 0; j < 8; j++) {
+ for (var j = 0; j < 9; j++) {
var amount = 0;
var x=j;
if(JianDangfalg3=='true'){
@@ -78,7 +106,7 @@
}
// 鍒�
- for (var j = 0; j < 8; j++) {
+ for (var j = 0; j < 9; j++) {
j$(escapeVfId('totalcol' + j)).text(toNumComma(cols[j]));
}
// 绶忚▓
@@ -233,7 +261,7 @@
<apex:outputPanel id="popupBox" layout="block">
<input type="file" id="file_input" name="attFile" accept=".csv" /><br/>
<center>
- <apex:commandButton value="纭" onclick="remoteLocationPost(); return false;" style="width: 20%; margin: 20px 10px 0px 10px" />
+ <apex:commandButton value="纭" onclick="remoteLocationPost(); return false;" style="width: 20%; " />
<apex:commandButton value="鍙栨秷" onclick="popupBox.hide();" style="width: 20%; margin: 20px 10px 0px 10px" />
</center>
</apex:outputPanel>
@@ -248,7 +276,7 @@
<!--CHAN-BDQBLX 20210129 you start -->
<td align="center" width="10%">
- <apex:commandButton value="鍙嶅簲鍒扮洰鏍�" rerender="dummy" onclick="UpdateJs(this);return false;" rendered="{!Not(isPast)}" id="setTarget"/>
+ <apex:commandButton value="鍙嶆槧鍒扮洰鏍�" rerender="dummy" onclick="UpdateJs(this);return false;" rendered="{!Not(isPast)}" id="setTarget"/>
<apex:commandbutton onclick="exportJs();return false;" id="export" value="瀵煎嚭鏁版嵁妯℃澘">
</apex:commandbutton>
<apex:commandButton onclick="openPopupCSV(); return false;" value="瀵煎叆" rerender="Form"/>
@@ -279,7 +307,7 @@
<!-- 銉愩儍銈伌銇儜銉┿儭銉笺偪銈掑銈勩仐銇熴亸銇亜銇熴倎銆侊紤銇仾銈屻仾銇勩儜銉┿儭銉笺偪銈掑叆銈屻伨銇� -->
<!-- 銇撱亾銇�ゃ伅锛戙亱銇┿亞銇嬨伄鍒ゆ柇銇伩銇т娇銇勩伨銇� -->
<apex:inputHidden id="changeFlg" value="{!saveFlg}"/>
- <table class="list" style="border-bottom-width: 0px;" border="0" cellspacing="0" cellpadding="0" id="MainTable">
+ <table class="list" cellspacing="0" cellpadding="0" id="MainTable">
<thead>
<tr class="headerRow">
<th width="110px" class="headerRow booleanColumn" id="baseName">閿�鍞湰閮�</th>
@@ -301,7 +329,7 @@
<!-- <td class="dataCell" id="NameHold"></td> -->
<td class="dataCell" style="text-align:center;">鍚堣</td>
<apex:variable value="JianDangfalg" var="JianDangfalg2" rendered="{!IF(JianDangfalg, true, false)}" >
- <td class="dataCell" style="text-align:right;" id="totalcol8"></td>
+ <td class="dataCell" style="text-align:right;" id="totalcol9"></td>
</apex:variable>
<td class="dataCell" style="text-align:right;" id="totalcol0"></td>
<td class="dataCell" style="text-align:right;" id="totalcol1"></td>
@@ -311,6 +339,9 @@
<td class="dataCell" style="text-align:right;" id="totalcol5"></td>
<td class="dataCell" style="text-align:right;" id="totalcol6"></td>
<td class="dataCell" style="text-align:right;" id="totalcol7"></td>
+ <!-- DB202305277681 fy 20230517 start -->
+ <td class="dataCell" style="text-align:right;" id="totalcol8"></td>
+ <!-- DB202305277681 fy 20230517 end -->
<td class="dataCell" style="text-align:right;" id="totalAll"></td>
</tr>
<apex:repeat value="{!dataBeans}" var="dbs" id="dbRepeat">
@@ -326,7 +357,7 @@
<apex:variable value="{!1}" var="cnt2" />
<apex:repeat value="{!dbs.amount}" var="amount" id="amountRepeat">
<td class="dataCell" style="text-align:right;">
- <apex:inputField id="inAmountValue" value="{!amount.Amount}" style="width:92%; text-align:right;" onchange="checkMoney(this.value, this.id);"></apex:inputField>
+ <apex:inputField id="inAmountValue" value="{!amount.Amount}" style="width:100%; text-align:right;" onchange="checkMoney(this.value, this.id);"></apex:inputField>
<script type="text/javascript">
var ispast = {!isPast};
if (ispast) {
@@ -337,7 +368,7 @@
<apex:variable value="{!cnt2 + 1}" var="cnt2" />
</apex:repeat>
<td class="dataCell" style="text-align:right; background-color:#AAAACC;">
- <apex:outputText id="totalrow" style="width:92%;" value="{0,number,#,##0.00}">
+ <apex:outputText id="totalrow" style="width:100%;" value="{0,number,#,##0.00}">
<apex:param value="" />
</apex:outputText>
<apex:inputHidden id="isChanged" value="{!dbs.isChanged}"/>
@@ -358,4 +389,4 @@
</script>
</apex:pageBlock>
</apex:form>
-</apex:page>
\ No newline at end of file
+</apex:page>
diff --git a/force-app/main/default/pages/StatusPage.page b/force-app/main/default/pages/StatusPage.page
index 8a573b2..ee363e6 100644
--- a/force-app/main/default/pages/StatusPage.page
+++ b/force-app/main/default/pages/StatusPage.page
@@ -1,4 +1,4 @@
-<apex:page controller="StatusPageController" showHeader="false" id="allPage" sidebar="false" action="{!init}" docType="html-5.0">
+<apex:page controller="StatusPageController" showHeader="false" id="allPage" sidebar="false" action="{!init}" docType="html-5.0" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
diff --git a/force-app/main/default/staticresources/AccessoryAddCss.css b/force-app/main/default/staticresources/AccessoryAddCss.css
index e69de29..732f8e6 100644
--- a/force-app/main/default/staticresources/AccessoryAddCss.css
+++ b/force-app/main/default/staticresources/AccessoryAddCss.css
@@ -0,0 +1,11 @@
+table.list .col_Asset__r_Fixture_Model_No_F__c {width:150px;}
+table.list .col_Fixture_Name__c {width:100px;}
+table.list .col_Asset__r_Fixture_Status__c {width:70px;}
+table.list .col_Asset__r_SerialNumber {width:100px;}
+table.list .col_Asset__r_Salesdepartment__c {width:100px;}
+table.list .col_Asset__r_Internal_asset_location__c {width:100px;}
+table.list .col_Asset__r_Product_category__c {width:120px;}
+table.list .col_Asset__r_Equipment_Type__c {width:90px;}
+table.list .col_Asset__r_Consumable_Guaranteen_end__c {width:100px;}
+table.list .col_Asset__r_You_Xiao_Ku_Cun__c {width:70px;}
+table.list .col_Asset__r_In_wh_Fu_Shu_Pin_You_Xiao_Ku_Cun_Sum__c {width:180px;}
\ No newline at end of file
diff --git a/force-app/main/default/staticresources/MainFixtureSelectCss.css b/force-app/main/default/staticresources/MainFixtureSelectCss.css
index e69de29..bc113c0 100644
--- a/force-app/main/default/staticresources/MainFixtureSelectCss.css
+++ b/force-app/main/default/staticresources/MainFixtureSelectCss.css
@@ -0,0 +1,19 @@
+table.list .col_Fixture_Model_No_F__c{width:170px;}
+table.list .col_Fixture_Name__c{width:120px;}
+table.list .col_Substitute_flag__c{width:80px;}
+table.list .col_SerialNumber_F__c{width:90px;}
+table.list .col_Zhu_Ti_Fen_Pei_Jia__c{width:90px;}
+table.list .col_Asset__r_Fixture_Status__c{width:90px;}
+table.list .col_Asset__r_Pre_Arrival_wh_time__c {width:100px;}
+table.list .col_Asset__r_Asset_return_Day__c {width:100px;}
+table.list .col_Asset__r_RAES_Final_reply_day_DF__c {width:120px;}
+table.list .col_Asset__r_Repairing_RC_Shipped_Date__c {width:150px;}
+table.list .col_Asset__r_Pre_Inspection_Comment__c {width:100px;}
+table.list .col_Lei_Ji_Jie_Chu_Shu_Asset_Jia__c {width:100px;}
+table.list .col_Equipment_Type__c {width:100px;}
+table.list .col_Asset__r_Salesdepartment__c {width:100px;}
+table.list .col_Asset__r_SalesProvince__c {width:100px;}
+table.list .col_Asset__r_Internal_asset_location__c {width:100px;}
+table.list .col_Cancel_Reason__c {width:100px;}
+table.list .col_Loaner_cancel_reason__c {width:100px;}
+table.list .col_Loaner_cancel_Remarks__c {width:100px;}
\ No newline at end of file
diff --git a/force-app/main/default/staticresources/RelationListPagingCmpCss.css b/force-app/main/default/staticresources/RelationListPagingCmpCss.css
index d949557..6b092c2 100644
--- a/force-app/main/default/staticresources/RelationListPagingCmpCss.css
+++ b/force-app/main/default/staticresources/RelationListPagingCmpCss.css
@@ -12,7 +12,7 @@
overflow: hidden;
float:left;
/* width:32768px; */ /* 20230523 ljh lightning */
- width: 1100px;
+ /* width: 1200px; */
}
div#out_Div_L {
position:relative;
@@ -25,7 +25,7 @@
float:left;
/* width:32768px; */ /* 20230523 ljh lightning */
height: 100px; /* tbody銈掕〃绀恒仚銈嬮珮銇曘�佸緦銇s銇仸瑾挎暣 */
- width: 1100px;
+ /* width: 1200px; */
}
div#in_Div_L {
position:relative;
diff --git a/force-app/main/default/staticresources/RelationListPagingCmpJS.js b/force-app/main/default/staticresources/RelationListPagingCmpJS.js
index c47f7d6..461a428 100644
--- a/force-app/main/default/staticresources/RelationListPagingCmpJS.js
+++ b/force-app/main/default/staticresources/RelationListPagingCmpJS.js
@@ -333,9 +333,14 @@
heightsp = bottomspace;
}
blockHeight = j$(window).innerHeight() - j$(escapeVfId('allPage:allForm:searchBlock')).height() - heightAjustment;
+ // console.log(j$(window).innerHeight() +'-'+ j$(escapeVfId('allPage:allForm:searchBlock')).height() +'-'+ heightAjustment+'-'+heightsp);
blockHeight = blockHeight - heightsp;
+
sbwidth = scrollbarWidth();
- blockWidth = j$(escapeVfId('allPage:allForm:searchBlock')).width() - j$('div#out_Div_L').width() - widthAjustment - sbwidth - 20;
+ // 20230531 ljh start
+ // blockWidth = j$(escapeVfId('allPage:allForm:searchBlock')).width() - j$('div#out_Div_L').width() - widthAjustment - sbwidth - 20;
+ blockWidth = j$(escapeVfId('allPage:allForm:searchBlock')).width() - j$('div#out_Div_L').width()- sbwidth;
+ // 20230531 ljh end
//銈炽兂銉濄儘銉笺儓銇伄銇D銈掑鏇�
// 20230519 ljh start
// j$(escapeVfId('allPage:allForm:cmpid:cmpinnerid:dataBlock')).css('height', blockHeight + 78 + 'px');
@@ -371,10 +376,19 @@
// 20230519 ljh 澧炶if鍒ゆ柇
// j$('div#out_Div').css('width', (blockWidth + sbwidth) + 'px');
// j$('div#in_Div').css('width', (blockWidth + sbwidth) + 'px');
- if (j$('table#tableData').width() > j$('div#in_Div').width()) {
- j$('div#out_Div').css('width', (blockWidth + sbwidth) + 'px');
- j$('div#in_Div').css('width', (blockWidth + sbwidth) + 'px');
+ // 20230704 ljh start
+ if(blockWidth > 1000){
+ j$('div#out_Div').css('width', (blockWidth) + 'px');
+ j$('div#in_Div').css('width', (blockWidth) + 'px');
+ }else{
+ j$('table#tableData').css('width', (blockWidth) + 'px');
+ j$('table#tableHeader').css('width', (blockWidth) + 'px');
}
+ // if (j$('table#tableData').width() > j$('div#in_Div').width()) {
+ // j$('div#out_Div').css('width', (blockWidth) + 'px');
+ // j$('div#in_Div').css('width', (blockWidth) + 'px');
+ // }
+ // 20230704 ljh end
}
if (j$('table#tableData').width() > j$('div#in_Div').width()) {
j$('div#in_Div').css('height', (blockHeight + sbwidth) +'px');
@@ -411,7 +425,6 @@
// tableWidth -= headerCol.width();
tableWidth -= listColClassWidthMap[colClass];
// 20230519 ljh lightning end
-
// 鍏ㄩ儴鏈�灏忓寲銇欍倠
j$('body .pbBody table.list td.' + colClass).children().hide();
j$('body .pbBody table.list td.' + colClass).width(7).css("font-size", "0");
@@ -424,9 +437,10 @@
tableWidth += listColClassWidthMap[colClass] + 2 - hiddenWidth; // 2 is border
// }
}
-
j$('table#tableData').css('width', (tableWidth + 2) + 'px');
j$('table#tableHeader').css('width', (tableWidth + 2) + 'px');
+
+
}
function getColClassName(pObj) {
diff --git a/force-app/main/default/staticresources/StyleUtilCss.css b/force-app/main/default/staticresources/StyleUtilCss.css
new file mode 100644
index 0000000..07a0d50
--- /dev/null
+++ b/force-app/main/default/staticresources/StyleUtilCss.css
@@ -0,0 +1,39 @@
+/* 20230616 ljh start lightning */
+/* 琛ㄦ牸琛ㄦ牸鍜屾*/
+body .pbBody table.list tr th, body .pbBody table.list tr td {
+ border: 1px solid #ededed;
+ white-space: normal;
+}
+body .pbBody table.list tr.headerRow td,body .pbBody table.list tr.headerRow th {
+ background: #f2f3f3;
+ border-width: 0 0 1px 1px;
+ border-color: #e0e3e5;
+ font-size: .9em;
+ font-weight: bold;
+}
+/*淇℃伅鎻愮ず棰滆壊*/
+body .bPageBlock .pbSubheader, .slds-vf-scope .bPageBlock .pbSubheader{
+ background-color: #08107b !important;;
+ color: #FFF !important;;
+}
+body .infoM2, body .infoM3, body .infoM4, .slds-vf-scope .infoM2, .slds-vf-scope .infoM3, .slds-vf-scope .infoM4 {
+ background-color: #08107b !important;
+}
+body .message, .slds-vf-scope .message{
+ background-color: #08107b !important;
+}
+body .pbButton{
+ text-align: left;
+}
+
+/*妫�绱㈡涓嶄贡*/
+body .detailList .dataCol input[type="text"],body .detailList .dataCol select{
+ min-width: 180px;
+ padding: 0;
+}
+body .bPageBlock .detailList .dataCol{
+ width: 8%;
+}
+body .detailList td{
+ position: static;
+}
diff --git a/force-app/main/default/staticresources/StyleUtilCss.resource-meta.xml b/force-app/main/default/staticresources/StyleUtilCss.resource-meta.xml
new file mode 100644
index 0000000..205b97a
--- /dev/null
+++ b/force-app/main/default/staticresources/StyleUtilCss.resource-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<StaticResource xmlns="http://soap.sforce.com/2006/04/metadata">
+ <cacheControl>Public</cacheControl>
+ <contentType>text/css</contentType>
+</StaticResource>
--
Gitblit v1.9.1