From 1363fbac72b3c291821917fc883587c1928f1651 Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期二, 08 八月 2023 17:38:39 +0800
Subject: [PATCH] 20230808上传修改伟意代码
---
force-app/main/default/lwc/lexOCSMNogoods/lexOCSMNogoods.html | 1
force-app/main/default/lwc/lexOCSMNogoods/lexOCSMNogoods.js | 15 ++++-
force-app/main/default/lwc/lexDiscountRequest/lexDiscountRequest.js | 19 ++++-
force-app/main/default/lwc/lexOSHNogoods/lexOSHNogoods.js | 9 ++
force-app/main/default/lwc/lexRentalApplyDiscountApproval/lexRentalApplyDiscountApproval.js | 11 +++
force-app/main/default/lwc/lexSCSubmit/lexSCSubmit.js | 51 ++++++++++------
force-app/main/default/lwc/lexServiceCutPriceApply/lexServiceCutPriceApply.js | 14 +++-
force-app/main/default/lwc/lexOCSMNogoods/lexOCSMNogoods.css | 22 +++++++
force-app/main/default/lwc/lexSCSubmit/lexSCSubmit.html | 1
9 files changed, 109 insertions(+), 34 deletions(-)
diff --git a/force-app/main/default/lwc/lexDiscountRequest/lexDiscountRequest.js b/force-app/main/default/lwc/lexDiscountRequest/lexDiscountRequest.js
index f446a53..c014f30 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,9 +78,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");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
})
updateRepairQuotation04({
recordId: this.Id
@@ -87,9 +92,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");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }
})
})
}
diff --git a/force-app/main/default/lwc/lexOCSMNogoods/lexOCSMNogoods.css b/force-app/main/default/lwc/lexOCSMNogoods/lexOCSMNogoods.css
new file mode 100644
index 0000000..635bc6c
--- /dev/null
+++ b/force-app/main/default/lwc/lexOCSMNogoods/lexOCSMNogoods.css
@@ -0,0 +1,22 @@
+.outerBorderCss{
+ border: 1px solid #D4D4D4;
+ border-radius : 5px;
+ border-top : 3px solid #565959;
+}
+.borderCss{
+ border: 1px solid #D4D4D4;
+ border-radius : 5px;
+ margin-bottom : 7px;
+ border-top : 3px solid #565959;
+}
+.headerDorderCss{
+ border-top: 1px solid #565959;
+ border-bottom: 1px solid #D4D4D4;
+ padding:3px;
+}
+.centerCss{
+ text-align: center;
+}
+.centerCss .left{
+ margin-left: 100px;
+}/* sample css file */
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexOCSMNogoods/lexOCSMNogoods.html b/force-app/main/default/lwc/lexOCSMNogoods/lexOCSMNogoods.html
index 49a10f7..48f29e0 100644
--- a/force-app/main/default/lwc/lexOCSMNogoods/lexOCSMNogoods.html
+++ b/force-app/main/default/lwc/lexOCSMNogoods/lexOCSMNogoods.html
@@ -1,5 +1,6 @@
<template>
<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/lexOCSMNogoods/lexOCSMNogoods.js b/force-app/main/default/lwc/lexOCSMNogoods/lexOCSMNogoods.js
index d9f159f..8cd0b72 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,8 +81,14 @@
}).then(result => {
console.log(result);
if (result.length > 0) {
- alert(result);
+ this.ShowToastEvent(result, "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }else{
+ this.ShowToastEvent('鏇存柊鎴愬姛', "success");
+ this.dispatchEvent(new CloseActionScreenEvent());
}
+
})
}
}
diff --git a/force-app/main/default/lwc/lexOSHNogoods/lexOSHNogoods.js b/force-app/main/default/lwc/lexOSHNogoods/lexOSHNogoods.js
index 388856a..e20f6c2 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,11 @@
console.log(result);
if (result.length > 0) {
var split = result.split(", ");
- alert(split[1]);
+ this.ShowToastEvent(split[1], "error");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ }else{
+ this.ShowToastEvent('鏇存柊鎴愬姛', "success");
+ this.dispatchEvent(new CloseActionScreenEvent());
}
})
}
diff --git a/force-app/main/default/lwc/lexRentalApplyDiscountApproval/lexRentalApplyDiscountApproval.js b/force-app/main/default/lwc/lexRentalApplyDiscountApproval/lexRentalApplyDiscountApproval.js
index 777f405..b0cd788 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,17 @@
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");
+ this.dispatchEvent(new CloseActionScreenEvent());
}
})
} 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..905ac6c 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,32 @@
});
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());
+ // alert(split[1]);
+ } else {
+ this.ShowToastEvent("宸叉彁浜�", "success");
+ this.dispatchEvent(new CloseActionScreenEvent());
+ window.location.reload();
+ }
+ })
+ }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..33d2a1b 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,8 +94,12 @@
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");
+ this.dispatchEvent(new CloseActionScreenEvent());
}
})
updateRepairQuotation02({
@@ -102,11 +108,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());
}
})
}
--
Gitblit v1.9.1