From 6caab407fe10a1e89921b184fe0de1f62b3d5da6 Mon Sep 17 00:00:00 2001
From: LiJinHuan <lijinhuan@prec-tech.com>
Date: 星期四, 06 七月 2023 13:34:32 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev

---
 force-app/main/default/lwc/lexReassign/lexReassign.js                                                      |   12 
 force-app/main/default/lwc/lexEquipmentRentalPicturePDF/lexEquipmentRentalPicturePDF.html                  |    3 
 force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.js                                          |   56 ++
 force-app/main/default/lwc/lexInventoryPage/lexInventoryPage.html                                          |    3 
 force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.html                                    |   13 
 force-app/main/default/lwc/lexInventoryPage/lexInventoryPage.js-meta.xml                                   |    5 
 force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.js-meta.xml           |   17 
 force-app/main/default/lwc/lexRentalFixtureSetAssign/lexRentalFixtureSetAssign.js                          |   22 
 force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.js                                    |   16 
 force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.js-meta.xml                             |   17 
 force-app/main/default/lwc/lexInventoryHeaderClearStatus/lexInventoryHeaderClearStatus.html                |    4 
 force-app/main/default/lwc/lexLoanerArrangedEmailConsumApply/lexLoanerArrangedEmailConsumApply.js-meta.xml |   11 
 force-app/main/default/lwc/lexAllReceivedFse/lexAllReceivedFse.html                                        |    3 
 force-app/main/default/lwc/lexLostReportInventoryPage/lexLostReportInventoryPage.js-meta.xml               |   11 
 force-app/main/default/lwc/lexNewTransferApply/lexNewTransferApply.html                                    |    3 
 force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.html            |    2 
 force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.html                                        |    5 
 force-app/main/default/lwc/lexLoanerArrangedEmailConsumApply/lexLoanerArrangedEmailConsumApply.html        |    3 
 force-app/main/default/lwc/lexRentalFixtureSetAssign/lexRentalFixtureSetAssign.html                        |    2 
 force-app/main/default/lwc/lexSendReport/lexSendReport.html                                                |    2 
 force-app/main/default/lwc/lexLoanerArrangedEmailConsumApply/lexLoanerArrangedEmailConsumApply.js          |   91 ++++
 force-app/main/default/lwc/lexSendReport/lexSendReport.js                                                  |   66 +++
 force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.css                                     |   22 +
 force-app/main/default/lwc/lexSendReport/lexSendReport.css                                                 |   22 +
 force-app/main/default/lwc/lexInventoryHeaderClearStatus/lexInventoryHeaderClearStatus.js-meta.xml         |   11 
 force-app/main/default/lwc/lexLostReportInventoryPage/lexLostReportInventoryPage.html                      |    4 
 force-app/main/default/lwc/lexInventoryHeaderClearStatus/lexInventoryHeaderClearStatus.css                 |   11 
 force-app/main/default/lwc/lexReassign/lexReassign.html                                                    |    4 
 force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.js                                      |   18 
 force-app/main/default/lwc/lexEquipmentRentalPDF/lexEquipmentRentalPDF.js                                  |   35 +
 force-app/main/default/lwc/lexLostReportInventoryPage/lexLostReportInventoryPage.js                        |   32 +
 force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.css                                       |   13 
 force-app/main/default/lwc/lexLoanerArrangedEmail/lexLoanerArrangedEmail.js                                |   32 
 force-app/main/default/lwc/lexAddSubmitApprovalProcess/lexAddSubmitApprovalProcess.html                    |    3 
 force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.html                                      |   14 
 force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.js-meta.xml                           |   12 
 force-app/main/default/lwc/lexReturnDeliverySlipConsumApply/lexReturnDeliverySlipConsumApply.js            |   50 ++
 force-app/main/default/lwc/lexSendReport/lexSendReport.js-meta.xml                                         |   11 
 force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.js                    |   19 
 force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.js              |   17 
 force-app/main/default/lwc/lexReturnDeliverySlip/lexReturnDeliverySlip.html                                |    3 
 force-app/main/default/lwc/lexReturnDeliverySlipConsumApply/lexReturnDeliverySlipConsumApply.html          |    3 
 force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.css                                         |   22 +
 force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.html                                    |    2 
 force-app/main/default/lwc/lexAllReceivedFse/lexAllReceivedFse.js                                          |   37 +
 force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.js                                        |  101 ++--
 force-app/main/default/lwc/lexInventoryPage/lexInventoryPage.js                                            |   22 +
 force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.js                                      |    9 
 force-app/main/default/lwc/lexEquipmentRentalPDF/lexEquipmentRentalPDF.html                                |    3 
 force-app/main/default/lwc/lexTopInQueue/lexTopInQueue.js                                                  |   36 +
 force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.html                                  |    3 
 force-app/main/default/lwc/lexLostReportInventoryPage/lexLostReportInventoryPage.css                       |   11 
 force-app/main/default/lwc/lexReturnDeliverySlipConsumApply/lexReturnDeliverySlipConsumApply.js-meta.xml   |   11 
 force-app/main/default/lwc/lexAddSubmitApprovalProcess/lexAddSubmitApprovalProcess.js                      |  130 ++---
 force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.js-meta.xml                                 |   11 
 force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.html                  |   13 
 force-app/main/default/lwc/lexSubmitExtensionApprovalProcess/lexSubmitExtensionApprovalProcess.html        |    3 
 force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.js-meta.xml                               |    7 
 force-app/main/default/lwc/lexLoanerArrangedEmail/lexLoanerArrangedEmail.html                              |    3 
 force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.js-meta.xml                             |    2 
 force-app/main/default/lwc/lexInventoryHeaderClearStatus/lexInventoryHeaderClearStatus.js                  |   72 +++
 force-app/main/default/lwc/lexTopInQueue/lexTopInQueue.html                                                |    3 
 62 files changed, 959 insertions(+), 245 deletions(-)

diff --git a/force-app/main/default/lwc/lexAddSubmitApprovalProcess/lexAddSubmitApprovalProcess.html b/force-app/main/default/lwc/lexAddSubmitApprovalProcess/lexAddSubmitApprovalProcess.html
index 49a10f7..ba53413 100644
--- a/force-app/main/default/lwc/lexAddSubmitApprovalProcess/lexAddSubmitApprovalProcess.html
+++ b/force-app/main/default/lwc/lexAddSubmitApprovalProcess/lexAddSubmitApprovalProcess.html
@@ -1,5 +1,2 @@
 <template>
-    <div class="sisToOPDHolder" if:true={IsLoading}>
-        <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
-    </div>
 </template>
\ No newline at end of file
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
diff --git a/force-app/main/default/lwc/lexAllReceivedFse/lexAllReceivedFse.html b/force-app/main/default/lwc/lexAllReceivedFse/lexAllReceivedFse.html
index 49a10f7..ba53413 100644
--- a/force-app/main/default/lwc/lexAllReceivedFse/lexAllReceivedFse.html
+++ b/force-app/main/default/lwc/lexAllReceivedFse/lexAllReceivedFse.html
@@ -1,5 +1,2 @@
 <template>
-    <div class="sisToOPDHolder" if:true={IsLoading}>
-        <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
-    </div>
 </template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexAllReceivedFse/lexAllReceivedFse.js b/force-app/main/default/lwc/lexAllReceivedFse/lexAllReceivedFse.js
index f97ad18..1e29534 100644
--- a/force-app/main/default/lwc/lexAllReceivedFse/lexAllReceivedFse.js
+++ b/force-app/main/default/lwc/lexAllReceivedFse/lexAllReceivedFse.js
@@ -2,6 +2,7 @@
 import { CurrentPageReference,NavigationMixin } from 'lightning/navigation';
 import { CloseActionScreenEvent } from 'lightning/actions';
 import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import { updateRecord } from 'lightning/uiRecordApi';
 
 import init from '@salesforce/apex/AllReceivedFseController.init';
 import getRaeSet from '@salesforce/apex/AllReceivedFseController.getRaeSet';
@@ -39,23 +40,11 @@
 					recordId: this.recordId
 				}).then(res=>{
 					if(res == 'SUCCESS'){
-						const evt = new ShowToastEvent({
-	                        title : '鐜板満宸插叏閮ㄦ敹璐�',
-	                        message: '',
-	                        variant: 'success'
-                    	});
-                    	this.dispatchEvent(new CloseActionScreenEvent());
-                		this.dispatchEvent(evt);
+                		this.showToast('鐜板満宸插叏閮ㄦ敹璐�','success');
+                		return;
 					}else{
-						const errToast = new ShowToastEvent({
-	                        title : res,
-	                        message: '',
-	                        variant: 'error'
-                    	});
-                    	this.dispatchEvent(new CloseActionScreenEvent());
-                		this.dispatchEvent(errToast);
-
-                		console.log(res);
+                		this.showToast(res,'warning');
+                		return;
 					}
 					
 				})
@@ -67,4 +56,20 @@
 			console.log('init==='+err);
 		})
 	}
+
+	showToast(msg,type) {
+        const event = new ShowToastEvent({
+            message: msg,
+            variant: type
+        });
+        if(type == 'success'){
+            this.updateRecordView(this.recordId);
+        }
+        this.dispatchEvent(event);
+        this.dispatchEvent(new CloseActionScreenEvent());
+    }
+
+    updateRecordView(recordId) {
+        updateRecord({fields: { Id: recordId }});
+    }
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexEquipmentRentalPDF/lexEquipmentRentalPDF.html b/force-app/main/default/lwc/lexEquipmentRentalPDF/lexEquipmentRentalPDF.html
index 3eff9e8..ba53413 100644
--- a/force-app/main/default/lwc/lexEquipmentRentalPDF/lexEquipmentRentalPDF.html
+++ b/force-app/main/default/lwc/lexEquipmentRentalPDF/lexEquipmentRentalPDF.html
@@ -1,5 +1,2 @@
 <template>
-    <div class="EquipmentRentalPDF" if:true={IsLoading}>
-        <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
-    </div>
 </template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexEquipmentRentalPDF/lexEquipmentRentalPDF.js b/force-app/main/default/lwc/lexEquipmentRentalPDF/lexEquipmentRentalPDF.js
