From b37242ad5f2a81065eba0b176b38de4dd93ac8d6 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@prec-tech.com>
Date: 星期一, 10 七月 2023 15:48:46 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/lwc/lexAddSubmitApprovalProcess/lexAddSubmitApprovalProcess.js | 130 +++++++++++++++++--------------------------
1 files changed, 52 insertions(+), 78 deletions(-)
diff --git a/force-app/main/default/lwc/lexAddSubmitApprovalProcess/lexAddSubmitApprovalProcess.js b/force-app/main/default/lwc/lexAddSubmitApprovalProcess/lexAddSubmitApprovalProcess.js
index eb9baa5..8df44b6 100644
--- a/force-app/main/default/lwc/lexAddSubmitApprovalProcess/lexAddSubmitApprovalProcess.js
+++ b/force-app/main/default/lwc/lexAddSubmitApprovalProcess/lexAddSubmitApprovalProcess.js
@@ -3,10 +3,11 @@
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import { CurrentPageReference,NavigationMixin } from 'lightning/navigation';
import { updateRecord } from 'lightning/uiRecordApi';
-
+import LightningConfirm from 'lightning/confirm';
import init from '@salesforce/apex/AddSubmitApprovalProcessController.init';
import submitApproval from '@salesforce/apex/AddSubmitApprovalProcessController.submitApproval';
import setSObjectShare from '@salesforce/apex/ControllerUtil.setSObjectShare';
+import changeAddApprovalStatus from '@salesforce/apex/AddSubmitApprovalProcessController.changeAddApprovalStatus';
export default class lexAddSubmitApprovalProcess extends LightningElement {
@api recordId;
@@ -32,10 +33,22 @@
this.ToastShow('娌℃湁闇�瑕佸鎵圭殑杩藉姞闄勫睘鍝�','warning');
return;
}
- if (!confirm("涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵")) {
- this.dispatchEvent(new CloseActionScreenEvent());
- return;
- }
+ // if (!confirm("涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵")) {
+ // this.dispatchEvent(new CloseActionScreenEvent());
+ // return;
+ // }
+ const SUBMIT = LightningConfirm.open({
+ message: "涓�鏃︽彁浜ゆ璁板綍浠ュ緟鎵瑰噯锛屾牴鎹偍鐨勮缃偍鍙兘涓嶅啀鑳藉缂栬緫姝よ褰曟垨灏嗕粬浠庢壒鍑嗚繃绋嬩腑璋冨洖銆傛槸鍚︾户缁紵",
+ variant: 'headerless',
+ label: '鎻愮ず淇℃伅',
+ // setting theme would have no effect
+ });
+
+ if(SUBMIT==false){
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+
// 甯屾湜鍒拌揣鏃ヤ笉鑳芥棭浜庣敵璇锋彁浜ゆ棩-0418杩藉姞
//if ('{!Rental_Apply__c.Request_shipping_day__c}' < '{!TODAY()}') {
// alert('甯屾湜鍒拌揣鏃ヤ笉鑳芥棭浜庣敵璇锋彁浜ゆ棩');
@@ -93,7 +106,7 @@
}
}
- // share
+ //share
var userAccess = new Array();
userAccess.push(result.applyUserId + '_Edit');
@@ -108,6 +121,7 @@
//userAccess.push('{!Rental_Apply__c.ZongjianApprovalManagerId__c}_Read');//20210727 ljh SFDC-C54C33 update 鍏变韩瑙﹀彂鍣ㄥ畬鎴�
//userAccess.push('{!Rental_Apply__c.Status__c}_Read');
+ console.log('鍙傛暟==='+result.rentalApplyId+' '+userAccess+' '+result.ownerId);
setSObjectShare({
sobjectName:'Rental_Apply__Share',
rowCause:'ApplyUserShare__c',
@@ -115,52 +129,44 @@
userAccess:userAccess,
ownerId:result.ownerId
}).then(res=>{
- console.log('setSObjectShareSuccess===='+res);
+
if(res!='OK'){
this.ToastShow(res,'warning');
return;
+ }else{
+ console.log('setSObjectShareSuccess====OK');
+ //杩藉姞澶囧搧鐢宠鐘舵�佺‘璁わ紝宸茬粡鎻愪氦杩囩殑鐢宠锛屼笉鑳介噸澶嶆彁浜tatus__c
+ if (result.rentalApplyStatus != '宸叉壒鍑�' && result.rentalApplyStatus != '宸插嚭搴撴寚绀�') {
+ this.ToastShow('璇峰鍝佺敵璇风姸鎬佺‘璁わ紝鐢宠鐘舵�佸凡鎵瑰噯鍚庢墠鍙互鎻愪氦杩藉姞瀹℃壒','warning');
+ return;
+ }
+
+ changeAddApprovalStatus({
+ recordId: this.recordId,
+ status: '濉啓瀹屾瘯'
+ }).then(changeResult=>{
+ if(changeResult == '鏇存柊鎴愬姛'){
+ submitApproval({
+ recordId: this.recordId
+ }).then(submitApprovalRes=>{
+ if(submitApprovalRes == 'OK'){
+ this.ToastShow('鎻愪氦杩藉姞寰呭鎵�','success');
+ this.updateRecordView(this.recordId);
+ }else{
+ this.ToastShow('杩藉姞寰呭鎵瑰け璐�','ERROR');
+ }
+ })
+ }else{
+ this.ToastShow(changeResult,'error');
+ }
+ })
}
}).catch(err=>{
console.log('setSObjectShareErr===='+err);
})
-
- // var request = new sforce.ProcessSubmitRequest();
- // request.objectId = "{!Rental_Apply__c.Id}";
- // var processResults = sforce.connection.process([request]);
-
-
- // if (processResults[0].errors != null) {
- // var back = new sforce.SObject("Rental_Apply__c");
- // back.Id = "{!Rental_Apply__c.Id}";
- // back.Add_Approval_Status__c = "鑽夋涓�";
- // var backResult = sforce.connection.update([back]);
- // backMessages = this.getConnectDMLErrorMessages(backResult);
- // if (backMessages.length > 0) {
- // this.showToast(backMessages.join("\n"),'error');
- // return;
- // }
-
- // var errmsg = processResults[0].errors.message.toString();
- // this.showToast(errmsg,'error');
- // return;
- // }
-
- //updateRecord({fields: { Id: this.recordId }});
-
- submitApproval({
- recordId: this.recordId
- }).then(res=>{
- console.log('submitApproval===='+res);
- if(res == 'OK'){
- this.ToastShow('鎻愪氦鎴愬姛','success');
- }else{
- this.ToastShow(res,'error');
- }
- })
- updateRecord({fields: { Id: this.recordId }});
}).catch(err=>{
- console.log('sErr====',err.message);
+ console.log('====1111====',err);
})
}
@@ -174,39 +180,7 @@
this.dispatchEvent(new CloseActionScreenEvent());
}
- getConnectDMLErrorMessages(results){
- var messages = [],
- i = 0,
- len = results.length,
- r;
- for (; i < len; i++) {
- r = results[i];
- if (!r.getBoolean("success")) {
- messages = messages.concat(this.getConnectDMLMessagesOfAResult(r));
- }
- }
- return messages;
- }
-
- getConnectDMLMessagesOfAResult(res){
- var messages = [],
- errors = res.getArray("errors"),
- i = 0,
- len = errors.length,
- e;
- for (; i < len; i++) {
- e = errors[i];
- messages.push(e.message + " " + this.getConnectDMLErrorFields(e));
- }
- return messages;
- }
-
- getConnectDMLErrorFields(error){
- var fields = error.getArray('fields');
- if (fields.length > 0) {
- return "[" + fields.join(",") + "]"
- } else {
- return "";
- }
- }
+ updateRecordView(recordId) {
+ updateRecord({fields: { Id: recordId }});
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1