From 5d155accb594089737a0b4edd753152a1ea66bc4 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期二, 04 四月 2023 15:23:51 +0800
Subject: [PATCH] 处理review 4.4
---
force-app/main/default/lwc/lexCancel/lexCancel.js | 18 -
force-app/main/default/lwc/lexCreateNotesEmail/lexCreateNotesEmail.js | 15 -
force-app/main/default/lwc/lexVOCAnswer/lexVOCAnswer.js | 16 -
force-app/main/default/classes/LightingButtonConstant.cls | 49 ++++
force-app/main/default/classes/MonthlyReportController.cls | 9
force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js | 16 -
force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js-meta.xml | 11 +
force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.css | 10 +
force-app/main/default/lwc/lexVOCSubmit/lexVOCSubmit.js | 15 -
force-app/main/default/lwc/lexSIStoOPD/lexSIStoOPD.js | 20 -
force-app/main/default/lwc/lexVOCFinish/lexVOCFinish.js | 16 -
force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js | 15 -
force-app/main/default/lwc/lexDispatchOCSMQARA/lexDispatchOCSMQARA.js | 16 -
force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js | 31 +-
force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.html | 6
force-app/main/default/lwc/lexComplete/lexComplete.html | 6
force-app/main/default/lwc/lexComplete/lexComplete.js | 70 +++++++
force-app/main/default/classes/ReportController.cls | 106 +++++-----
force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.html | 1
force-app/main/default/classes/LightingButtonConstant.cls-meta.xml | 5
force-app/main/default/lwc/lexComplete/lexComplete.css | 10 +
force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js | 15 -
force-app/main/default/lwc/lexComplete/lexComplete.js-meta.xml | 11 +
force-app/main/default/lwc/lexSubmitCompetitorReport/lexSubmitCompetitorReport.js | 16 -
force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js | 70 +++++++
25 files changed, 322 insertions(+), 251 deletions(-)
diff --git a/force-app/main/default/classes/LightingButtonConstant.cls b/force-app/main/default/classes/LightingButtonConstant.cls
new file mode 100644
index 0000000..2ec0e00
--- /dev/null
+++ b/force-app/main/default/classes/LightingButtonConstant.cls
@@ -0,0 +1,49 @@
+global without sharing class LightingButtonConstant {
+ //鍛ㄦ姤鏈堟姤鐨勭姸鎬佲�樿崏妗堜腑鈥�
+ public static final String STATUS_DRAFT = '鑽夋涓�';
+ //鎶ュ憡涔︾殑鐘舵�佲�樺畬姣曗��
+ public static final String STATUS_COMPLETE = '瀹屾瘯';
+ //鎶ュ憡涔︾殑鐘舵�佲�樺彇娑堚��
+ public static final String STATUS_CANCEL = '鍙栨秷';
+ //OCSM鎶ュ憡鐨勭姸鎬佲�樺緟鎶ュ憡鈥�
+ public static final String STATUS_TO_BE_REPORTED = '寰呮姤鍛�';
+ //OCSM鎶ュ憡鐨勭姸鎬佲�樻棤闇�鎶ュ憡鈥�
+ public static final String STATUS_TO_NOT_REPORT = '鏃犻渶鎶ュ憡';
+ //VOC鎶ュ憡鐨勭姸鎬佲�樼粨鏋滅‘璁ゅ畬姣曗��
+ public static final String STATUS_VOC_CONFIRMED = '缁撴灉纭瀹屾瘯';
+ //VOC鎶ュ憡鐨勭姸鎬佲�樺洖绛斿畬姣曗��
+ public static final String STATUS_VOC_END_OF_ANSWER = '鍥炵瓟瀹屾瘯';
+ //VOC鎶ュ憡鐨勭姸鎬佲�樼敵璇蜂腑鈥�
+ public static final String STATUS_VOC_APPLYING = '鐢宠珛涓�';
+ //VOC鎶ュ憡鐨勭姸鎬佲�樺垽瀹氬畬姣曗��
+ public static final String STATUS_VOC_CHECK_OVER = '鍒ゅ畾瀹屾瘯';
+ //VOC鎶ュ憡鐨勭姸鎬佲�樺～鍐欏畬姣曗��
+ public static final String STATUS_VOC_WRITE_OVER = '濉啓瀹屾瘯';
+ //VOC鎶ュ憡鐨勭姸鎬佲�樺畬姣曗��
+ public static final String STATUS_VOC_FINISH = '瀹屾瘯';
+ //鍛ㄦ姤鏈堟姤鐨勮褰曠被鍨嬪悕鈥樺懆鎶モ��
+ public static final String RECORD_TYPE_NAME_BY_MONTHLY_REPORT = '鍛ㄦ姤';
+ //鎶ュ憡涔︾殑璁板綍绫诲瀷鈥樻彁浜も��
+ public static final String RECORD_TYPE_NAME_BY_SUBMIT = '鎻愪氦';
+ //鎶ュ憡涔︾殑璁板綍绫诲瀷鈥樿窡鍙扳��
+ public static final String RECORD_TYPE_NAME_BY_FOLLOW_THE_STAGE = '璺熷彴';
+ //鎶ュ憡涔︾殑璁板綍绫诲瀷鈥極PD鈥�
+ public static final String RECORD_TYPE_NAME_BY_OPD= 'OPD';
+ //璁板綍绫诲瀷鐨刣eveloperName鈥楢SRCDecision鈥�
+ public static final String DEVELOPER_NAME_ASRC_DECISION = 'ASRCDecision';
+ //璁板綍绫诲瀷鐨刣eveloperName鈥楢SACDecision鈥�
+ public static final String DEVELOPER_NAME_ASAC_DECISION = 'ASACDecision';
+ //宸ヤ綔鍒嗙被鐨勯攢鍞湇鍔�
+ public static final String TYPE_OF_SALES_SERVICES = '閿�鍞湇鍔�';
+ //userAccess鍙傛暟鍚庣紑_Edit
+ public static final String USER_ACCESS_EDIT = '_Edit';
+ //userAccess鍙傛暟鍚庣紑_Read
+ public static final String USER_ACCESS_READ = '_Read';
+ public static final String CN_YES = '鏄�';
+ public static final String CN_NO = '鍚�';
+ public static final String VOC_NAME = 'VOC';
+ public static final String OK = 'OK';
+ public static final String SOBJECT_NAME_OF_REPORT_SHARE ='Report__Share';
+ public static final String SOBJECT_NAME_OF_VOC_SHARE = 'VOCShare__c';
+
+}
\ No newline at end of file
diff --git a/force-app/main/default/classes/LightingButtonConstant.cls-meta.xml b/force-app/main/default/classes/LightingButtonConstant.cls-meta.xml
new file mode 100644
index 0000000..fbbad0a
--- /dev/null
+++ b/force-app/main/default/classes/LightingButtonConstant.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/MonthlyReportController.cls b/force-app/main/default/classes/MonthlyReportController.cls
index a68b5da..3822866 100644
--- a/force-app/main/default/classes/MonthlyReportController.cls
+++ b/force-app/main/default/classes/MonthlyReportController.cls
@@ -1,4 +1,5 @@
public with sharing class MonthlyReportController {
+ //涓哄彇娑堟彁浜ょ浉搴旂殑js鎻愪緵鍒濆鍖栨暟鎹�
@AuraEnabled
public static InitData initForCancelSubmitButton (String recordId){
InitData res = new initData();
@@ -14,7 +15,7 @@
return res;
}
-
+ //涓哄垱寤簄otes閭鎿嶄綔鎻愪緵鍒濆鍖栨暟鎹�
@AuraEnabled
public static InitData initForCreateNoteEmailButton (String recordId) {
InitData res = new initData();
@@ -48,13 +49,13 @@
}
return res;
}
-
+ //鍙栨秷鎻愪氦鎿嶄綔鏇存柊鐩稿簲鏁版嵁
@AuraEnabled
public static void cancel(String recordId) {
try {
Monthly_Report__c report = [SELECT Id,Status__c,Submit_check_flag__c,RecordTypeId,Submit_time__c FROM Monthly_Report__c WHERE Id = :recordId LIMIT 1];
- report.Status__c = '鑽夋涓�';
- report.RecordTypeId = '01210000000Qggf';
+ report.Status__c = LightingButtonConstant.STATUS_DRAFT;
+ report.RecordTypeId = Schema.SObjectType.Monthly_Report__c.getRecordTypeInfosByName().get(LightingButtonConstant.RECORD_TYPE_NAME_BY_MONTHLY_REPORT).getRecordTypeId();
report.Submit_check_flag__c = false;
report.Submit_time__c = null;
update report;
diff --git a/force-app/main/default/classes/ReportController.cls b/force-app/main/default/classes/ReportController.cls
index 19c9e79..aea48b6 100644
--- a/force-app/main/default/classes/ReportController.cls
+++ b/force-app/main/default/classes/ReportController.cls
@@ -62,7 +62,7 @@
}
return res;
}
-
+ //缁橵OC缁撴灉纭鐩稿簲鐨刯s鎻愪緵鍒濆鍖栨暟鎹�
@AuraEnabled
public static InitData initForVOCConfirmButton (String recordId) {
InitData res = new initData();
@@ -134,7 +134,7 @@
return res;
}
-
+ //缁欏畬姣曠浉搴旂殑js鎻愪緵鍒濆鍖栨暟鎹�
@AuraEnabled
public static InitData initForCompleteButton(String recordId){
InitData res = new InitData();
@@ -147,13 +147,13 @@
}
return res;
}
-
+ //缁橧ntake universal code缂栬緫鐩稿簲鐨刯s鎻愪緵鍒濆鍖栨暟鎹�
@AuraEnabled
public static InitData initForASRCEditorButton(String recordId){
InitData res = new InitData();
- String recordTypeId = 'ASRCDecision';
+ String developerName = LightingButtonConstant.DEVELOPER_NAME_ASRC_DECISION;
try {
- PAE_DecisionRecord__c[] report = [SELECT LastModifiedDate, Id, Name, LastModifiedById,RecordType.DeveloperName FROM PAE_DecisionRecord__c where PAE_Report__c = :recordId And RecordType.DeveloperName = :recordTypeId Order by LastModifiedDate desc];
+ PAE_DecisionRecord__c[] report = [SELECT LastModifiedDate, Id, Name, LastModifiedById,RecordType.DeveloperName FROM PAE_DecisionRecord__c where PAE_Report__c = :recordId And RecordType.DeveloperName = :developerName Order by LastModifiedDate desc];
if (report != null && !report.isEmpty()) {
res.LastModifiedDate = report[0].LastModifiedDate;
res.Id = report[0].Id;
@@ -168,11 +168,11 @@
}
-
+ //缁橣inal universal code缂栬緫鐩稿簲鐨刯s鎻愪緵鍒濆鍖栨暟鎹�
@AuraEnabled
public static InitData initForASACEditorButton(String recordId){
InitData res = new InitData();
- String recordTypeId = 'ASACDecision';
+ String recordTypeId = LightingButtonConstant.DEVELOPER_NAME_ASAC_DECISION;
try {
PAE_DecisionRecord__c[] report = [SELECT LastModifiedDate, Id, Name, LastModifiedById,RecordType.DeveloperName FROM PAE_DecisionRecord__c where PAE_Report__c = :recordId And RecordType.DeveloperName = :recordTypeId Order by LastModifiedDate desc];
if (report != null && !report.isEmpty()) {
@@ -189,7 +189,7 @@
}
-
+ //缁橭PDtoSIS鐩稿簲鐨刯s鎻愪緵鍒濆鍖栨暟鎹�
@AuraEnabled
public static InitData initForOPDtoSISButton(String recordId){
InitData res = new InitData();
@@ -222,7 +222,7 @@
try {
Report__c rac = new Report__c();
rac.Id = reocrdId;
- rac.Status__c = '鎻愪氦';
+ rac.Status__c = LightingButtonConstant.RECORD_TYPE_NAME_BY_SUBMIT;
rac.Submit_time__c = Datetime.now();
rac.Submit_report_day__c = Date.today();
update rac;
@@ -230,13 +230,13 @@
throw new AuraHandledException(e.getMessage());
}
}
-
+ //OPDtoSIS鎿嶄綔鏇存柊鐩稿簲鏁版嵁
@AuraEnabled
- public static void updateForOPDtoSISButton(String recordId,String recordTypeId){
+ public static void updateForOPDtoSISButton(String recordId){
try {
Report__c rac = new Report__c();
rac.Id = recordId;
- rac.RecordTypeId = recordTypeId;
+ rac.RecordTypeId = Schema.SObjectType.Report__c.getRecordTypeInfosByName().get(LightingButtonConstant.RECORD_TYPE_NAME_BY_OPD).getRecordTypeId();
update rac;
} catch (Exception e) {
System.debug(LoggingLevel.INFO, '*** e: ' + e);
@@ -249,7 +249,7 @@
try {
Report__c rac = new Report__c();
rac.Id = recordId;
- rac.Status__c = '鑽夋涓�';
+ rac.Status__c = LightingButtonConstant.STATUS_DRAFT;
rac.Submit_report_day__c = null;
rac.Submit_time__c = null;
update rac;
@@ -257,14 +257,14 @@
throw new AuraHandledException(e.getMessage());
}
}
-
+ //瀹屾瘯鎿嶄綔鏇存柊鐩稿簲鏁版嵁
@AuraEnabled
- public static void updateForCompleteButton(String recordId,String recordTypeId){
+ public static void updateForCompleteButton(String recordId){
Report__c rac = new Report__c();
try {
rac.Id = recordId;
- rac.Status__c = '瀹屾瘯';
- rac.RecordTypeId = recordTypeId;
+ rac.Status__c = LightingButtonConstant.STATUS_COMPLETE;
+ rac.RecordTypeId = Schema.SObjectType.Report__c.getRecordTypeInfosByName().get(LightingButtonConstant.VOC_NAME).getRecordTypeId();
update rac;
} catch (Exception e) {
throw new AuraHandledException(e.getMessage());
@@ -276,7 +276,7 @@
try {
Report__c rac = new Report__c();
rac.Id = recordId;
- rac.OCSMAdministrativeReportStatus__c = '寰呮姤鍛�';
+ rac.OCSMAdministrativeReportStatus__c = LightingButtonConstant.STATUS_TO_BE_REPORTED;
update rac;
} catch (Exception e) {
System.debug(LoggingLevel.INFO, '*** e: ' + e);
@@ -285,11 +285,11 @@
//SIStoOPD鎿嶄綔鏇存柊鐩稿簲鏁版嵁
@AuraEnabled
- public static String updateForSIStoOPDButton(String recordId,String recordTypeId){
+ public static String updateForSIStoOPDButton(String recordId){
Report__c rac = new Report__c();
try {
rac.Id = recordId;
- rac.RecordTypeId = recordTypeId;
+ rac.RecordTypeId = Schema.SObjectType.Report__c.getRecordTypeInfosByName().get(LightingButtonConstant.RECORD_TYPE_NAME_BY_FOLLOW_THE_STAGE).getRecordTypeId();
update rac;
return null;
} catch (Exception e) {
@@ -314,7 +314,7 @@
try {
Report__c rac = new Report__c();
rac.Id = recordId;
- rac.OCSMAdministrativeReportStatus__c = '鏃犻渶鎶ュ憡';
+ rac.OCSMAdministrativeReportStatus__c = LightingButtonConstant.STATUS_TO_NOT_REPORT;
update rac;
} catch (Exception e) {
System.debug(LoggingLevel.INFO, '*** e: ' + e);
@@ -327,24 +327,24 @@
try {
Report__c rac = new Report__c();
rac.Id = recordId;
- rac.Status__c = '鍙栨秷';
+ rac.Status__c = LightingButtonConstant.STATUS_CANCEL;
update rac;
} catch (Exception e) {
System.debug(LoggingLevel.INFO, '*** e: ' + e);
}
}
-
+ //VOC缁撴灉纭鏇存柊鐩稿簲鏁版嵁
@AuraEnabled
public static void updateForVOCConfirmButton(String recordId,String Satisfy,String Satisfy1){
try {
Report__c rac = new Report__c();
rac.Id = recordId;
- if (Satisfy == '鏄�') {
- rac.Status__c = '缁撴灉纭瀹屾瘯';
- } else if (Satisfy == '鍚�') {
+ if (Satisfy == LightingButtonConstant.CN_YES) {
+ rac.Status__c = LightingButtonConstant.STATUS_VOC_CONFIRMED;
+ } else if (Satisfy == LightingButtonConstant.CN_NO) {
// 瀵惧繙绲愭灉锛堜竴鍥炵洰锛夈伀鍊ゃ仾銇戙倢銇般�佷竴鍥炵洰銇�屽惁銆嶃仺瑕嬨仾銇�
- if (Satisfy1 != '鍚�') {
+ if (Satisfy1 != LightingButtonConstant.CN_NO) {
Report__c[] records = [SELECT Id, VOC_Satisfy__c, VOC_Unsatisfy_Reason__c, VOC_follow_up_result__c, VOC_solution_category__c FROM Report__c WHERE Id = :recordId];
rac.VOC_Satisfy__c = null;
rac.VOC_Unsatisfy_Reason__c = null;
@@ -354,11 +354,11 @@
rac.VOC_Unsatisfy_Reason1__c = records[0].VOC_Unsatisfy_Reason__c;
rac.VOC_follow_up_result1__c = records[0].VOC_follow_up_result__c;
rac.VOC_solution_category1__c = records[0].VOC_solution_category__c;
- rac.Status__c = '鑽夋涓�';
+ rac.Status__c = LightingButtonConstant.STATUS_DRAFT;
}
// 瀵惧繙绲愭灉锛堜竴鍥炵洰锛夈伀鍊ゃ亗銈屻伆銆佷簩鍥炵洰銇�屽惁銆嶃仺瑕嬨仾銇�
else {
- rac.Status__c = '缁撴灉纭瀹屾瘯';
+ rac.Status__c = LightingButtonConstant.STATUS_VOC_CONFIRMED;
}
}
update rac;
@@ -371,7 +371,7 @@
public static String updateForVOCAnswerButton(String recordId){
try {
Report__c rac = [select Status__c from Report__c where Id = :recordId];
- rac.Status__c = '鍥炵瓟瀹屾瘯';
+ rac.Status__c = LightingButtonConstant.STATUS_VOC_END_OF_ANSWER;
update rac;
return null;
} catch (Exception e) {
@@ -386,13 +386,13 @@
}
}
-
+ //鎻愪氦绔炰簤瀵规墜鎶ュ憡鏇存柊鐩稿簲鏁版嵁
@AuraEnabled
public static void updateForSubmitCompetitorReportButton(String recordId){
try {
Report__c rac = new Report__c();
rac.Id = recordId;
- rac.Status__c = '鐢宠珛涓�';
+ rac.Status__c = LightingButtonConstant.STATUS_VOC_APPLYING;
rac.Submit_time__c = Datetime.now();
rac.Submit_report_day__c = Date.today();
rac.Date__c = Date.today();
@@ -410,23 +410,23 @@
rac.Id = recordId;
User[] records = [SELECT Job_Category__c FROM User WHERE Id = :createdById];
List<String> userAccess = new List<String>();
- if (records[0].Job_Category__c == '閿�鍞湇鍔�') {
- userAccess.add(rac.JingliApprovalManager__c + '_Read');
- userAccess.add(rac.BuchangApprovalManager__c + '_Read');
+ if (records[0].Job_Category__c == LightingButtonConstant.TYPE_OF_SALES_SERVICES) {
+ userAccess.add(rac.JingliApprovalManager__c + LightingButtonConstant.USER_ACCESS_READ);
+ userAccess.add(rac.BuchangApprovalManager__c + LightingButtonConstant.USER_ACCESS_READ);
rac.VOC_CreatedBy_jingli__c = rac.JingliApprovalManager__c;
rac.VOC_CreatedBy_buzhang__c = rac.BuchangApprovalManager__c;
} else {
- userAccess.add(rac.SalesManager__c + '_Read');
- userAccess.add(rac.BuchangApprovalManagerSales__c + '_Read');
+ userAccess.add(rac.SalesManager__c + LightingButtonConstant.USER_ACCESS_READ);
+ userAccess.add(rac.BuchangApprovalManagerSales__c + LightingButtonConstant.USER_ACCESS_READ);
rac.VOC_CreatedBy_jingli__c = rac.SalesManager__c;
rac.VOC_CreatedBy_buzhang__c = rac.BuchangApprovalManagerSales__c;
}
- userAccess.add(rac.ZongjianApprovalManager__c + '_Read');
- String rtn = ControllerUtil.setSObjectShare('Report__Share','VOCShare__c',recordId,userAccess,rac.Owner.Id);
- if (rtn != 'OK') {
+ userAccess.add(rac.ZongjianApprovalManager__c + LightingButtonConstant.USER_ACCESS_READ);
+ String rtn = ControllerUtil.setSObjectShare(LightingButtonConstant.SOBJECT_NAME_OF_REPORT_SHARE,LightingButtonConstant.SOBJECT_NAME_OF_VOC_SHARE,recordId,userAccess,rac.Owner.Id);
+ if (rtn != LightingButtonConstant.OK) {
return;
}
- rac.Status__c = '濉啓瀹屾瘯';
+ rac.Status__c = LightingButtonConstant.STATUS_VOC_WRITE_OVER;
rac.Submit_time__c = Date.today();
rac.Submit_report_day__c = Date.today();
update rac;
@@ -435,14 +435,15 @@
}
}
+ //VOC鍒ゅ畾鏇存柊鐩稿簲鏁版嵁
@AuraEnabled
public static String updateForVOCCheckButton (String recordId,String isVOC,String personId) {
try {
Report__c rac = [select Owner.Id,VOC_jingli__r.Id,VOC_buzhang__r.Id,VOC_zongjian__r.Id,VOC_Finish__c,VOC_share_date__c,Responsible_Person__r.Id from Report__c where Id = :recordId];
- if (isVOC == 'VOC') {
+ if (isVOC == LightingButtonConstant.VOC_NAME) {
// VOC瀵惧繙鑰呫伄绲岀悊閮ㄩ暦绶忕洠銈掕ō瀹�
User[] records = [SELECT Id, Job_Category__c, JingliApprovalManager__c, SalesManager__c, BuchangApprovalManager__c, BuchangApprovalManagerSales__c, ZongjianApprovalManager__c FROM User WHERE Id = :personId];
- if (records[0].job_Category__c == '閿�鍞湇鍔�') {
+ if (records[0].job_Category__c == LightingButtonConstant.TYPE_OF_SALES_SERVICES) {
rac.VOC_jingli__c = records[0].JingliApprovalManager__c == null ? '' : records[0].JingliApprovalManager__c;
rac.VOC_buzhang__c = records[0].BuchangApprovalManager__c == null ? '' : records[0].BuchangApprovalManager__c;
} else {
@@ -450,23 +451,23 @@
rac.VOC_buzhang__c = records[0].BuchangApprovalManagerSales__c == null ? '' : records[0].BuchangApprovalManagerSales__c;
}
rac.VOC_zongjian__c = records[0].ZongjianApprovalManager__c == null ? '' : records[0].ZongjianApprovalManager__c;
- rac.Status__c = '鍒ゅ畾瀹屾瘯';
+ rac.Status__c = LightingButtonConstant.STATUS_VOC_CHECK_OVER;
rac.VOC_Finish__c = false;
Date serverTimestamp = Date.today();
rac.VOC_share_date__c = serverTimestamp;
// share
List<String> userAccess = new List<String>();
- userAccess.add(rac.Responsible_Person__c + '_Edit');
- userAccess.add(rac.VOC_jingli__c + '_Read');
- userAccess.add(rac.VOC_buzhang__c + '_Read');
- userAccess.add(rac.VOC_zongjian__c + '_Read');
- String rtn = ControllerUtil.setSObjectShare('Report__Share','VOCShare__c',recordId,userAccess,rac.Owner.Id);
- if (rtn != 'OK') {
+ userAccess.add(rac.Responsible_Person__c + LightingButtonConstant.USER_ACCESS_EDIT);
+ userAccess.add(rac.VOC_jingli__c + LightingButtonConstant.USER_ACCESS_READ);
+ userAccess.add(rac.VOC_buzhang__c + LightingButtonConstant.USER_ACCESS_READ);
+ userAccess.add(rac.VOC_zongjian__c + LightingButtonConstant.USER_ACCESS_READ);
+ String rtn = ControllerUtil.setSObjectShare(LightingButtonConstant.SOBJECT_NAME_OF_REPORT_SHARE,LightingButtonConstant.SOBJECT_NAME_OF_VOC_SHARE,recordId,userAccess,rac.Owner.Id);
+ if (rtn != LightingButtonConstant.OK) {
return null;
}
update rac;
} else {
- rac.Status__c = '瀹屾瘯';
+ rac.Status__c = LightingButtonConstant.STATUS_VOC_FINISH;
rac.VOC_Finish__c = true;
update rac;
}
@@ -477,11 +478,12 @@
return exc;
}
}
+ //VOC瀹屾瘯鎿嶄綔鏇存柊鐩稿簲鏁版嵁
@AuraEnabled
public static void updateForVOCFinishButton (String recordId) {
try {
Report__c report = [select Id,Status__C from Report__c where Id = :recordId];
- report.Status__c = '瀹屾瘯';
+ report.Status__c = LightingButtonConstant.STATUS_VOC_FINISH;
update report;
} catch (Exception e) {
System.debug(LoggingLevel.INFO, '*** e: ' + e);
diff --git a/force-app/main/default/lwc/lexCancel/lexCancel.js b/force-app/main/default/lwc/lexCancel/lexCancel.js
index 18c6654..d98fdef 100644
--- a/force-app/main/default/lwc/lexCancel/lexCancel.js
+++ b/force-app/main/default/lwc/lexCancel/lexCancel.js
@@ -9,23 +9,7 @@
@api recordId;
status;
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);
diff --git a/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.html b/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.html
index 02203b4..f8af820 100644
--- a/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.html
+++ b/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.html
@@ -1,5 +1,6 @@
<template>
<div class="cancelSubmitHolder" if:true={IsLoading}>
<lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+ <lightning-button label="Show Toast" onclick={showSuccess}></lightning-button>
</div>
</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js b/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js
index 4826892..c3eb560 100644
--- a/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js
+++ b/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js
@@ -6,29 +6,12 @@
import cancel from '@salesforce/apex/MonthlyReportController.cancel';
import UserInfo_Owner from '@salesforce/apex/TaskFeedbackController.UserInfo_Owner';
import { updateRecord } from 'lightning/uiRecordApi';
-
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
export default class LexCancelSubmit extends LightningElement {
@api recordId;//OwnerId
ownerId;
monthlyReportId;
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({
@@ -42,6 +25,7 @@
this.cancelSubmit();
console.log("end");
this.dispatchEvent(new CloseActionScreenEvent());
+ this.showToast();
this.updateRecordView(this.recordId);
//window.location.replace("https://ocsm--partial.sandbox.lightning.force.com/lightning/r/Monthly_Report__c/" + this.monthlyReportId + "/view");
@@ -52,6 +36,15 @@
}).finally(() => {
});
+ }
+
+ showToast() {
+ const event = new ShowToastEvent({
+ title: '',
+ message: '鍙栨秷鎻愪氦鎴愬姛锛�',
+ variant: 'success'
+ });
+ this.dispatchEvent(event);
}
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
@@ -64,7 +57,7 @@
});
console.log("321");
} else {
- alert("鍙懆鎶ョ殑鎵�鏈変汉鍙互鍙栨秷");
+ this.showToast("鍙湁鍛ㄦ姤鐨勬墍鏈変汉鍙互鍙栨秷","error");
}
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexComplete/lexComplete.css b/force-app/main/default/lwc/lexComplete/lexComplete.css
new file mode 100644
index 0000000..f9aba1f
--- /dev/null
+++ b/force-app/main/default/lwc/lexComplete/lexComplete.css
@@ -0,0 +1,10 @@
+.completeHolder{
+ position: relative;
+ display: inline-block;
+ width: 80px;
+ height: 80px;
+ text-align: center;
+}
+.container .uiContainerManager{
+ display: none !important;
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexComplete/lexComplete.html b/force-app/main/default/lwc/lexComplete/lexComplete.html
new file mode 100644
index 0000000..7c1968c
--- /dev/null
+++ b/force-app/main/default/lwc/lexComplete/lexComplete.html
@@ -0,0 +1,6 @@
+<template>
+ <div class="completeHolder" 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/lexComplete/lexComplete.js b/force-app/main/default/lwc/lexComplete/lexComplete.js
new file mode 100644
index 0000000..89131c9
--- /dev/null
+++ b/force-app/main/default/lwc/lexComplete/lexComplete.js
@@ -0,0 +1,70 @@
+import { LightningElement,wire,track,api} from 'lwc';
+import { CurrentPageReference } from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import init from '@salesforce/apex/ReportController.initForCompleteButton';
+import updateForCompleteButton from '@salesforce/apex/ReportController.updateForCompleteButton';
+import UserInfo_Owner from '@salesforce/apex/TaskFeedbackController.UserInfo_Owner';
+import { updateRecord } from 'lightning/uiRecordApi';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+export default class LexComplete extends LightningElement {
+ @api recordId;
+ profileId;
+ status;
+ IsLoading = true;
+
+ connectedCallback () {
+ console.log(this.recordId);
+ init({
+ recordId: this.recordId
+ }).then(result => {
+ console.log(result);
+ if (result != null) {
+ this.IsLoading = false;
+ this.status = result.status;
+ this.profileId = result.profileId;
+ this.complete();
+ this.dispatchEvent(new CloseActionScreenEvent());
+ //window.location.replace("https://ocsm--partial.sandbox.lightning.force.com/lightning/r/Report__c/" + this.recordId + "/view");
+ }
+ }).catch(error => {
+ console.log("error");
+ console.log(error);
+ }).finally(() => {
+
+ });
+ //this.updateRecordView(this.recordId);
+ }
+
+ showToast(msg,type) {
+ const event = new ShowToastEvent({
+ title: '',
+ message: msg,
+ variant: type
+ });
+ this.dispatchEvent(event);
+ }
+
+ updateRecordView(recordId) {
+ updateRecord({fields: { Id: recordId }});
+ }
+
+
+
+ complete () {
+ // 闄嗚儨锛岃儭杩畨锛岀郴缁熺鐞嗗憳浠ュ娌℃湁鏉冮檺
+ if (UserInfo_Owner.Id != "00510000004reg2" && UserInfo_Owner.Id != "00510000000gWAE" && this.profileId != "00e10000000Y3o5") {
+ ShowToastEvent("浣犳病鏈夋潈闄�","error");
+ return;
+ }
+ if (this.status == "瀹屾瘯") {
+ ShowToastEvent("宸茬粡瀹屾瘯锛�","error");
+ return;
+ }
+ updateForCompleteButton({
+ recordId: this.recordId
+ }).then(result =>{
+ this.updateRecordView(this.recordId);
+ this.showToast("瀹屾瘯鎴愬姛锛�","success");
+ });
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexComplete/lexComplete.js-meta.xml b/force-app/main/default/lwc/lexComplete/lexComplete.js-meta.xml
new file mode 100644
index 0000000..329e839
--- /dev/null
+++ b/force-app/main/default/lwc/lexComplete/lexComplete.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>54.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__RecordPage</target>
+ <target>lightning__AppPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCreateNotesEmail/lexCreateNotesEmail.js b/force-app/main/default/lwc/lexCreateNotesEmail/lexCreateNotesEmail.js
index 0ede44e..ff0e10a 100644
--- a/force-app/main/default/lwc/lexCreateNotesEmail/lexCreateNotesEmail.js
+++ b/force-app/main/default/lwc/lexCreateNotesEmail/lexCreateNotesEmail.js
@@ -18,21 +18,6 @@
IsLoading = true;
url;
- @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(){
diff --git a/force-app/main/default/lwc/lexDispatchOCSMQARA/lexDispatchOCSMQARA.js b/force-app/main/default/lwc/lexDispatchOCSMQARA/lexDispatchOCSMQARA.js
index 6436e0b..62dbcda 100644
--- a/force-app/main/default/lwc/lexDispatchOCSMQARA/lexDispatchOCSMQARA.js
+++ b/force-app/main/default/lwc/lexDispatchOCSMQARA/lexDispatchOCSMQARA.js
@@ -9,22 +9,6 @@
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);
diff --git a/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js b/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js
index c52ad47..0680b20 100644
--- a/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js
+++ b/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js
@@ -13,21 +13,6 @@
AwareDate;
- @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(){
diff --git a/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js b/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js
index 91b2722..916ab25 100644
--- a/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js
+++ b/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js
@@ -11,22 +11,6 @@
OCSMAdministrativeReportStatus;
awareDate;
- @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(){
diff --git a/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.css b/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.css
new file mode 100644
index 0000000..2a3dbc5
--- /dev/null
+++ b/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.css
@@ -0,0 +1,10 @@
+.opdToSISHolder{
+ position: relative;
+ display: inline-block;
+ width: 80px;
+ height: 80px;
+ text-align: center;
+}
+.container .uiContainerManager{
+ display: none !important;
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.html b/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.html
new file mode 100644
index 0000000..de73f87
--- /dev/null
+++ b/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.html
@@ -0,0 +1,6 @@
+<template>
+ <div class="opdToSISHolder" 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/lexOPDtoSIS/lexOPDtoSIS.js b/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js
new file mode 100644
index 0000000..0052ac3
--- /dev/null
+++ b/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js
@@ -0,0 +1,70 @@
+import { api, wire,LightningElement } from 'lwc';
+import { CurrentPageReference } from "lightning/navigation";
+import { CloseActionScreenEvent } from 'lightning/actions';
+import updateForOPDtoSISButton from '@salesforce/apex/ReportController.updateForOPDtoSISButton';
+import init from '@salesforce/apex/ReportController.initForOPDtoSISButton';
+import { updateRecord } from 'lightning/uiRecordApi';
+import UserInfo_Owner from '@salesforce/apex/TaskFeedbackController.UserInfo_Owner';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+
+export default class LexOPDtoSIS extends LightningElement {
+ @api recordId;
+ IsLoading = true;
+ ownerId;
+ status;
+ userId;
+
+
+
+
+ connectedCallback(){
+ console.log(this.recordId);
+ init({
+ recordId: this.recordId
+ }).then(result => {
+ console.log(result);
+ if (result != null) {
+ this.IsLoading = false;
+ this.ownerId = result.ownerId;
+ this.status = result.status;
+ this.userId = result.userId;
+ this.OPDtoSIS();
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
+ }).catch(error => {
+ console.log("error");
+ console.log(error);
+ }).finally(() => {
+
+ });
+
+ }
+
+ showToast(msg,type) {
+ const event = new ShowToastEvent({
+ title: '',
+ message: msg,
+ variant: type
+ });
+ this.dispatchEvent(event);
+ }
+
+ updateRecordView(recordId) {
+ updateRecord({fields: { Id: recordId }});
+ }
+
+ OPDtoSIS () {
+ if(this.ownerId == this.userId && this.status == "鑽夋涓�") {
+ updateForOPDtoSISButton({
+ recordId: this.recordId
+ }).then(result =>{
+ this.updateRecordView(this.recordId);
+ this.showToast("鎴愬姛锛�","success");
+ });
+ } else {
+ this.showToast("鍙崏妗堜腑鐘舵�佸強OPD/SIS鎶ュ憡涔︾殑鎵�鏈変汉鍙互鎻愪氦","error");
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js-meta.xml b/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js-meta.xml
new file mode 100644
index 0000000..3392981
--- /dev/null
+++ b/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>54.0</apiVersion>
+ <isExposed>true</isExposed>
+ <targets>
+ <target>lightning__RecordPage</target>
+ <target>lightning__AppPage</target>
+ <target>lightning__HomePage</target>
+ <target>lightning__RecordAction</target>
+ </targets>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSIStoOPD/lexSIStoOPD.js b/force-app/main/default/lwc/lexSIStoOPD/lexSIStoOPD.js
index b612e13..b85d07d 100644
--- a/force-app/main/default/lwc/lexSIStoOPD/lexSIStoOPD.js
+++ b/force-app/main/default/lwc/lexSIStoOPD/lexSIStoOPD.js
@@ -12,24 +12,7 @@
ownerId;
status;
userId;
- recordTypeId = '01210000000Qekj';
errorMsg;
- @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);
@@ -73,8 +56,7 @@
SIStoOPD () {
if(this.ownerId == this.userId && this.status == "鑽夋涓�") {
updateForSIStoOPDButton({
- recordId: this.recordId,
- recordTypeId: this.recordTypeId
+ recordId: this.recordId
}).then(result=>{
if(result){
this.showToast(result,"error");
diff --git a/force-app/main/default/lwc/lexSubmitCompetitorReport/lexSubmitCompetitorReport.js b/force-app/main/default/lwc/lexSubmitCompetitorReport/lexSubmitCompetitorReport.js
index c5d88b6..598b4b9 100644
--- a/force-app/main/default/lwc/lexSubmitCompetitorReport/lexSubmitCompetitorReport.js
+++ b/force-app/main/default/lwc/lexSubmitCompetitorReport/lexSubmitCompetitorReport.js
@@ -10,22 +10,6 @@
@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;
- }
- }
- }
-
updateRecordView(recordId) {
updateRecord({fields: { Id: recordId }});
}
diff --git a/force-app/main/default/lwc/lexVOCAnswer/lexVOCAnswer.js b/force-app/main/default/lwc/lexVOCAnswer/lexVOCAnswer.js
index 8ae7088..7915a17 100644
--- a/force-app/main/default/lwc/lexVOCAnswer/lexVOCAnswer.js
+++ b/force-app/main/default/lwc/lexVOCAnswer/lexVOCAnswer.js
@@ -11,22 +11,6 @@
status;
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({
diff --git a/force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js b/force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js
index 74d4c9f..4d006a8 100644
--- a/force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js
+++ b/force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js
@@ -16,21 +16,6 @@
profileId;
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);
diff --git a/force-app/main/default/lwc/lexVOCFinish/lexVOCFinish.js b/force-app/main/default/lwc/lexVOCFinish/lexVOCFinish.js
index 5297347..f3decda 100644
--- a/force-app/main/default/lwc/lexVOCFinish/lexVOCFinish.js
+++ b/force-app/main/default/lwc/lexVOCFinish/lexVOCFinish.js
@@ -12,22 +12,6 @@
IsLoading = true;
profileId;
- @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({
diff --git a/force-app/main/default/lwc/lexVOCSubmit/lexVOCSubmit.js b/force-app/main/default/lwc/lexVOCSubmit/lexVOCSubmit.js
index 39e64f0..58c0877 100644
--- a/force-app/main/default/lwc/lexVOCSubmit/lexVOCSubmit.js
+++ b/force-app/main/default/lwc/lexVOCSubmit/lexVOCSubmit.js
@@ -11,21 +11,6 @@
createdById;
status;
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);
--
Gitblit v1.9.1