From ac49e658cf9674065476431a5deb81a93d1bc25a Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期三, 24 五月 2023 10:45:54 +0800
Subject: [PATCH] 0524LightningConfirm框修改
---
force-app/main/default/lwc/lexOSHSubmit/lexOSHSubmit.js | 83 +++++++++-------
force-app/main/default/lwc/lexOCMSubmit/lexOCMSubmit.js | 30 +++--
force-app/main/default/lwc/lexRCSubmit/lexRCSubmit.js | 49 +++++++--
force-app/main/default/lwc/lexOCSMToReportLighting/lexOCSMToReportLighting.js | 37 ++++--
force-app/main/default/lwc/lexOCSMNoToReportLighting/lexOCSMNoToReportLighting.js | 57 ++++++----
5 files changed, 156 insertions(+), 100 deletions(-)
diff --git a/force-app/main/default/lwc/lexOCMSubmit/lexOCMSubmit.js b/force-app/main/default/lwc/lexOCMSubmit/lexOCMSubmit.js
index 092e3fe..0bb19a0 100644
--- a/force-app/main/default/lwc/lexOCMSubmit/lexOCMSubmit.js
+++ b/force-app/main/default/lwc/lexOCMSubmit/lexOCMSubmit.js
@@ -2,6 +2,7 @@
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
import { NavigationMixin } from 'lightning/navigation';
+import LightningConfirm from 'lightning/confirm';
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import init from '@salesforce/apex/QISReportController.initForOCMSubmitButton';
import updateQis from '@salesforce/apex/QISReportController.updateQisWithOCM';
@@ -86,18 +87,23 @@
this.dispatchEvent(new CloseActionScreenEvent());
return;
}
-
- if (!confirm("涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵")) {
- this.dispatchEvent(new CloseActionScreenEvent());
- return;
- }
- this.updateQisSubmit();
- if (this.isaohuiproduct) {
- this.dispatchEvent(new CloseActionScreenEvent());
- this.updateRecordView(this.recordId);
- }
- this.dispatchEvent(new CloseActionScreenEvent());
- this.updateRecordView(this.recordId);
+ LightningConfirm.open({
+ message: '涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵',
+ variant: 'headerless',
+ label: 'this is the aria-label value',
+ }).then(res=>{
+ if(res) {
+ this.updateQisSubmit();
+ if (this.isaohuiproduct) {
+ this.dispatchEvent(new CloseActionScreenEvent());
+ this.updateRecordView(this.recordId);
+ }
+ }else{
+ this.dispatchEvent(new CloseActionScreenEvent());
+ this.updateRecordView(this.recordId);
+ return;
+ }
+ });
}).catch(error => {
console.log('error='+error);
}).finally(() => {
diff --git a/force-app/main/default/lwc/lexOCSMNoToReportLighting/lexOCSMNoToReportLighting.js b/force-app/main/default/lwc/lexOCSMNoToReportLighting/lexOCSMNoToReportLighting.js
index 2c3c93c..f013db3 100644
--- a/force-app/main/default/lwc/lexOCSMNoToReportLighting/lexOCSMNoToReportLighting.js
+++ b/force-app/main/default/lwc/lexOCSMNoToReportLighting/lexOCSMNoToReportLighting.js
@@ -2,6 +2,7 @@
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
import { NavigationMixin } from 'lightning/navigation';
+import LightningConfirm from 'lightning/confirm';
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import init from '@salesforce/apex/QISReportController.initForlexOCSMNoToReportLightingButton';
import updateQis from '@salesforce/apex/QISReportController.updateQisForlexOCSMNoToReportLighting';
@@ -42,32 +43,40 @@
this.OCSMAdministrativeReportDate = result.oCSMAdministrativeReportDate;
this.qisReportId = result.Id;
this.Awaredate = result.awaredate;
- if (!confirm("涓嶈鎶ュ憡鍚庢棤娉曟挙鍥烇紝鏄惁缁х画锛�")) {
- this.dispatchEvent(new CloseActionScreenEvent());
- return;
- }
- if (this.OCSMAdministrativeReportDate != null || this.OCSMAdministrativeReportNumber != null) {
- const evt = new ShowToastEvent({
- title : '宸茬粡鎶ュ憡鐨凲IS锛屼笉鍙互鐐瑰嚮OCSM涓嶈鎶ュ憡',
- message: '',
- variant: 'error'
- });
- this.dispatchEvent(evt);
+ LightningConfirm.open({
+ message: '涓嶈鎶ュ憡鍚庢棤娉曟挙鍥烇紝鏄惁缁х画锛�',
+ variant: 'headerless',
+ label: 'this is the aria-label value',
+ }).then(res=>{
+ if(res) {
+ if (this.OCSMAdministrativeReportDate != null || this.OCSMAdministrativeReportNumber != null) {
+ const evt = new ShowToastEvent({
+ title : '宸茬粡鎶ュ憡鐨凲IS锛屼笉鍙互鐐瑰嚮OCSM涓嶈鎶ュ憡',
+ message: '',
+ variant: 'error'
+ });
+ this.dispatchEvent(evt);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ if (this.Awaredate!=null) {
+ this.updateQisSubmit();
+ }else{
+ const evt = new ShowToastEvent({
+ title : '娌℃湁AwareDate鎴栧凡缁廜CSM琛屾斂鎶ュ憡锛岃纭',
+ message: '',
+ variant: 'error'
+ });
+ this.dispatchEvent(evt);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ }else{
this.dispatchEvent(new CloseActionScreenEvent());
return;
- }
- if (this.Awaredate!=null) {
- this.updateQisSubmit();
- }else{
- const evt = new ShowToastEvent({
- title : '娌℃湁AwareDate鎴栧凡缁廜CSM琛屾斂鎶ュ憡锛岃纭',
- message: '',
- variant: 'error'
- });
- this.dispatchEvent(evt);
- this.dispatchEvent(new CloseActionScreenEvent());
- return;
- }
+ }
+
+ });
}).catch(error => {
console.log('error='+error);
}).finally(() => {
diff --git a/force-app/main/default/lwc/lexOCSMToReportLighting/lexOCSMToReportLighting.js b/force-app/main/default/lwc/lexOCSMToReportLighting/lexOCSMToReportLighting.js
index fe89267..87b1ad1 100644
--- a/force-app/main/default/lwc/lexOCSMToReportLighting/lexOCSMToReportLighting.js
+++ b/force-app/main/default/lwc/lexOCSMToReportLighting/lexOCSMToReportLighting.js
@@ -2,6 +2,7 @@
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
import { NavigationMixin } from 'lightning/navigation';
+import LightningConfirm from 'lightning/confirm';
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import init from '@salesforce/apex/QISReportController.initForlexOCSMToReportLightingButton';
import updateQis from '@salesforce/apex/QISReportController.updateQisForlexOCSMToReportLighting';
@@ -38,22 +39,30 @@
this.OCSMAdministrativeReportStatus = result.oCSMAdministrativeReportStatus;
this.qisReportId = result.Id;
this.Awaredate = result.awaredate;
- if (!confirm("涓嶈鎶ュ憡鍚庢棤娉曟挙鍥烇紝鏄惁缁х画锛�")) {
- this.dispatchEvent(new CloseActionScreenEvent());
- return;
- }
- if (this.OCSMAdministrativeReportStatus == null && this.Awaredate!=null) {
- this.updateQisSubmit();
- }else{
- const evt = new ShowToastEvent({
- title : '娌℃湁AwareDate鎴栧凡缁廜CSM琛屾斂鎶ュ憡锛岃纭',
- message: '',
- variant: 'error'
- });
- this.dispatchEvent(evt);
+ LightningConfirm.open({
+ message: '鎶ュ憡鍚庢棤娉曟挙鍥烇紝鏄惁缁х画锛�',
+ variant: 'headerless',
+ label: 'this is the aria-label value',
+ }).then(res=>{
+ if(res) {
+ if (this.OCSMAdministrativeReportStatus == null && this.Awaredate!=null) {
+ this.updateQisSubmit();
+ }else{
+ const evt = new ShowToastEvent({
+ title : '娌℃湁AwareDate鎴栧凡缁廜CSM琛屾斂鎶ュ憡锛岃纭',
+ message: '',
+ variant: 'error'
+ });
+ this.dispatchEvent(evt);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ }else{
this.dispatchEvent(new CloseActionScreenEvent());
return;
- }
+ }
+
+ });
}).catch(error => {
console.log(error);
}).finally(() => {
diff --git a/force-app/main/default/lwc/lexOSHSubmit/lexOSHSubmit.js b/force-app/main/default/lwc/lexOSHSubmit/lexOSHSubmit.js
index 42da614..7a3db4f 100644
--- a/force-app/main/default/lwc/lexOSHSubmit/lexOSHSubmit.js
+++ b/force-app/main/default/lwc/lexOSHSubmit/lexOSHSubmit.js
@@ -2,6 +2,7 @@
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
import { NavigationMixin } from 'lightning/navigation';
+import LightningConfirm from 'lightning/confirm';
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import init from '@salesforce/apex/QISReportController.initForOSHSubmitButton';
import updateQis from '@salesforce/apex/QISReportController.updateQis1';
@@ -64,43 +65,53 @@
this.dispatchEvent(new CloseActionScreenEvent());
return;
}
- if (!confirm("涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵")) {
- return;
- }
- if (this.OSHstaff==null||this.OSHstaffEmail==null) {
- const evt = new ShowToastEvent({
- title : 'OSH鎷呭綋蹇呴』濉啓',
- message: '',
- variant: 'error'
- });
- this.dispatchEvent(evt);
- this.dispatchEvent(new CloseActionScreenEvent());
- return;
- }
- try{
- this.updateQisSubmit();
- }catch(err){
- if(err.faultstring !=undefined && err.faultstring.indexOf('INVALID_SESSION_ID') != -1) {
- const evt = new ShowToastEvent({
- title : '褰撳墠缃戦〉宸茬櫥鍑猴紝璇锋偍閲嶆柊鐧诲綍鍚庡埛鏂拌缃戦〉锛�',
- message: '',
- variant: 'error'
- });
- this.dispatchEvent(evt);
- this.dispatchEvent(new CloseActionScreenEvent());
- return;
- } else {
- const evt = new ShowToastEvent({
- title : err.faultstring,
- message: '',
- variant: 'error'
- });
- this.dispatchEvent(evt);
- this.dispatchEvent(new CloseActionScreenEvent());
- return;
+ LightningConfirm.open({
+ message: '涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵',
+ variant: 'headerless',
+ label: 'this is the aria-label value',
+
+ }).then(res=>{
+ if(res) {
+ if (this.OSHstaff==null||this.OSHstaffEmail==null) {
+ const evt = new ShowToastEvent({
+ title : 'OSH鎷呭綋蹇呴』濉啓',
+ message: '',
+ variant: 'error'
+ });
+ this.dispatchEvent(evt);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ try{
+ this.updateQisSubmit();
+ }catch(err){
+ if(err.faultstring !=undefined && err.faultstring.indexOf('INVALID_SESSION_ID') != -1) {
+ const evt = new ShowToastEvent({
+ title : '褰撳墠缃戦〉宸茬櫥鍑猴紝璇锋偍閲嶆柊鐧诲綍鍚庡埛鏂拌缃戦〉锛�',
+ message: '',
+ variant: 'error'
+ });
+ this.dispatchEvent(evt);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ } else {
+ const evt = new ShowToastEvent({
+ title : err.faultstring,
+ message: '',
+ variant: 'error'
+ });
+ this.dispatchEvent(evt);
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ return;
+ }
+ }else{
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
}
- return;
- }
+
+ });
}).catch(error => {
console.log('error='+error);
diff --git a/force-app/main/default/lwc/lexRCSubmit/lexRCSubmit.js b/force-app/main/default/lwc/lexRCSubmit/lexRCSubmit.js
index 24708a5..3fa50fa 100644
--- a/force-app/main/default/lwc/lexRCSubmit/lexRCSubmit.js
+++ b/force-app/main/default/lwc/lexRCSubmit/lexRCSubmit.js
@@ -2,6 +2,7 @@
import { CurrentPageReference } from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
import { NavigationMixin } from 'lightning/navigation';
+import LightningConfirm from 'lightning/confirm';
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import init from '@salesforce/apex/QISReportController.initForRCSubmitButton';
import updateQis from '@salesforce/apex/QISReportController.updateQisWithRC';
@@ -62,6 +63,7 @@
this.dispatchEvent(new CloseActionScreenEvent());
return;
}
+ console.log('this.RCproblemnotfound='+(this.QISReplyDay!=null && this.RCproblemnotfound));
if (this.CancelQISReason!=null) {
if (this.qisStatus == 'RC妫�娴嬬敵璇�') {
const evt = new ShowToastEvent({
@@ -93,6 +95,7 @@
this.dispatchEvent(new CloseActionScreenEvent());
return;
}
+
if (this.QISReplyDay!=null && this.RCproblemnotfound) {
const evt = new ShowToastEvent({
title : '鏈�缁堝垽瀹氭椂锛岃鍙栨秷[鏁呴殰鏈彂鐜扮暀涓嬬户缁瀵焆骞堕�夋嫨[瀵瑰簲鏂规硶]',
@@ -103,23 +106,41 @@
this.dispatchEvent(new CloseActionScreenEvent());
return;
}
- if (confirm("涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵")) {
- this.type = '1';
- }else{
- this.dispatchEvent(new CloseActionScreenEvent());
- return;
- }
+ LightningConfirm.open({
+ message: '涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵',
+ variant: 'headerless',
+ label: 'this is the aria-label value',
+ }).then(res=>{
+ if(res) {
+ this.type = '1';
+ console.log('this.type='+this.type);
+ this.updateQisSubmit();
+ }else{
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+
+ });
}else{
- if (confirm("涓�鏃︽彁浜ゅ叧闂璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵")) {
- this.type = '2';
- }else{
- this.dispatchEvent(new CloseActionScreenEvent());
- return;
- }
+ LightningConfirm.open({
+ message: '涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵',
+ variant: 'headerless',
+ label: 'this is the aria-label value',
+ }).then(res=>{
+ if(res) {
+ this.type = '2';
+ console.log('this.type='+this.type);
+ this.updateQisSubmit();
+ }else{
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+
+ });
}
- console.log('this.type='+this.type);
+
// this.dispatchEvent(new CloseActionScreenEvent());
- this.updateQisSubmit();
+
}).catch(error => {
console.log('error='+error);
}).finally(() => {
--
Gitblit v1.9.1