index 12d6d76..a73f06f 100644
--- a/force-app/main/default/lwc/lexEquipmentRentalPDF/lexEquipmentRentalPDF.js
+++ b/force-app/main/default/lwc/lexEquipmentRentalPDF/lexEquipmentRentalPDF.js
@@ -1,10 +1,12 @@
 import { LightningElement, track, wire, api } from 'lwc';
 import {CurrentPageReference,NavigationMixin} from 'lightning/navigation';
 import { CloseActionScreenEvent } from 'lightning/actions';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import { updateRecord } from 'lightning/uiRecordApi';
 
-import init from '@salesforce/apex/rentalApplyEquipmentRentalPDFController.initJumptoPDFButton';
+import init from '@salesforce/apex/RentalApplyEquipmentRentalPDFController.initJumptoPDFButton';
 
-export default class rentalApplyEquipmentRentalPDF extends LightningElement {
+export default class lexEquipmentRentalPDF extends LightningElement {
 	@api recordId;
 	IsLoading = true;
 
@@ -29,11 +31,14 @@
 			recordId : this.recordId
 		}).then(result => {
 			if(result != null) {
-				this.IsLoading = false;
-				let num = result.pageLength;
-				console.log("======"+this.recordId + '   ' +num);
-				console.log("https://ocsm--partial.sandbox.lightning.force.com/lightning/r/FixtureRentalPDF?raid=" + this.recordId + "&page=" + num)
-				window.location.replace("https://ocsm--partial.sandbox.lightning.force.com/apex/FixtureRentalPDF?raid=" + this.recordId + "&page=" + num);
+				console.log('shipmentRequestedCnt'+ result.shipmentRequestedCnt);
+				if(result.shipmentRequestedCnt > 0){
+					this.IsLoading = false;
+					let num = result.pageLength;
+					window.open("https://ocsm--partial.sandbox.lightning.force.com/apex/FixtureRentalPDF?raid=" + this.recordId + "&page=" + num);
+				}else{
+					this.showToast('褰撳墠鐨勭敵璇峰崟涓病鏈夊凡鍑哄簱鎸囩ず鐨勯厤濂椼��','error');
+				}
 			}
 		})
 		.catch( error =>{
@@ -41,4 +46,20 @@
 		})
 	}
 
+	showToast(msg,type) {
+        const event = new ShowToastEvent({
+            message: msg,
+            variant: type
+        });
+        if(type == 'success'){
+            this.updateRecordView();
+        }
+        this.dispatchEvent(event);
+        this.dispatchEvent(new CloseActionScreenEvent());
+    }
+
+    updateRecordView(recordId) {
+        updateRecord({fields: { Id: recordId }});
+    }
+
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexEquipmentRentalPicturePDF/lexEquipmentRentalPicturePDF.html b/force-app/main/default/lwc/lexEquipmentRentalPicturePDF/lexEquipmentRentalPicturePDF.html
index 49a10f7..ba53413 100644
--- a/force-app/main/default/lwc/lexEquipmentRentalPicturePDF/lexEquipmentRentalPicturePDF.html
+++ b/force-app/main/default/lwc/lexEquipmentRentalPicturePDF/lexEquipmentRentalPicturePDF.html
@@ -1,5 +1,2 @@
 <template>
-    <div class="sisToOPDHolder" if:true={IsLoading}>
-        <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
-    </div>
 </template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.css b/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.css
