From d1420a631e07eb3837dee3bc0926f15036379279 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期二, 11 四月 2023 09:14:06 +0800
Subject: [PATCH] 按钮整体修改4.11
---
force-app/main/default/lwc/lexCancelSubmitReport/lexCancelSubmitReport.js | 9 +++
force-app/main/default/lwc/lexCancel/lexCancel.js | 10 +++
force-app/main/default/lwc/lexCreateNotesEmail/lexCreateNotesEmail.js | 9 ++
force-app/main/default/lwc/lexVOCConfirm/lexVOCConfirm.js | 10 +++
force-app/main/default/lwc/lexVOCAnswer/lexVOCAnswer.js | 10 +++
force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js | 10 +++
force-app/main/default/lwc/lexComplete/lexComplete.js | 10 +++
force-app/main/default/lwc/lexVOCSubmit/lexVOCSubmit.js | 10 +++
force-app/main/default/lwc/lexSIStoOPD/lexSIStoOPD.js | 12 +++
force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js | 5 -
force-app/main/default/lwc/lexVOCFinish/lexVOCFinish.js | 10 +++
force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js | 13 ++++
force-app/main/default/lwc/lexSubmitCompetitorReport/lexSubmitCompetitorReport.js | 10 +++
force-app/main/default/lwc/lexDispatchOCSMQARA/lexDispatchOCSMQARA.js | 10 +++
force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js | 24 +++++--
force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js | 10 +++
16 files changed, 148 insertions(+), 24 deletions(-)
diff --git a/force-app/main/default/lwc/lexCancel/lexCancel.js b/force-app/main/default/lwc/lexCancel/lexCancel.js
index 302de36..29ffc5c 100644
--- a/force-app/main/default/lwc/lexCancel/lexCancel.js
+++ b/force-app/main/default/lwc/lexCancel/lexCancel.js
@@ -1,3 +1,11 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-04-07 09:02:03
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-04-11 09:00:54
+ */
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
@@ -37,7 +45,6 @@
this.status = result.status;
console.log(this.status);
this.cancel();
- this.IsLoading = false;
}
}).catch(error => {
@@ -89,6 +96,7 @@
}).then(result =>{
this.showToast("鍙栨秷鎴愬姛锛�","success");
this.updateRecordView(this.recordId);
+ this.IsLoading = false;
this.dispatchEvent(new CloseActionScreenEvent());
});
}
diff --git a/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js b/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js
index 85014ed..f5e217a 100644
--- a/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js
+++ b/force-app/main/default/lwc/lexCancelSubmit/lexCancelSubmit.js
@@ -1,3 +1,11 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-04-07 09:02:03
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-04-11 09:05:05
+ */
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
@@ -37,15 +45,10 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.ownerId = result.ownerId;
this.monthlyReportId = result.Id;
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");
}
}).catch(error => {
@@ -56,11 +59,11 @@
});
}
- showToast() {
+ showToast(msg,type) {
const event = new ShowToastEvent({
title: '',
- message: '鍙栨秷鎻愪氦鎴愬姛锛�',
- variant: 'success'
+ message: msg,
+ variant: type
});
this.dispatchEvent(event);
}
@@ -72,10 +75,15 @@
if(this.ownerId == UserInfo_Owner.Id) {
cancel({
recordId: this.recordId
+ }).then(result=>{
+ this.showToast("鎴愬姛","success");
+ this.updateRecordView(this.recordId);
+ this.dispatchEvent(new CloseActionScreenEvent());
});
console.log("321");
} else {
this.showToast("鍙湁鍛ㄦ姤鐨勬墍鏈変汉鍙互鍙栨秷","error");
+ this.dispatchEvent(new CloseActionScreenEvent());
}
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCancelSubmitReport/lexCancelSubmitReport.js b/force-app/main/default/lwc/lexCancelSubmitReport/lexCancelSubmitReport.js
index 5f4ce92..00557d0 100644
--- a/force-app/main/default/lwc/lexCancelSubmitReport/lexCancelSubmitReport.js
+++ b/force-app/main/default/lwc/lexCancelSubmitReport/lexCancelSubmitReport.js
@@ -1,3 +1,11 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-04-07 09:02:03
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-04-11 09:06:00
+ */
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
@@ -35,6 +43,7 @@
}).then(result =>{
this.showToast("鍙栨秷鎻愪氦鎴愬姛锛�","success");
this.updateRecordView(this.recordId);
+ this.IsLoading = false;
this.dispatchEvent(new CloseActionScreenEvent());
}).catch(error=>{
this.showToast(error,"error");
diff --git a/force-app/main/default/lwc/lexComplete/lexComplete.js b/force-app/main/default/lwc/lexComplete/lexComplete.js
index 11e315a..27029f0 100644
--- a/force-app/main/default/lwc/lexComplete/lexComplete.js
+++ b/force-app/main/default/lwc/lexComplete/lexComplete.js
@@ -1,3 +1,11 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-04-07 09:02:03
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-04-11 09:06:48
+ */
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
@@ -35,7 +43,6 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.status = result.status;
this.profileId = result.profileId;
this.complete();
@@ -79,6 +86,7 @@
updateForCompleteButton({
recordId: this.recordId
}).then(result =>{
+ this.IsLoading = false;
this.updateRecordView(this.recordId);
this.showToast("瀹屾瘯鎴愬姛锛�","success");
});
diff --git a/force-app/main/default/lwc/lexCreateNotesEmail/lexCreateNotesEmail.js b/force-app/main/default/lwc/lexCreateNotesEmail/lexCreateNotesEmail.js
index 3eb1154..3130703 100644
--- a/force-app/main/default/lwc/lexCreateNotesEmail/lexCreateNotesEmail.js
+++ b/force-app/main/default/lwc/lexCreateNotesEmail/lexCreateNotesEmail.js
@@ -1,3 +1,11 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-03-27 13:53:40
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-04-10 14:22:27
+ */
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
@@ -85,6 +93,5 @@
+"%0D%0A" + "杩炴帴锛�"
+ this.drSumUrl
+"%0D%0A").substring(0,320).split("<br>").join("%0D%0A");
-
}
}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexDispatchOCSMQARA/lexDispatchOCSMQARA.js b/force-app/main/default/lwc/lexDispatchOCSMQARA/lexDispatchOCSMQARA.js
index 04d513c..09c3a26 100644
--- a/force-app/main/default/lwc/lexDispatchOCSMQARA/lexDispatchOCSMQARA.js
+++ b/force-app/main/default/lwc/lexDispatchOCSMQARA/lexDispatchOCSMQARA.js
@@ -1,3 +1,11 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-04-07 09:02:03
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-04-11 09:07:34
+ */
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
@@ -28,7 +36,6 @@
connectedCallback(){
console.log(this.recordId);
- this.IsLoading = false;
this.DispatchOCSMQARA();
}
@@ -53,6 +60,7 @@
}).then(result =>{
this.showToast("鎴愬姛","success");
this.updateRecordView(this.recordId);
+ this.IsLoading = false;
this.dispatchEvent(new CloseActionScreenEvent());
});
}
diff --git a/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js b/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js
index 06e8cda..6b44bc5 100644
--- a/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js
+++ b/force-app/main/default/lwc/lexOCSMNoToReportForReport/lexOCSMNoToReportForReport.js
@@ -1,3 +1,11 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-03-28 15:59:44
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-04-11 09:08:30
+ */
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
@@ -32,13 +40,17 @@
connectedCallback(){
+ console.log("123");
init({
recordId: this.recordId
}).then(result=>{
+ console.log(result);
this.OCSMAdministrativeReportDate = result.OCSMAdministrativeReportDate;
this.OCSMAdministrativeReportNumber = result.OCSMAdministrativeReportNumber;
this.AwareDate = result.awareDate;
this.noToReport();
+ }).catch(error=>{
+ console.log(error);
});
}
@@ -72,6 +84,7 @@
}).then(result=>{
this.showToast("OCSM涓嶈鎶ュ憡鎴愬姛","success");
this.updateRecordView(this.recordId);
+ this.IsLoading = false;
this.dispatchEvent(new CloseActionScreenEvent());
});
}else{
diff --git a/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js b/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js
index 4f69994..fab2fbb 100644
--- a/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js
+++ b/force-app/main/default/lwc/lexOCSMToReport/lexOCSMToReport.js
@@ -1,3 +1,11 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-04-07 09:02:03
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-04-11 09:09:14
+ */
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
@@ -35,7 +43,6 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.OCSMAdministrativeReportStatus = result.OCSMAdministrativeReportStatus;
this.awareDate = result.awareDate;
this.toReport();
@@ -76,6 +83,7 @@
}).then(result =>{
this.showToast("鎴愬姛","success");
this.updateRecordView(this.recordId);
+ this.IsLoading = false;
this.dispatchEvent(new CloseActionScreenEvent());
});
}else{
diff --git a/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js b/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js
index c283bb6..ef83f36 100644
--- a/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js
+++ b/force-app/main/default/lwc/lexOPDtoSIS/lexOPDtoSIS.js
@@ -1,3 +1,11 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-04-07 09:02:03
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-04-11 09:10:06
+ */
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
@@ -73,13 +81,13 @@
}).then(result =>{
this.updateRecordView(this.recordId);
this.showToast("鎴愬姛锛�","success");
+ this.IsLoading = false;
this.dispatchEvent(new CloseActionScreenEvent());
});
} else {
this.showToast("鍙崏妗堜腑鐘舵�佸強OPD/SIS鎶ュ憡涔︾殑鎵�鏈変汉鍙互鎻愪氦","error");
this.dispatchEvent(new CloseActionScreenEvent());
}
- this.IsLoading = false;
}
}
\ 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 94f34b3..1996195 100644
--- a/force-app/main/default/lwc/lexSIStoOPD/lexSIStoOPD.js
+++ b/force-app/main/default/lwc/lexSIStoOPD/lexSIStoOPD.js
@@ -1,3 +1,11 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-04-07 09:02:03
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-04-11 09:10:42
+ */
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
@@ -74,9 +82,9 @@
}else{
this.showToast("鎴愬姛","success");
this.updateRecordView(this.recordId);
- }
- this.dispatchEvent(new CloseActionScreenEvent());
+ }
this.IsLoading = false;
+ this.dispatchEvent(new CloseActionScreenEvent());
});
}
diff --git a/force-app/main/default/lwc/lexSubmitCompetitorReport/lexSubmitCompetitorReport.js b/force-app/main/default/lwc/lexSubmitCompetitorReport/lexSubmitCompetitorReport.js
index 4406dc9..213dc1c 100644
--- a/force-app/main/default/lwc/lexSubmitCompetitorReport/lexSubmitCompetitorReport.js
+++ b/force-app/main/default/lwc/lexSubmitCompetitorReport/lexSubmitCompetitorReport.js
@@ -1,3 +1,11 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-04-07 09:02:03
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-04-11 09:11:11
+ */
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
@@ -35,7 +43,6 @@
recordId: this.recordId
}).then(result=>{
this.submit();
- this.IsLoading = false;
});
}
@@ -56,6 +63,7 @@
}).then(result=>{
this.showToast("鎻愪氦瀵规墜绔炰簤鎶ュ憡鎴愬姛","success")
this.updateRecordView(this.recordId);
+ this.IsLoading = false;
this.dispatchEvent(new CloseActionScreenEvent());
});
}
diff --git a/force-app/main/default/lwc/lexVOCAnswer/lexVOCAnswer.js b/force-app/main/default/lwc/lexVOCAnswer/lexVOCAnswer.js
index 8e9882e..c4b9a85 100644
--- a/force-app/main/default/lwc/lexVOCAnswer/lexVOCAnswer.js
+++ b/force-app/main/default/lwc/lexVOCAnswer/lexVOCAnswer.js
@@ -1,3 +1,11 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-03-27 14:05:59
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-04-10 17:56:04
+ */
import { LightningElement, wire, track, api } from "lwc";
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from "lightning/actions";
@@ -35,7 +43,6 @@
.then((result) => {
console.log(result);
if (result != null) {
- this.Isloading = false;
this.status = result.status;
this.update();
}
@@ -76,6 +83,7 @@
this.showToast(result,"error");
}
this.updateRecordView(this.recordId);
+ this.Isloading = false;
this.dispatchEvent(new CloseActionScreenEvent());
}).catch(error=>{
console.log(error);
diff --git a/force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js b/force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js
index 6d8e5b0..59e1cc3 100644
--- a/force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js
+++ b/force-app/main/default/lwc/lexVOCCheck/lexVOCCheck.js
@@ -40,7 +40,7 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.Isloading = false;
+
this.status = result.status;
this.isVOC = result.isVOC;
this.personId = result.personId;
@@ -79,13 +79,11 @@
return;
}
if (this.status != "璺熻繘涓�") {
- alert("涓嶆槸璺熻繘涓笉鑳界偣鍑�");
this.showToast("涓嶆槸璺熻繘涓笉鑳界偣鍑�","error");
this.dispatchEvent(new CloseActionScreenEvent());
return;
}
if (this.isVOC == undefined) {
- alert("蹇呴』閫夋嫨鏄惁VOC");
this.showToast("蹇呴』閫夋嫨鏄惁VOC","error");
this.dispatchEvent(new CloseActionScreenEvent());
return;
@@ -103,6 +101,7 @@
}else {
this.showToast(result,"error");
}
+ this.Isloading = false;
this.dispatchEvent(new CloseActionScreenEvent());
});
diff --git a/force-app/main/default/lwc/lexVOCConfirm/lexVOCConfirm.js b/force-app/main/default/lwc/lexVOCConfirm/lexVOCConfirm.js
index e5625e4..b364850 100644
--- a/force-app/main/default/lwc/lexVOCConfirm/lexVOCConfirm.js
+++ b/force-app/main/default/lwc/lexVOCConfirm/lexVOCConfirm.js
@@ -1,3 +1,11 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-03-27 14:08:56
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-04-10 17:49:00
+ */
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
@@ -37,7 +45,6 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.Isloading = false;
this.status = result.status;
this.VOCSatisfy = result.Satisfy;
this.VOCSatisfy1 = result.Satisfy1;
@@ -88,6 +95,7 @@
}).then(result=>{
this.updateRecordView(this.recordId);
this.showToast("鎴愬姛","success");
+ this.Isloading = false;
this.dispatchEvent(new CloseActionScreenEvent());
});
diff --git a/force-app/main/default/lwc/lexVOCFinish/lexVOCFinish.js b/force-app/main/default/lwc/lexVOCFinish/lexVOCFinish.js
index 032beec..44d128d 100644
--- a/force-app/main/default/lwc/lexVOCFinish/lexVOCFinish.js
+++ b/force-app/main/default/lwc/lexVOCFinish/lexVOCFinish.js
@@ -1,3 +1,11 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-03-27 14:11:17
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-04-10 17:52:00
+ */
import { api, wire,LightningElement } from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
@@ -35,7 +43,6 @@
}).then(result => {
console.log(result);
if (result != null) {
- this.IsLoading = false;
this.status = result.status;
this.profileId = result.profileId;
this.VOCFinish();
@@ -80,6 +87,7 @@
}).then(result =>{
this.showToast("鎴愬姛","success");
this.updateRecordView(this.recordId);
+ this.IsLoading = false;
this.dispatchEvent(new CloseActionScreenEvent());
});
}
diff --git a/force-app/main/default/lwc/lexVOCSubmit/lexVOCSubmit.js b/force-app/main/default/lwc/lexVOCSubmit/lexVOCSubmit.js
index 491c418..93f5e5f 100644
--- a/force-app/main/default/lwc/lexVOCSubmit/lexVOCSubmit.js
+++ b/force-app/main/default/lwc/lexVOCSubmit/lexVOCSubmit.js
@@ -1,3 +1,11 @@
+/*
+ * @Description:
+ * @version:
+ * @Author: chen jing wu
+ * @Date: 2023-03-27 13:39:23
+ * @LastEditors: chen jing wu
+ * @LastEditTime: 2023-04-10 17:57:16
+ */
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
@@ -38,7 +46,6 @@
this.status = result.status;
this.createdById = result.createdById;
this.Submit();
- this.IsLoading = false;
//window.location.replace("https://ocsm--partial.sandbox.lightning.force.com/lightning/r/Report__c/" + this.recordId + "/view");
}
}).catch(error => {
@@ -75,6 +82,7 @@
}).then(result =>{
this.showToast("鎴愬姛","success");
this.updateRecordView(this.recordId);
+ this.IsLoading = false;
this.dispatchEvent(new CloseActionScreenEvent());
});
}
--
Gitblit v1.9.1