new file mode 100644
index 0000000..635bc6c
--- /dev/null
+++ b/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.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/lexFeedbackReport/lexFeedbackReport.html b/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.html
new file mode 100644
index 0000000..49a10f7
--- /dev/null
+++ b/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.html
@@ -0,0 +1,5 @@
+<template>
+    <div class="sisToOPDHolder" if:true={IsLoading}>
+        <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+    </div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.js b/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.js
new file mode 100644
index 0000000..327730f
--- /dev/null
+++ b/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.js
@@ -0,0 +1,56 @@
+import { LightningElement, track, wire, api } from 'lwc';
+import { CloseActionScreenEvent } from 'lightning/actions';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import { CurrentPageReference } from 'lightning/navigation';
+
+import init from '@salesforce/apex/RentalApplyFaultController.init';
+import updateRentalApplyFaultStatus from '@salesforce/apex/RentalApplyFaultController.updateRentalApplyFaultStatus';
+export default class lexFeedbackReport extends LightningElement {
+	@api recordId;
+	IsLoading = true;
+
+	@wire(CurrentPageReference)
+	getStateParameters(currentPageReference){
+		if(currentPageReference) {
+			const urlValue = currentPageReference.state.recordId;
+			if(urlValue) {
+				let str = `${urlValue}`;
+		        this.recordId = str;
+			}
+		}
+	}
+
+	connectedCallback(){
+		init({
+			recordId: this.recordId
+		}).then(res=>{
+			if(res.status__c!='宸插彂閫�'){
+				this.showToast('鍙湁宸插彂閫佺殑妫�娴嬪垎鏋愭姤鍛婃墠鑳藉彂閫�','warning');
+				return;
+			}
+
+			updateRentalApplyFaultStatus({
+				recordId: this.recordId,
+				updateStatus: '宸插弽棣�'
+			}).then(result=>{
+				if(result=='SUCCESS'){
+					this.showToast('鎶ュ憡宸插弽棣�','success');
+				}else{
+					this.showToast(res,'error');
+				}
+			})
+		})
+	}
+
+	showToast(msg,type) {
+        const event = new ShowToastEvent({
+            message: msg,
+            variant: type
+        });
+        if(type == 'success'){
+            this.updateRecordView();
+        }
+        this.dispatchEvent(event);
+        this.dispatchEvent(new CloseActionScreenEvent());
+    }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.js-meta.xml b/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.js-meta.xml
new file mode 100644
index 0000000..97620b0
--- /dev/null
+++ b/force-app/main/default/lwc/lexFeedbackReport/lexFeedbackReport.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexFeedbackReport">
+    <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/lexFixtureSetManage/lexFixtureSetManage.css b/force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.css
new file mode 100644
index 0000000..95c1c55
--- /dev/null
+++ b/force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.css
@@ -0,0 +1,22 @@
+.holder{
+	position: relative;
+	display: inline-block;
+	width: 80px;
+	height: 80px;
+	text-align: center;
+}
+
+.container .uiContainerManager{
+	display : none !important;
+}
+.toast{
+	border: 1px solid #c9c9c9;
+	border-radius: 10px; 
+	width: 50%;
+	margin: 0 auto;
+	font-size: 18px;
+	font-weight: bold;
+	padding: 10px 20px;
+	background: #feb75d;
+	display: flex;
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.html b/force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.html
new file mode 100644
index 0000000..7063605
--- /dev/null
+++ b/force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.html
@@ -0,0 +1,13 @@
+<template>
+  <div class="holder" if:true={IsLoading}>
+      <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+  </div>
+  <div if:false={IsLoading} class="toast">
+    <span style="padding: 10px;">{msg}</span>
+    <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse" onclick={closeAction} title="Close" style="background-color: #e5e4e2;margin-top: 15px;">
+                <lightning-icon class="greyIcon" icon-name="utility:close" alternative-text="Connected" variant="inverse" size="small"
+                    title="Close"  style="color: black;"></lightning-icon>
+              <span class="slds-assistive-text">Close</span>
+        </button>
+  </div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.js b/force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.js
new file mode 100644
index 0000000..d0129fc
--- /dev/null
+++ b/force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.js
@@ -0,0 +1,9 @@
+import { LightningElement, track, wire, api } from 'lwc';
+
+export default class lexFixtureSetManage extends LightningElement {
+	@api recordId;
+
+	connectedCallback(){
+		window.open("/apex/FixtureSetManage?pt_recid=" + this.recordId, "_top");
+	}
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.js-meta.xml b/force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.js-meta.xml
new file mode 100644
index 0000000..e607891
--- /dev/null
+++ b/force-app/main/default/lwc/lexFixtureSetManage/lexFixtureSetManage.js-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexFixtureSetManage">
+    <apiVersion>51.0</apiVersion>
+    <isExposed>true</isExposed>
+    <targets>
+        <target>lightning__AppPage</target>
+        <target>lightning__RecordPage</target>
+        <target>lightning__HomePage</target>
+        <target>lightning__RecordAction</target>
+        <target>lightning__FlowScreen</target>
+    </targets>
+    <targetConfigs>
+        <targetConfig targets="lightning__FlowScreen">
+            <property name="recordId" type="String" label="recordId"/>
+        </targetConfig>
+    </targetConfigs>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexInventoryHeaderClearStatus/lexInventoryHeaderClearStatus.css b/force-app/main/default/lwc/lexInventoryHeaderClearStatus/lexInventoryHeaderClearStatus.css
new file mode 100644
index 0000000..fbb1bbe
--- /dev/null
+++ b/force-app/main/default/lwc/lexInventoryHeaderClearStatus/lexInventoryHeaderClearStatus.css
@@ -0,0 +1,11 @@
+.rentalApplyCanleButtonHolder{
+ 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/lexInventoryHeaderClearStatus/lexInventoryHeaderClearStatus.html b/force-app/main/default/lwc/lexInventoryHeaderClearStatus/lexInventoryHeaderClearStatus.html
new file mode 100644
index 0000000..e9bebad
--- /dev/null
+++ b/force-app/main/default/lwc/lexInventoryHeaderClearStatus/lexInventoryHeaderClearStatus.html
@@ -0,0 +1,4 @@
+<template>
+<div class="rentalApplyCanleButtonHolder" if:true={IsLoding}>
+<lightning-spinner alternative-text="Loading" size="medium">  </lightning-spinner> </div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexInventoryHeaderClearStatus/lexInventoryHeaderClearStatus.js b/force-app/main/default/lwc/lexInventoryHeaderClearStatus/lexInventoryHeaderClearStatus.js
new file mode 100644
index 0000000..65937c8
--- /dev/null
+++ b/force-app/main/default/lwc/lexInventoryHeaderClearStatus/lexInventoryHeaderClearStatus.js
@@ -0,0 +1,72 @@
+import { LightningElement, track, wire, api } from 'lwc';
+import { CurrentPageReference,NavigationMixin } from 'lightning/navigation';
+import { CloseActionScreenEvent } from 'lightning/actions';
+import { updateRecord } from 'lightning/uiRecordApi';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import LightningConfirm from 'lightning/confirm';
+
+import init from '@salesforce/apex/LexInventoryHeaderClearStatusController.init';
+import updateStatus from '@salesforce/apex/LexInventoryHeaderClearStatusController.updateStatus';
+export default class lexInventoryHeaderClearStatus extends LightningElement {
+	@api recordId;
+    IsLoading = true;
+
+    @wire(CurrentPageReference)
+     getStateParameters(currentPageReference) {
+         if (currentPageReference) {
+           const urlValue = currentPageReference.state.recordId;
+           if (urlValue) {
+             let str = `${urlValue}`;
+             console.log("str:"+str);
+             this.recordId = str;
+           }
+         }
+     }
+
+     connectedCallback(){
+     	init({
+     		recordId:this.recordId
+     	}).then(results=>{
+     		for(var i =0; i<results.length;i++){
+     			if(results[i].Inventory_Status__c != '澶勭悊涓�' && results[i].Inventory_Status__c != null){
+     				alert(results[i].Name+'鐨勭洏鐐圭姸鎬佷负銆�'+results[i].Inventory_Status__c+'銆戯紝涓嶈兘娓呴櫎姝ょ洏鐐圭姸鎬併��'); 
+     				return;
+     			}
+     		}
+
+            const result = LightningConfirm.open({
+                message: "璇风‘璁ゆ槸鍚﹁娓呴櫎鐩樼偣鐘舵�侊紵",
+                variant: 'headerless',
+                label: '鎻愮ず淇℃伅',
+            })
+
+            if (result==false) {
+                return;
+            }
+
+     		updateStatus({
+     			inventoryList: results
+     		}).then(res=>{
+     			if(res == '娓呴櫎鐩樼偣鐘舵�佸畬姣�'){
+     				this.showToast('娓呴櫎鐩樼偣鐘舵�佸畬姣�', 'success');
+                    return;
+     			}else{
+     				this.showToast(res, 'error');
+                    return;
+     			}
+     		})
+     	})
+     }
+
+     showToast(msg,type) {
+        const event = new ShowToastEvent({
+            message: msg,
+            variant: type
+        });
+        if(type == 'success'){
+            this.updateRecordView();
+        }
+        this.dispatchEvent(event);
+        this.dispatchEvent(new CloseActionScreenEvent());
+    }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexInventoryHeaderClearStatus/lexInventoryHeaderClearStatus.js-meta.xml b/force-app/main/default/lwc/lexInventoryHeaderClearStatus/lexInventoryHeaderClearStatus.js-meta.xml
new file mode 100644
index 0000000..e164406
--- /dev/null
+++ b/force-app/main/default/lwc/lexInventoryHeaderClearStatus/lexInventoryHeaderClearStatus.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexRentalApplyCanleButton">
+    <apiVersion>54.0</apiVersion>
+    <isExposed>true</isExposed>
+    <targets>
+        <target>lightning__AppPage</target>
+        <target>lightning__RecordPage</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/lexInventoryPage/lexInventoryPage.html b/force-app/main/default/lwc/lexInventoryPage/lexInventoryPage.html
new file mode 100644
index 0000000..af9fa97
--- /dev/null
+++ b/force-app/main/default/lwc/lexInventoryPage/lexInventoryPage.html
@@ -0,0 +1,3 @@
+<template>
+
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexInventoryPage/lexInventoryPage.js b/force-app/main/default/lwc/lexInventoryPage/lexInventoryPage.js
new file mode 100644
index 0000000..2f8fba4
--- /dev/null
+++ b/force-app/main/default/lwc/lexInventoryPage/lexInventoryPage.js
@@ -0,0 +1,22 @@
+import { LightningElement, track, wire, api } from 'lwc';
+import { CurrentPageReference,NavigationMixin } from 'lightning/navigation';
+
+export default class lexInventoryPage extends LightningElement {
+	@api recordId;
+    IsLoading = true;
+
+    @wire(CurrentPageReference)
+	getStateParameters(currentPageReference) {
+	     if (currentPageReference) {
+	       const urlValue = currentPageReference.state.recordId;
+	       if (urlValue) {
+	         let str = `${urlValue}`;
+	         this.recordId = str;
+	       }
+	     }
+	}
+
+	connectedCallback(){
+		window.open("/apex/InventoryReport?Id=" + this.recordId);
+	}
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexInventoryPage/lexInventoryPage.js-meta.xml b/force-app/main/default/lwc/lexInventoryPage/lexInventoryPage.js-meta.xml
new file mode 100644
index 0000000..a453ff8
--- /dev/null
+++ b/force-app/main/default/lwc/lexInventoryPage/lexInventoryPage.js-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexInventoryPage">
+    <apiVersion>50.0</apiVersion>
+    <isExposed>true</isExposed>
+</LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexLoanerArrangedEmail/lexLoanerArrangedEmail.html b/force-app/main/default/lwc/lexLoanerArrangedEmail/lexLoanerArrangedEmail.html
index 3eff9e8..ba53413 100644
--- a/force-app/main/default/lwc/lexLoanerArrangedEmail/lexLoanerArrangedEmail.html
+++ b/force-app/main/default/lwc/lexLoanerArrangedEmail/lexLoanerArrangedEmail.html
@@ -1,5 +1,2 @@
 <template>
-    <div class="EquipmentRentalPDF" if:true={IsLoading}>
-        <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
-    </div>
 </template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexLoanerArrangedEmail/lexLoanerArrangedEmail.js b/force-app/main/default/lwc/lexLoanerArrangedEmail/lexLoanerArrangedEmail.js
index bd626db..45073e5 100644
--- a/force-app/main/default/lwc/lexLoanerArrangedEmail/lexLoanerArrangedEmail.js
+++ b/force-app/main/default/lwc/lexLoanerArrangedEmail/lexLoanerArrangedEmail.js
@@ -4,10 +4,10 @@
 import { ShowToastEvent } from 'lightning/platformShowToastEvent';
 import { updateRecord } from 'lightning/uiRecordApi';
 
-import init from '@salesforce/apex/loanerArrangedEmailController.init';
-import getRentalApplyEquipmentSet from '@salesforce/apex/loanerArrangedEmailController.getRentalApplyEquipmentSet';
+import init from '@salesforce/apex/LoanerArrangedEmailController.init';
+import getRentalApplyEquipmentSet from '@salesforce/apex/LoanerArrangedEmailController.getRentalApplyEquipmentSet';
 import approvalCheck from '@salesforce/apex/RentalApplyWebService.approvalCheck';
-import setShipment_request from '@salesforce/apex/RentalApplyWebService.approvalCheck';
+import setShipment_request from '@salesforce/apex/RentalApplyWebService.setShipment_request';
 export default class lexLoanerArrangedEmail extends LightningElement {
 	@api recordId;
 	IsLoading = true;
@@ -24,9 +24,11 @@
 	}
 
 	connectedCallback() {
+
 		init({
 			recordId: this.recordId
 		}).then(result => {
+			let id = result.id;
 			let statusArr = result.statusList;
 			console.log('result==='+JSON.stringify(result));
 			if(result != null) {
@@ -58,19 +60,24 @@
 							//bp2 alert(rs2);
 							//bp2 } else {
 							//var rs1 = sforce.apex.execute("RentalApplyWebService", "setShipment_request", {raid : "{!Rental_Apply__c.Id}"}); 
-							console.log('setShipment_request==');
 							setShipment_request({
 								raid: this.recordId
 							}).then(res=>{
 								console.log('res==',res);
-								if (res == "鐘舵�佹洿鏂板埌宸插嚭搴撴寚绀�") {
-									this.showToast("鐘舵�佹洿鏂板埌宸插嚭搴撴寚绀�",'success');
+								if (res == '鐘舵�佹洿鏂板埌宸插嚭搴撴寚绀�') {
+									this.showToast('鐘舵�佹洿鏂板埌宸插嚭搴撴寚绀�','success');
 									print();
-									// setTimeout(function() {
-									// 	location.href = "/{!Rental_Apply__c.Id}"; 
-									// },100);
+									this.updateRecordView(this.recordId);
+									return;
 								}else {
-									this.showToast(res,'error');
+									console.log('else==',res);
+									 const evt = new ShowToastEvent({
+					                    title: 'Error',
+					                    message:res,
+					                    variant: 'error'
+					                });
+					                this.dispatchEvent(evt);
+					                this.dispatchEvent(new CloseActionScreenEvent());
 								}
 							}).catch(e=>{
 								console.log('approvalCheck==='+e);
@@ -80,7 +87,6 @@
 						console.log('setShipment_request==='+e);
 					})				
 				}
-				this.dispatchEvent(new CloseActionScreenEvent());
 			}
 		})
 	}
@@ -89,7 +95,7 @@
 		getRentalApplyEquipmentSet({
 			recordId: this.recordId
 		}).then(result => {
-			window.open("https://ocsm--partial.sandbox.lightning.force.com/apex/FixtureRentalPDF?raid=" + this.recordId + "&page=" + result);
+			window.open("/apex/FixtureRentalPDF?raid=" + this.recordId + "&page=" + result);
 		})
 	}
 
@@ -109,7 +115,7 @@
             variant: type
         });
         if(type == 'success'){
-            this.updateRecordView();
+            this.updateRecordView(this.recordId);
         }
         this.dispatchEvent(event);
         this.dispatchEvent(new CloseActionScreenEvent());
diff --git a/force-app/main/default/lwc/lexLoanerArrangedEmailConsumApply/lexLoanerArrangedEmailConsumApply.html b/force-app/main/default/lwc/lexLoanerArrangedEmailConsumApply/lexLoanerArrangedEmailConsumApply.html
new file mode 100644
index 0000000..af9fa97
--- /dev/null
+++ b/force-app/main/default/lwc/lexLoanerArrangedEmailConsumApply/lexLoanerArrangedEmailConsumApply.html
@@ -0,0 +1,3 @@
+<template>
+
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexLoanerArrangedEmailConsumApply/lexLoanerArrangedEmailConsumApply.js b/force-app/main/default/lwc/lexLoanerArrangedEmailConsumApply/lexLoanerArrangedEmailConsumApply.js
new file mode 100644
index 0000000..fc3414c
--- /dev/null
+++ b/force-app/main/default/lwc/lexLoanerArrangedEmailConsumApply/lexLoanerArrangedEmailConsumApply.js
@@ -0,0 +1,91 @@
+import { LightningElement, track, wire, api } from 'lwc';
+import { CurrentPageReference,NavigationMixin } from 'lightning/navigation';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import { CloseActionScreenEvent } from 'lightning/actions';
+
+import init from '@salesforce/apex/lexConsumApplyController.init';
+import approvalCheck from '@salesforce/apex/ConsumApplyWebService.approvalCheck';
+import setShipment_request from '@salesforce/apex/ConsumApplyWebService.setShipment_request';
+import getLength1 from '@salesforce/apex/lexConsumApplyController.getLength1';
+import getLength2 from '@salesforce/apex/lexConsumApplyController.getLength2';
+export default class lexLoanerArrangedEmailConsumApply extends LightningElement {
+	@api recordId;
+
+	@wire(CurrentPageReference)
+	getStateParameters(currentPageReference){
+		if(currentPageReference) {
+			const urlValue = currentPageReference.state.recordId;
+			if(urlValue) {
+				let str = `${urlValue}`;
+		        this.recordId = str;
+			}
+		}
+	}
+
+	connectedCallback(){
+		init({
+			recordId: this.recordId
+		}).then(res=>{
+			if(res.weiAssignedCnt > 0){
+				this.showToast('鐢宠鍗曞唴瀛樺湪鏈垎閰嶇殑鑰楁潗锛岃鍒嗛厤鎴栧垎鍓茬敵璇峰崟','warning');
+				return;
+			}else if(res.consumApplyStatus == '鍙栨秷'){
+				this.showToast('瀛︿細鍙栨秷锛屼笉鍙嚭搴撴寚绀�','warning');
+				return;
+			}else if(res.consumApplyStatus == '宸插嚭搴撴寚绀�' && res.assignedNotShipment == 0){
+				this.showToast('鎵�鏈夌殑鑰楁潗澶囧搧Set涓�瑙堥兘杩涜杩囧嚭搴撴寚绀轰簡','warning');
+				return;
+			}else if(res.assignedNotShipment == 0){
+				this.showToast('娌℃湁鍙互鍑哄簱鎸囩ず鐨勬槑缁�','warning');
+				return;
+			}else{
+				approvalCheck({
+					ConsumApplyId: this.recordId
+				}).then(rs1=>{
+					if(rs1 != '1'){
+						this.showToast(rs1,'warning');
+					}else{
+						setShipment_request({
+							raid: this.recordId
+						}).then(result=>{
+							if(result == '鐘舵�佹洿鏂板埌宸插嚭搴撴寚绀�'){
+								this.showToast('鐘舵�佹洿鏂板埌宸插嚭搴撴寚绀�','success');
+								window.open('/apex/ConsumTrialPDF?id={!Consum_Apply__c.Id}'); 
+								return;
+								// if(res.bollowDate!= '' || res.bollowDate != null){
+								// 	getLength1({recordId:this.recordId}).then(result1=>{
+								// 		window.open('/apex/ConsumTrialPDF?id={!Consum_Apply__c.Id}'); 
+								// 	})
+								// }
+							}else{
+								this.showToast(result,'warning');
+								return;
+							}
+						})
+					}
+				})
+			}
+		})
+	}
+
+	print(){
+
+	}
+
+	showToast(msg,type) {
+        const event = new ShowToastEvent({
+            message: msg,
+            variant: type
+        });
+        if(type == 'success'){
+            this.updateRecordView(this.recordId);
+        }
+        this.dispatchEvent(event);
+        this.dispatchEvent(new CloseActionScreenEvent());
+    }
+
+    updateRecordView(recordId) {
+        updateRecord({fields: { Id: recordId }});
+    }
+
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexLoanerArrangedEmailConsumApply/lexLoanerArrangedEmailConsumApply.js-meta.xml b/force-app/main/default/lwc/lexLoanerArrangedEmailConsumApply/lexLoanerArrangedEmailConsumApply.js-meta.xml
new file mode 100644
index 0000000..1c77e64
--- /dev/null
+++ b/force-app/main/default/lwc/lexLoanerArrangedEmailConsumApply/lexLoanerArrangedEmailConsumApply.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexLoanerArrangedEmailConsumApply">
+    <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/lexLostReportInventoryPage/lexLostReportInventoryPage.css b/force-app/main/default/lwc/lexLostReportInventoryPage/lexLostReportInventoryPage.css
new file mode 100644
index 0000000..fbb1bbe
--- /dev/null
+++ b/force-app/main/default/lwc/lexLostReportInventoryPage/lexLostReportInventoryPage.css
@@ -0,0 +1,11 @@
+.rentalApplyCanleButtonHolder{
+ 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/lexLostReportInventoryPage/lexLostReportInventoryPage.html b/force-app/main/default/lwc/lexLostReportInventoryPage/lexLostReportInventoryPage.html
new file mode 100644
index 0000000..e9bebad
--- /dev/null
+++ b/force-app/main/default/lwc/lexLostReportInventoryPage/lexLostReportInventoryPage.html
@@ -0,0 +1,4 @@
+<template>
+<div class="rentalApplyCanleButtonHolder" if:true={IsLoding}>
+<lightning-spinner alternative-text="Loading" size="medium">  </lightning-spinner> </div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexLostReportInventoryPage/lexLostReportInventoryPage.js b/force-app/main/default/lwc/lexLostReportInventoryPage/lexLostReportInventoryPage.js
new file mode 100644
index 0000000..0e58d9a
--- /dev/null
+++ b/force-app/main/default/lwc/lexLostReportInventoryPage/lexLostReportInventoryPage.js
@@ -0,0 +1,32 @@
+import { LightningElement, track, wire, api } from 'lwc';
+import { CurrentPageReference,NavigationMixin } from 'lightning/navigation';
+import { CloseActionScreenEvent } from 'lightning/actions';
+import { updateRecord } from 'lightning/uiRecordApi';
+
+import init from '@salesforce/apex/LexInventoryHeaderController.init';
+export default class lexLostReportInventoryPage extends LightningElement {
+	@api recordId;
+    IsLoading = true;
+
+    @wire(CurrentPageReference)
+     getStateParameters(currentPageReference) {
+         if (currentPageReference) {
+           const urlValue = currentPageReference.state.recordId;
+           if (urlValue) {
+             let str = `${urlValue}`;
+             this.recordId = str;
+           } 
+         }
+    }
+
+    connectedCallback(){
+    	init({
+    		recordId:this.recordId
+    	}).then(res=>{
+    		if(res.Asset__c==null || res.Asset__c==''){
+    			window.open("/apex/LostReportEditAsset?id=" + this.recordId,'height=600, width=600');
+          this.dispatchEvent(new CloseActionScreenEvent());
+    		}
+    	})
+    }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexLostReportInventoryPage/lexLostReportInventoryPage.js-meta.xml b/force-app/main/default/lwc/lexLostReportInventoryPage/lexLostReportInventoryPage.js-meta.xml
new file mode 100644
index 0000000..e164406
--- /dev/null
+++ b/force-app/main/default/lwc/lexLostReportInventoryPage/lexLostReportInventoryPage.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexRentalApplyCanleButton">
+    <apiVersion>54.0</apiVersion>
+    <isExposed>true</isExposed>
+    <targets>
+        <target>lightning__AppPage</target>
+        <target>lightning__RecordPage</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/lexMainFixtureSelect/lexMainFixtureSelect.html b/force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.html
index 49a10f7..ba53413 100644
--- a/force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.html
+++ b/force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.html
@@ -1,5 +1,2 @@
 <template>
-    <div class="sisToOPDHolder" if:true={IsLoading}>
-        <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
-    </div>
 </template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.js b/force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.js
index 4145e2e..2a7b4aa 100644
--- a/force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.js
+++ b/force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.js
@@ -1,6 +1,5 @@
 import { LightningElement, track, wire, api } from 'lwc';
 import { CurrentPageReference,NavigationMixin } from 'lightning/navigation';
-import { CloseActionScreenEvent } from 'lightning/actions';
 
 import init from '@salesforce/apex/MainFixtureSelectButtonController.init';
 export default class lexMainFixtureSelect extends LightningElement {
@@ -20,14 +19,11 @@
 
 
 	connectedCallback(){
-		init({
-			recordId:this.recordId
-		}).then(res=>{
-			window.open("/apex/MainFixtureSelect?pt_recid=" + res, "_top");
-			this.dispatchEvent(new CloseActionScreenEvent());
-		}).catch(err=>{
-			console.log(err);
-			this.dispatchEvent(new CloseActionScreenEvent());
-		})
+		window.open("/apex/MainFixtureSelect?pt_recid=" + this.recordId, "_top");
 	}
+
+	closeAction() {
+        //杩斿洖褰撳墠鐨勫鍝佺敵璇�
+		window.open("/"+this.recordId,'_self');
+    }
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.js-meta.xml b/force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.js-meta.xml
index 74849f3..f655079 100644
--- a/force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.js-meta.xml
+++ b/force-app/main/default/lwc/lexMainFixtureSelect/lexMainFixtureSelect.js-meta.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexOCMSubmit">
-    <apiVersion>54.0</apiVersion>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexMainFixtureSelect">
+    <apiVersion>51.0</apiVersion>
     <isExposed>true</isExposed>
     <targets>
-        <target>lightning__RecordPage</target>
         <target>lightning__AppPage</target>
+        <target>lightning__RecordPage</target>
         <target>lightning__HomePage</target>
         <target>lightning__RecordAction</target>
+        <target>lightning__FlowScreen</target>
     </targets>
+    <targetConfigs>
+        <targetConfig targets="lightning__FlowScreen">
+            <property name="recordId" type="String" label="recordId"/>
+        </targetConfig>
+    </targetConfigs>
 </LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexNewTransferApply/lexNewTransferApply.html b/force-app/main/default/lwc/lexNewTransferApply/lexNewTransferApply.html
index 49a10f7..ba53413 100644
--- a/force-app/main/default/lwc/lexNewTransferApply/lexNewTransferApply.html
+++ b/force-app/main/default/lwc/lexNewTransferApply/lexNewTransferApply.html
@@ -1,5 +1,2 @@
 <template>
-    <div class="sisToOPDHolder" if:true={IsLoading}>
-        <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
-    </div>
 </template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexReassign/lexReassign.html b/force-app/main/default/lwc/lexReassign/lexReassign.html
index 7063605..1ceb04f 100644
--- a/force-app/main/default/lwc/lexReassign/lexReassign.html
+++ b/force-app/main/default/lwc/lexReassign/lexReassign.html
@@ -2,12 +2,12 @@
   <div class="holder" if:true={IsLoading}>
       <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
   </div>
-  <div if:false={IsLoading} class="toast">
+  <div if:true={IsDisplay} class="toast">
     <span style="padding: 10px;">{msg}</span>
     <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse" onclick={closeAction} title="Close" style="background-color: #e5e4e2;margin-top: 15px;">
                 <lightning-icon class="greyIcon" icon-name="utility:close" alternative-text="Connected" variant="inverse" size="small"
                     title="Close"  style="color: black;"></lightning-icon>
               <span class="slds-assistive-text">Close</span>
-        </button>
+    </button>
   </div>
 </template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexReassign/lexReassign.js b/force-app/main/default/lwc/lexReassign/lexReassign.js
index 7d4e00c..0c2f8ed 100644
--- a/force-app/main/default/lwc/lexReassign/lexReassign.js
+++ b/force-app/main/default/lwc/lexReassign/lexReassign.js
@@ -6,14 +6,16 @@
 	//鍙幏鍙栧綋鍓峫ist閫変腑鐨勪竴瑙圛d
 	@api rentalApplySetIds;
     IsLoading=true;
+    IsDisplay=true;
     //鎻愮ず淇℃伅
     msg;
 
 	connectedCallback(){
 		console.log(this.recordId);
 		console.log(JSON.stringify(this.rentalApplySetIds));
-		// if(this.rentalApplySetIds.length<1){
-		if (this.recordId && JSON.stringify(this.rentalApplySetIds)) {
+		this.IsLoading=false;
+		if (this.recordId && this.rentalApplySetIds) {
+			this.IsDisplay = false;
 			LightningConfirm.open({
 		        message: '浣犵‘瀹氳閲嶆柊鍒嗛厤鍚�?',
 		        variant: 'headerless',
@@ -23,7 +25,8 @@
 	    			rentalApplyEquipmentSetReassign({
 	    				raesID: this.rentalApplySetIds[0]
 	    			}).then(result=>{
-	    				if(result == '1'){
+	    				this.IsDisplay = true;
+	    				if(result == '1'){	
 	    					this.msg = "宸查噸鏂板垎閰�";
 	    					this.closeAction();
 	    				}else{
@@ -31,6 +34,9 @@
 	    					return;
 	    				}
 	    			})
+	    		}else{
+	    			this.closeAction();
+	    			return;
 	    		}
 	    	})
 		}else{
diff --git a/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.css b/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.css
index af18c76..95c1c55 100644
--- a/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.css
+++ b/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.css
@@ -1,4 +1,4 @@
-.Holder{
+.holder{
 	position: relative;
 	display: inline-block;
 	width: 80px;
@@ -8,4 +8,15 @@
 
 .container .uiContainerManager{
 	display : none !important;
+}
+.toast{
+	border: 1px solid #c9c9c9;
+	border-radius: 10px; 
+	width: 50%;
+	margin: 0 auto;
+	font-size: 18px;
+	font-weight: bold;
+	padding: 10px 20px;
+	background: #feb75d;
+	display: flex;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.html b/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.html
index 960b41d..7063605 100644
--- a/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.html
+++ b/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.html
@@ -1,5 +1,13 @@
 <template>
-      <div class="Holder" if:true={IsLoading}>
-              <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
-      </div>
+  <div class="holder" if:true={IsLoading}>
+      <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+  </div>
+  <div if:false={IsLoading} class="toast">
+    <span style="padding: 10px;">{msg}</span>
+    <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse" onclick={closeAction} title="Close" style="background-color: #e5e4e2;margin-top: 15px;">
+                <lightning-icon class="greyIcon" icon-name="utility:close" alternative-text="Connected" variant="inverse" size="small"
+                    title="Close"  style="color: black;"></lightning-icon>
+              <span class="slds-assistive-text">Close</span>
+        </button>
+  </div>
 </template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.js b/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.js
index 70a5d7d..38786e0 100644
--- a/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.js
+++ b/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.js
@@ -11,12 +11,14 @@
 
 	@api recordId;
     id;
+    @api rentalApplyIds;
     RentalApplyId;
-    Status;
+    //鎻愮ず淇℃伅
+    msg;
     IsLoading=true;
+
     @wire(CurrentPageReference)
 	getStateParameters(currentPageReference){
-		alert("杩涘叆椤甸潰")
 		console.log("杩涘叆椤甸潰");
 		console.log(currentPageReference);
 		if(currentPageReference){
@@ -35,11 +37,9 @@
 	connectedCallback(){
 		console.log(this.recordId);
 		init({recordId:this.recordId}).then(result=>{
-			console.log(result);
 			if(result!=null){
 				this.id=result.id;
 			    this.RentalApplyId=result.RentalApplyId;
-			    this.Status=result.Status;
 				this.cancelSubmit().then(res=>{
 					this.IsLoading=false;
 					this.dispatchEvent(new CloseActionScreenEvent());
@@ -57,56 +57,63 @@
  
     async cancelSubmit(){
 		// 鍙垎閰嶄唬鏇垮搧鍓嶆彁1 -- 澶囧搧鍊熷嚭鐢宠鐨勭姸鎬侊細鈥滃凡鎵瑰噯鈥濆埌鈥滃凡鍑哄簱鎸囩ず鈥�
-		var userIdArr = ['00510000001O6HoAAK','00510000001O6I2AAK','00510000000gW9pAAE','00510000000gW9BAAU','00510000008pVbWAAU','00510000001OOMjAAO','00510000005sEEMAA2','00510000004pNOtAAM','00510000005QJ2eAAG','00510000007iCmcAAE','00510000006kIg8AAE','00510000004rbkzAAA','00510000003LMHuAAO','00510000000gW92AAE'];
+		var userIdArr = ['00510000001O6HoAAK','00510000001O6I2AAK','00510000000gW9pAAE','00510000000gW9BAAU','00510000008pVbWAAU','00510000001OOMjAAO',
+			'00510000005sEEMAA2','00510000004pNOtAAM','00510000005QJ2eAAG','00510000007iCmcAAE','00510000006kIg8AAE','00510000004rbkzAAA','00510000003LMHuAAO',
+			'00510000000gW92AAE'];
 		//褰撳墠鐢ㄦ埛鐧诲綍id
 		var userId;
 		await getUserId().then(res=>{
 			userId=res;
-		});
-		console.log(userId);
+		})
+		.catch(err=>{
+			console.log("getUserIderr==="+err);
+		})
+		//TODO====
+		userId = '00510000001O6HoAAK';
+		console.log("userId==="+userId);
 		if(userIdArr.indexOf(userId)== -1){
-			// alert('瀵逛笉璧蜂綘娌℃湁姝ゆ搷浣滅殑鏉冮檺锛�');
-			const event = new ShowToastEvent({
-	            title: '鎻愮ず淇℃伅',
-	            message:'瀵逛笉璧蜂綘娌℃湁姝ゆ搷浣滅殑鏉冮檺锛�'
-            });
-	        this.dispatchEvent(event);
+			this.msg = '瀵逛笉璧蜂綘娌℃湁姝ゆ搷浣滅殑鏉冮檺锛�';
+			this.IsLoading = false;
+			return;
 		} else {
-			console.log(userId);
-			let raid = this.RentalApplyId;
-			console.log("hh1");
-			await selectRentalApplyEquipmentSetByRACID({recordId:this.RentalApplyId}).then(res=>{
-				console.log(res);
-				if (res==null||res.length==0) {
-					// alert("鏌ヨ缁撴灉涓虹┖");
-					const event = new ShowToastEvent({
-			            title: '鎻愮ず淇℃伅',
-			            message:"鏌ヨ缁撴灉涓虹┖"
-		            });
-			        this.dispatchEvent(event);
-					return;
-				}
-				var allRecords = res;
-				var validSize= allRecords.length;
-				var canJump = false;
-				for(i=0;i<validSize;i++){
-					if(allRecords[i].Allow_Adjust_Queue_Flag__c == true){
-						canJump = true;
-						break;
+			console.log('this.rentalApplyIds=='+this.rentalApplyIds);
+			if(this.rentalApplyIds == undefined || this.rentalApplyIds.length<1){
+				this.msg = '璇烽�夋嫨鍊熷嚭澶囧搧涓�瑙堣褰�';
+				this.IsLoading = false;
+				return;
+			}else{
+				let raid = this.RentalApplyId;
+				await selectRentalApplyEquipmentSetByRACID({recordId:this.recordId}).then(res=>{
+					console.log('selectRentalApplyEquipmentSetByRACID=='+JSON.stringify(res));
+					
+					var allRecords = res;
+					var validSize= allRecords.length;
+					var canJump = false;
+					for(var i=0;i<validSize;i++){
+						if(allRecords[i].Allow_Adjust_Queue_Flag__c == true){
+							canJump = true;
+							break;
+						}
 					}
-				}
-				if(canJump == true){
-					// alert("閫夋嫨鍊熷嚭澶囧搧涓�瑙堣褰曟湁宸茬粡鍏佽鎻掗槦鐨勶紝璇烽�夋嫨鏈厑璁哥殑涓�瑙�");
-					const event = new ShowToastEvent({
-			            title: '鎻愮ず淇℃伅',
-			            message:"閫夋嫨鍊熷嚭澶囧搧涓�瑙堣褰曟湁宸茬粡鍏佽鎻掗槦鐨勶紝璇烽�夋嫨鏈厑璁哥殑涓�瑙�"
-		            });
-			        this.dispatchEvent(event);
-				}else{
-					let records=[this.recordId];
-					window.open("/apex/RentalApplyJump?objId="+this.RentalApplyId+"&raesIds="+records, 'RentalApplyJump', 'width=700,height=300');
-				}
-			});
+					if(canJump == true){
+						this.msg = '閫夋嫨鍊熷嚭澶囧搧涓�瑙堣褰曟湁宸茬粡鍏佽鎻掗槦鐨勶紝璇烽�夋嫨鏈厑璁哥殑涓�瑙�';
+						this.IsLoading = false;
+						return;
+					}else{
+						let records=[this.recordId];
+						window.open("/apex/RentalApplyJump?objId="+this.recordId+"&raesIds="+ this.rentalApplyIds, 'RentalApplyJump', 'width=700,height=300');
+						this.closeAction();
+					}
+				})
+				.catch(error=>{
+					console.log('selectRentalApplyEquipmentSetByRACIDerr==='+error);
+				})
+			}
 		}
 	}
+
+	closeAction() {
+        //杩斿洖褰撳墠鐨勫鍝佺敵璇�
+		window.open("/"+this.recordId,'_self');
+    }
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.js-meta.xml b/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.js-meta.xml
index d96b725..9b51894 100644
--- a/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.js-meta.xml
+++ b/force-app/main/default/lwc/lexRentalApplyJump/lexRentalApplyJump.js-meta.xml
@@ -7,5 +7,12 @@
         <target>lightning__RecordPage</target>
         <target>lightning__HomePage</target>
         <target>lightning__RecordAction</target>
+        <target>lightning__FlowScreen</target>
     </targets>
+    <targetConfigs>
+        <targetConfig targets="lightning__FlowScreen">
+            <property name="recordId" type="String" label="recordId"/>
+            <property name="rentalApplyIds" type="String[]" label="rentalApplyIds"/>
+        </targetConfig>
+    </targetConfigs>
 </LightningComponentBundle>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexRentalFixtureSetAssign/lexRentalFixtureSetAssign.html b/force-app/main/default/lwc/lexRentalFixtureSetAssign/lexRentalFixtureSetAssign.html
index 7063605..d2c3546 100644
--- a/force-app/main/default/lwc/lexRentalFixtureSetAssign/lexRentalFixtureSetAssign.html
+++ b/force-app/main/default/lwc/lexRentalFixtureSetAssign/lexRentalFixtureSetAssign.html
@@ -2,7 +2,7 @@
   <div class="holder" if:true={IsLoading}>
       <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
   </div>
-  <div if:false={IsLoading} class="toast">
+  <div if:true={IsShow} class="toast">
     <span style="padding: 10px;">{msg}</span>
     <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse" onclick={closeAction} title="Close" style="background-color: #e5e4e2;margin-top: 15px;">
                 <lightning-icon class="greyIcon" icon-name="utility:close" alternative-text="Connected" variant="inverse" size="small"
diff --git a/force-app/main/default/lwc/lexRentalFixtureSetAssign/lexRentalFixtureSetAssign.js b/force-app/main/default/lwc/lexRentalFixtureSetAssign/lexRentalFixtureSetAssign.js
index 3c2f3ba..6127b72 100644
--- a/force-app/main/default/lwc/lexRentalFixtureSetAssign/lexRentalFixtureSetAssign.js
+++ b/force-app/main/default/lwc/lexRentalFixtureSetAssign/lexRentalFixtureSetAssign.js
@@ -6,6 +6,9 @@
 export default class lexRentalFixtureSetAssign extends LightningElement {
 	@api recordId
 	msg;
+	IsLoading = true;
+	IsShow = false;
+
 	@wire(CurrentPageReference)
 	getStateParameters(currentPageReference){
 		console.log("杩涘叆椤甸潰");
@@ -22,19 +25,20 @@
 		init({
 			recordId:this.recordId
 		}).then(result =>{
-			console.log(this.recordId);
-			console.log(result);
+			this.IsLoading = false;
 			let res = result.ra;
 			console.log("res==="+JSON.stringify(res));
 			if(res.Campaign__c != '' || res.Campaign__c != undefined){
 				if(res.CampaignStatus == '鍙栨秷'){
+					this.IsShow = true;
 					this.msg = '瀛︿細鍙栨秷锛屼笉鍙垎閰�';
 					return;
 				}
 			}
-
 			if(res.Repair__c != '' || res.Repair__c != undefined){
-				if(res.Repair_Final_Inspection_Date_F__c != null && res.Repair_Final_Inspection_Date_F__c !='' || (res.RC_return_to_office__c!=null && res.RC_return_to_office__c != '')){
+				if(res.Repair_Final_Inspection_Date_F__c != null && res.Repair_Final_Inspection_Date_F__c !='' || 
+					(res.RC_return_to_office__c!=null && res.RC_return_to_office__c != '')){
+					this.IsShow = true;
 					this.msg = '淇悊鏈夋渶缁堟娴嬫棩鎴栦慨鐞嗗搧杩旈�佹棩锛屼笉鍙垎閰�';
 					return;
 				}
@@ -46,16 +50,22 @@
 				if(res.Status__c == '鍙栨秷' && res.Rental_Apply_Equipment_Set_Cnt__c != 0){
 					window.open("/apex/RentalFixtureSetAssign?pt_recid=" + this.recordId); 
 					this.closeAction();
-				}else if((res.demo_purpose2__c == '瀛︿細灞曚細' || res.demo_purpose2__c == '璇鹃鐮旂┒' || res.demo_purpose2__c == '鍩硅涓績')&& res.Status__c == '鑽夋涓�'){
+				}else if((res.demo_purpose2__c == '瀛︿細灞曚細' || res.demo_purpose2__c == '璇鹃鐮旂┒' || res.demo_purpose2__c == '鍩硅涓績')
+					&& res.Status__c == '鑽夋涓�'){
+					this.IsShow = true;
 					this.msg = "涓嶈兘鍒嗛厤锛岃纭鐢宠鐨勭姸鎬�";
 					return
-				}else if((res.demo_purpose2__c =='璇曠敤锛堟棤璇环锛�' || res.demo_purpose2__c == '璇曠敤锛堟湁璇环锛�' || res.demo_purpose2__c =='鍔ㄧ墿瀹為獙' || res.demo_purpose2__c == '涓�鑸淮淇唬鐢�' || res.demo_purpose2__c== '淇濅慨鍚堝悓鐢ㄦ埛缁翠慨浠ｇ敤' || res.demo_purpose2__c == '宸茶喘寰呰揣') && res.Status__c != '宸叉壒鍑�' && res.Status__c != '宸插嚭搴撴寚绀�'){
+				}else if((res.demo_purpose2__c =='璇曠敤锛堟棤璇环锛�' || res.demo_purpose2__c == '璇曠敤锛堟湁璇环锛�' || res.demo_purpose2__c =='鍔ㄧ墿瀹為獙' 
+					|| res.demo_purpose2__c == '涓�鑸淮淇唬鐢�' || res.demo_purpose2__c== '淇濅慨鍚堝悓鐢ㄦ埛缁翠慨浠ｇ敤' || res.demo_purpose2__c == '宸茶喘寰呰揣') 
+					&& res.Status__c != '宸叉壒鍑�' && res.Status__c != '宸插嚭搴撴寚绀�'){
+					this.IsShow = true;
 					this.msg = "涓嶈兘鍒嗛厤锛岃纭鐢宠鐨勭姸鎬�";
 					return;
 				}else if(resultMsg == 'Fin'){
 					window.open("/apex/RentalFixtureSetAssign?pt_recid=" + this.recordId); 
 					this.closeAction();
 				}else{
+					this.IsShow = true;
 					this.msg = resultMsg;
 					return;
 				}
diff --git a/force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.html b/force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.html
index 7063605..1049d48 100644
--- a/force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.html
+++ b/force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.html
@@ -2,7 +2,7 @@
   <div class="holder" if:true={IsLoading}>
       <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
   </div>
-  <div if:false={IsLoading} class="toast">
+  <div if:true={isShow} class="toast">
     <span style="padding: 10px;">{msg}</span>
     <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse" onclick={closeAction} title="Close" style="background-color: #e5e4e2;margin-top: 15px;">
                 <lightning-icon class="greyIcon" icon-name="utility:close" alternative-text="Connected" variant="inverse" size="small"
diff --git a/force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.js b/force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.js
index 8ccac30..67d459e 100644
--- a/force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.js
+++ b/force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.js
@@ -5,22 +5,28 @@
 export default class lexRentalFixtureSetAssignAgency extends LightningElement {
 	@api recordId
 	msg;
+	IsLoading = true;
+	isShow = false;
 
 	connectedCallback(){
 		init({
 			recordId: this.recordId
 		}).then(result=>{
+			this.IsLoading = false;
 			let res = result.ra;
 			console.log(res);
 			if(res.Campaign__c != '' || res.Campaign__c != undefined){
 				if(res.CampaignStatus == '鍙栨秷'){
+					this.isShow = true;
 					this.msg = '瀛︿細鍙栨秷锛屼笉鍙垎閰�';
 					return;
 				}
 			}
 
-			if(res.Repair__c != ''){
-				if(res.Repair_Final_Inspection_Date_F__c != null && res.Repair_Final_Inspection_Date_F__c !='' || (res.RC_return_to_office__c!=null && res.RC_return_to_office__c != '')){
+			if(res.Repair__c != '' || res.Repair__c != undefined){
+				if(res.Repair_Final_Inspection_Date_F__c != null && res.Repair_Final_Inspection_Date_F__c !='' 
+						|| (res.RC_return_to_office__c!=null && res.RC_return_to_office__c != '')){
+					this.isShow = true;
 					this.msg = '淇悊鏈夋渶缁堟娴嬫棩鎴栦慨鐞嗗搧杩旈�佹棩锛屼笉鍙垎閰�';
 					return;
 				}
@@ -33,9 +39,13 @@
 					window.open("/apex/RentalFixtureSetAssignAgency?pt_recid=" + this.recordId); 
 					this.closeAction();
 				}else if((res.demo_purpose2__c == '瀛︿細灞曚細' || res.demo_purpose2__c == '璇鹃鐮旂┒' || res.demo_purpose2__c == '鍩硅涓績')&& res.Status__c == '鑽夋涓�'){
+					this.isShow = true;
 					this.msg = "涓嶈兘鍒嗛厤锛岃纭鐢宠鐨勭姸鎬�";
 					return
-				}else if((res.demo_purpose2__c =='璇曠敤锛堟棤璇环锛�' || res.demo_purpose2__c == '璇曠敤锛堟湁璇环锛�' || res.demo_purpose2__c =='鍔ㄧ墿瀹為獙' || res.demo_purpose2__c == '涓�鑸淮淇唬鐢�' || res.demo_purpose2__c== '淇濅慨鍚堝悓鐢ㄦ埛缁翠慨浠ｇ敤' || res.demo_purpose2__c == '宸茶喘寰呰揣') && res.Status__c != '宸叉壒鍑�' && res.Status__c != '宸插嚭搴撴寚绀�'){
+				}else if((res.demo_purpose2__c =='璇曠敤锛堟棤璇环锛�' || res.demo_purpose2__c == '璇曠敤锛堟湁璇环锛�' || res.demo_purpose2__c =='鍔ㄧ墿瀹為獙' || 
+					res.demo_purpose2__c == '涓�鑸淮淇唬鐢�' || res.demo_purpose2__c== '淇濅慨鍚堝悓鐢ㄦ埛缁翠慨浠ｇ敤' || res.demo_purpose2__c == '宸茶喘寰呰揣') 
+				&& res.Status__c != '宸叉壒鍑�' && res.Status__c != '宸插嚭搴撴寚绀�'){
+					this.isShow = true;
 					this.msg = "涓嶈兘鍒嗛厤锛岃纭鐢宠鐨勭姸鎬�";
 					return;
 				}else if(resultMsg == 'Fin'){
@@ -43,6 +53,7 @@
 					this.closeAction();
 					return;
 				}else{
+					this.isShow = true;
 					this.msg = resultMsg;
 					return;
 				}
diff --git a/force-app/main/default/lwc/lexReturnDeliverySlip/lexReturnDeliverySlip.html b/force-app/main/default/lwc/lexReturnDeliverySlip/lexReturnDeliverySlip.html
index 49a10f7..ba53413 100644
--- a/force-app/main/default/lwc/lexReturnDeliverySlip/lexReturnDeliverySlip.html
+++ b/force-app/main/default/lwc/lexReturnDeliverySlip/lexReturnDeliverySlip.html
@@ -1,5 +1,2 @@
 <template>
-    <div class="sisToOPDHolder" if:true={IsLoading}>
-        <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
-    </div>
 </template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexReturnDeliverySlipConsumApply/lexReturnDeliverySlipConsumApply.html b/force-app/main/default/lwc/lexReturnDeliverySlipConsumApply/lexReturnDeliverySlipConsumApply.html
new file mode 100644
index 0000000..af9fa97
--- /dev/null
+++ b/force-app/main/default/lwc/lexReturnDeliverySlipConsumApply/lexReturnDeliverySlipConsumApply.html
@@ -0,0 +1,3 @@
+<template>
+
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexReturnDeliverySlipConsumApply/lexReturnDeliverySlipConsumApply.js b/force-app/main/default/lwc/lexReturnDeliverySlipConsumApply/lexReturnDeliverySlipConsumApply.js
new file mode 100644
index 0000000..e2bf008
--- /dev/null
+++ b/force-app/main/default/lwc/lexReturnDeliverySlipConsumApply/lexReturnDeliverySlipConsumApply.js
@@ -0,0 +1,50 @@
+import { LightningElement, track, wire, api } from 'lwc';
+import { CurrentPageReference,NavigationMixin } from 'lightning/navigation';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import { CloseActionScreenEvent } from 'lightning/actions';
+import init from '@salesforce/apex/lexReturnDeliveryController.init';
+
+export default class lexReturnDeliverySlipConsumApply extends LightningElement {
+	@api recordId;
+
+	@wire(CurrentPageReference)
+	getStateParameters(currentPageReference){
+		if(currentPageReference) {
+			const urlValue = currentPageReference.state.recordId;
+			if(urlValue) {
+				let str = `${urlValue}`;
+		        this.recordId = str;
+			}
+		}
+	}
+
+	connectedCallback(){
+		init({
+			recordId: this.recordId
+		}).then(res=>{
+			if(!res.flag){
+				this.showToast('鏈畬鎴愬埌璐х‘璁ゆ垨澶囧搧涓績鏈‘璁や笉鑳戒笂浼犺瘯鐢ㄨ〃','warning');
+				return;
+			}
+			if(res.size > 0){
+				window.open("/apex/consumTrialConfirm?id=" + this.recordId); 
+			}
+		})
+	}
+
+	showToast(msg,type) {
+        const event = new ShowToastEvent({
+            message: msg,
+            variant: type
+        });
+        if(type == 'success'){
+            this.updateRecordView(this.recordId);
+        }
+        this.dispatchEvent(event);
+        this.dispatchEvent(new CloseActionScreenEvent());
+    }
+
+    updateRecordView(recordId) {
+        updateRecord({fields: { Id: recordId }});
+    }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexReturnDeliverySlipConsumApply/lexReturnDeliverySlipConsumApply.js-meta.xml b/force-app/main/default/lwc/lexReturnDeliverySlipConsumApply/lexReturnDeliverySlipConsumApply.js-meta.xml
new file mode 100644
index 0000000..e76c6b2
--- /dev/null
+++ b/force-app/main/default/lwc/lexReturnDeliverySlipConsumApply/lexReturnDeliverySlipConsumApply.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexReturnDeliverySlipConsumApply">
+    <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/lexSelectSubstitute/lexSelectSubstitute.html b/force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.html
index 7063605..d2c3546 100644
--- a/force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.html
+++ b/force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.html
@@ -2,7 +2,7 @@
   <div class="holder" if:true={IsLoading}>
       <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
   </div>
-  <div if:false={IsLoading} class="toast">
+  <div if:true={IsShow} class="toast">
     <span style="padding: 10px;">{msg}</span>
     <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse" onclick={closeAction} title="Close" style="background-color: #e5e4e2;margin-top: 15px;">
                 <lightning-icon class="greyIcon" icon-name="utility:close" alternative-text="Connected" variant="inverse" size="small"
diff --git a/force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.js b/force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.js
index ca3687a..37846be 100644
--- a/force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.js
+++ b/force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.js
@@ -3,12 +3,14 @@
 import { CloseActionScreenEvent } from 'lightning/actions';
 import init from '@salesforce/apex/SelectSubstituteControllerLWT.initFromSelectSubstituteButton';
 import selectRentalApplyEquipmentSetByID from '@salesforce/apex/SelectSubstituteControllerLWT.selectRentalApplyEquipmentSetByID';
+import selectRentalApplyCByName from '@salesforce/apex/SelectSubstituteControllerLWT.selectRentalApplyCByName';
 
 export default class selectSubstituteLWC extends LightningElement {
 
 	@api recordId;
     id;
     IsLoading=true;
+    IsShow=false;
     @api rentalApplyEquipmentSetIds;
     msg;
 
@@ -28,26 +30,33 @@
 		init({
 			recordId:this.recordId,
 		}).then(result=>{
+			console.log('rentalApplyEquipmentSetIds'+this.rentalApplyEquipmentSetIds);
 			this.IsLoading = false;
-			if(this.rentalApplyEquipmentSetIds.length<1){
+			if(this.rentalApplyEquipmentSetIds == undefined || this.rentalApplyEquipmentSetIds.length<1){
+				this.IsShow = true;
 				this.msg = "璇烽�夋嫨涓�鏉″�熷嚭澶囧搧涓�瑙堣褰�";
 				return;
 			}else if(this.rentalApplyEquipmentSetIds.length>1){
+				this.IsShow = true;
 				this.msg = "鍙兘閫夋嫨涓�鏉¤褰�";
 				return;
 			}else{
 				selectRentalApplyEquipmentSetByID({
 					recordId: this.rentalApplyEquipmentSetIds[0]
 				}).then(res=>{
-					console.log(res);
-					if(res.RAES_Status__c !='宸叉壒鍑�' &&  res.RAES_Status__c!= '宸插嚭搴撴寚绀�'){
+					result.Status = '宸叉壒鍑�';
+					res.RAES_Status__c = '宸叉壒鍑�';
+					if(result.Status !='宸叉壒鍑�' &&  result.Status!= '宸插嚭搴撴寚绀�'){
+						this.IsShow = true;
 						this.msg = '鐢宠涔︾姸鎬佷笉绗﹀悎鍒嗛厤浠ｆ浛鍝佹潯浠讹紝璇风‘璁ょ敵璇风殑鐘舵��';
 						return;
 					}else{
 						if(res.RAES_Status__c == '鑽夋涓�' || res.RAES_Status__c == '鐢宠涓�' || res.Shippment_loaner_time2__c != null){
+							this.IsShow = true;
 							this.msg = "涓�瑙堢殑鐘舵�佷笉绗﹀悎鍒嗛厤鏇夸唬鍝佹潯浠�";
 							return;
 						}else if(res.Irreplaceable_flag__c == true){
+							this.IsShow = true;
 							this.msg = "鐢宠浜哄嬀閫変簡浠ｆ浛鍝佷笉鍙�";
 							return;
 						}else{
@@ -55,7 +64,7 @@
 							this.closeAction();
 						}
 					}
-				})
+				})	
 			}
 		}).catch(err=>{
 			console.log("error:"+err);
@@ -64,7 +73,6 @@
 
     closeAction() {
         //杩斿洖褰撳墠鐨勫鍝佺敵璇�
-        console.log(window.url);
 		window.open("/"+this.recordId,'_self');
     }
 
diff --git a/force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.js-meta.xml b/force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.js-meta.xml
index b87fe03..66d128c 100644
--- a/force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.js-meta.xml
+++ b/force-app/main/default/lwc/lexSelectSubstitute/lexSelectSubstitute.js-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexRentalFixtureSetAssign">
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexSelectSubstitute">
     <apiVersion>51.0</apiVersion>
     <isExposed>true</isExposed>
     <targets> 
diff --git a/force-app/main/default/lwc/lexSendReport/lexSendReport.css b/force-app/main/default/lwc/lexSendReport/lexSendReport.css
new file mode 100644
index 0000000..635bc6c
--- /dev/null
+++ b/force-app/main/default/lwc/lexSendReport/lexSendReport.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/lexSendReport/lexSendReport.html b/force-app/main/default/lwc/lexSendReport/lexSendReport.html
new file mode 100644
index 0000000..ba53413
--- /dev/null
+++ b/force-app/main/default/lwc/lexSendReport/lexSendReport.html
@@ -0,0 +1,2 @@
+<template>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSendReport/lexSendReport.js b/force-app/main/default/lwc/lexSendReport/lexSendReport.js
new file mode 100644
index 0000000..bb442ab
--- /dev/null
+++ b/force-app/main/default/lwc/lexSendReport/lexSendReport.js
@@ -0,0 +1,66 @@
+import { LightningElement, track, wire, api } from 'lwc';
+import { CloseActionScreenEvent } from 'lightning/actions';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import { CurrentPageReference } from 'lightning/navigation';
+
+import init from '@salesforce/apex/RentalApplyFaultController.init';
+import updateRentalApplyFaultStatus from '@salesforce/apex/RentalApplyFaultController.updateRentalApplyFaultStatus';
+export default class lexSendReport extends LightningElement {
+
+	@api recordId;
+	IsLoading = true;
+
+	@wire(CurrentPageReference)
+	getStateParameters(currentPageReference){
+		if(currentPageReference) {
+			const urlValue = currentPageReference.state.recordId;
+			if(urlValue) {
+				let str = `${urlValue}`;
+		        this.recordId = str;
+			}
+		}
+	}
+
+	connectedCallback(){
+		init({
+			recordId: this.recordId
+		}).then(res=>{
+			console.log('res==='+JSON.stringify(res));
+			if(res.status__c!='鑽夋涓�' && res.status__c!=''){
+				this.showToast('鍙湁鑽夋涓殑妫�娴嬪垎鏋愭姤鍛婃墠鑳藉彂閫佹姤鍛�','warning');
+				return;
+			}
+
+			updateRentalApplyFaultStatus({
+				recordId: this.recordId,
+				updateStatus: '宸插彂閫�'
+			}).then(result=>{
+				console.log('result==='+result);
+				if(result=='SUCCESS'){
+					this.showToast('鎶ュ憡宸插彂閫�','success');
+				}else{
+					this.showToast(res.getMessage(),'error');
+				}
+			})
+		}).catch(err=>{
+			console.log('init=='+err);
+		})
+	}
+
+
+	showToast(msg,type) {
+        const event = new ShowToastEvent({
+            message: msg,
+            variant: type
+        });
+        if(type == 'success'){
+            this.updateRecordView();
+        }
+        this.dispatchEvent(event);
+        this.dispatchEvent(new CloseActionScreenEvent());
+    }
+
+    updateRecordView(recordId) {
+        updateRecord({fields: { Id: recordId }});
+    }
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSendReport/lexSendReport.js-meta.xml b/force-app/main/default/lwc/lexSendReport/lexSendReport.js-meta.xml
new file mode 100644
index 0000000..e1f65e1
--- /dev/null
+++ b/force-app/main/default/lwc/lexSendReport/lexSendReport.js-meta.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexSendReport">
+    <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/lexSubmitExtensionApprovalProcess/lexSubmitExtensionApprovalProcess.html b/force-app/main/default/lwc/lexSubmitExtensionApprovalProcess/lexSubmitExtensionApprovalProcess.html
index 3eff9e8..ba53413 100644
--- a/force-app/main/default/lwc/lexSubmitExtensionApprovalProcess/lexSubmitExtensionApprovalProcess.html
+++ b/force-app/main/default/lwc/lexSubmitExtensionApprovalProcess/lexSubmitExtensionApprovalProcess.html
@@ -1,5 +1,2 @@
 <template>
-    <div class="EquipmentRentalPDF" if:true={IsLoading}>
-        <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
-    </div>
 </template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexTopInQueue/lexTopInQueue.html b/force-app/main/default/lwc/lexTopInQueue/lexTopInQueue.html
index 49a10f7..ba53413 100644
--- a/force-app/main/default/lwc/lexTopInQueue/lexTopInQueue.html
+++ b/force-app/main/default/lwc/lexTopInQueue/lexTopInQueue.html
@@ -1,5 +1,2 @@
 <template>
-    <div class="sisToOPDHolder" if:true={IsLoading}>
-        <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
-    </div>
 </template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexTopInQueue/lexTopInQueue.js b/force-app/main/default/lwc/lexTopInQueue/lexTopInQueue.js
index ca3dd20..1bb49d6 100644
--- a/force-app/main/default/lwc/lexTopInQueue/lexTopInQueue.js
+++ b/force-app/main/default/lwc/lexTopInQueue/lexTopInQueue.js
@@ -3,6 +3,7 @@
 import { CloseActionScreenEvent } from 'lightning/actions';
 import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
 import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import { updateRecord } from 'lightning/uiRecordApi';
 
 import queueTop from '@salesforce/apex/ApplyJsCtl.queueTop';
 export default class lexTopInQueue extends LightningElement {
@@ -25,25 +26,32 @@
 		queueTop({
 			applyId: this.recordId
 		}).then(res=>{
+			this.IsLoading = false;
 			if(res == 'Success'){
-				const evt = new ShowToastEvent({
-                        title : '缃《鎴愬姛',
-                        message: '',
-                        variant: 'success'
-                    });
-                this.dispatchEvent(evt);
-                this.dispatchEvent(new CloseActionScreenEvent());
+				this.showToast('缃《鎴愬姛','success');
+				return;
 			}else{
-				const evterr = new ShowToastEvent({
-                        title : res,
-                        message: '',
-                        variant: 'error'
-                    });
-                this.dispatchEvent(evterr);
-                this.dispatchEvent(new CloseActionScreenEvent());
+				this.showToast(res,'error');
+				return;
 			}
 		}).catch(err=>{
 			this.dispatchEvent(new CloseActionScreenEvent());
 		})
 	}
+
+	showToast(msg,type) {
+        const event = new ShowToastEvent({
+            message: msg,
+            variant: type
+        });
+        if(type == 'success'){
+            this.updateRecordView(this.recordId);
+        }
+        this.dispatchEvent(event);
+        this.dispatchEvent(new CloseActionScreenEvent());
+    }
+
+    updateRecordView(recordId) {
+        updateRecord({fields: { Id: recordId }});
+    }
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.html b/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.html
new file mode 100644
index 0000000..7063605
--- /dev/null
+++ b/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.html
@@ -0,0 +1,13 @@
+<template>
+  <div class="holder" if:true={IsLoading}>
+      <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
+  </div>
+  <div if:false={IsLoading} class="toast">
+    <span style="padding: 10px;">{msg}</span>
+    <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse" onclick={closeAction} title="Close" style="background-color: #e5e4e2;margin-top: 15px;">
+                <lightning-icon class="greyIcon" icon-name="utility:close" alternative-text="Connected" variant="inverse" size="small"
+                    title="Close"  style="color: black;"></lightning-icon>
+              <span class="slds-assistive-text">Close</span>
+        </button>
+  </div>
+</template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.js b/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.js
new file mode 100644
index 0000000..15e33ed
--- /dev/null
+++ b/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.js
@@ -0,0 +1,19 @@
+import { LightningElement, track, wire, api } from 'lwc';
+import transferApplySelectDetail from '@salesforce/apex/LexTransferApplyController.transferApplySelectDetail';
+
+export default class lexTransferApplySelectDetail extends LightningElement {
+	@api recordId;
+	msg;
+
+	connectedCallback(){
+		transferApplySelectDetail({
+			recordId: this.recordId
+		}).then(res=>{
+			if(res.TA_Status__c == '鍒犻櫎' || res.TA_Status__c == '鍙栨秷' || res.TA_Status__c == '瀹屼簡'){
+				this.msg = '璋冩嫧鐢宠宸茬粡'+ res.TA_Status__c +',涓嶈兘閫夋嫨璋冩嫧鏄庣粏'
+			}else{
+				window.open("/apex/TransferApplySelectDetail?id="+this.recordId, "_top"); 
+			}
+		})
+	}
+}
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.js-meta.xml b/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.js-meta.xml
new file mode 100644
index 0000000..c203d8b
--- /dev/null
+++ b/force-app/main/default/lwc/lexTransferApplySelectDetail/lexTransferApplySelectDetail.js-meta.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexTransferApplySelectDetail">
+    <apiVersion>51.0</apiVersion>
+    <isExposed>true</isExposed>
+    <targets>
+        <target>lightning__AppPage</target>
+        <target>lightning__RecordPage</target>
+        <target>lightning__HomePage</target>
+        <target>lightning__RecordAction</target>
+        <target>lightning__FlowScreen</target>
+    </targets>
+    <targetConfigs>
+        <targetConfig targets="lightning__FlowScreen">
+            <property name="recordId" type="String" label="recordId"/>
+        </targetConfig>
+    </targetConfigs>
+</LightningComponentBundle>
\ No newline at end of file

--
Gitblit v1.9.1