lightningupdate.git

			@@ -377,6 +377,7 @@
			rasdid = rentalApplyId.subString(rentalApplyId.indexOf(';') + 1);
			rentalApplyId = rentalApplyId.subString(0, rentalApplyId.indexOf(';'));
			}
			system.debug(rentalApplyId+'==aaa');
			//1388 yc 20211021 跨区域分配不能出库 end
			//备品借出申请
			Rental_Apply__c[] rentalApply = [select Id,repair__r.Repair_Final_Inspection_Date__c,Bollow_Date__c,repair__r.Return_Without_Repair_Date__c,
			@@ -384,6 +385,7 @@
			demo_purpose2__c,Follow_UP_Opp__r.Shipping_Finished_Day_Func__c,next_action__c,QIS_number__r.ReplaceDeliveryDate__c
			from Rental_Apply__c
			where Id = :rentalApplyId];
			system.debug(rentalApplyId+'==aaa'+rentalApply.size());
			if (rentalApply.size() == 0) {
			returnStr = '没有备品借出申请，请确认。';
			return returnStr;
			@@ -725,13 +727,13 @@
			if(raescc != null && raescc.size() > 0){
			for(Rental_Apply_Equipment_Set__c rr : raescc){
			if ((rr.Received_Confirm__c == 'OK' \|\| rr.Received_Confirm__c == '默认签收-OK') && rr.Asset_return_time__c != null) {
			return '此单不满足延期条件。';
			return '此单不满足延期条件01。';
			}
			}
			return '1';
			}
			}else{
			return '此单不满足延期条件。';
			return '此单不满足延期条件02。';
			}
			}else{
			return '2';

			@@ -13,6 +13,7 @@
			recordId: this.recordId
			}).then(result=>{
			this.IsLoading = false;
			if(result){
			let res = result.ra;
			console.log(res);
			if(res.Campaign__c != '' \|\| res.Campaign__c != undefined){
			@@ -58,6 +59,7 @@
			return;
			}
			})
			}
			})
			.catch(err=>{
			console.log('initErr==='+err);

	force-app/main/default/classes/RentalApplyWebService.cls	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	force-app/main/default/classes/lexRentalFixtureSetAssignController.cls	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	force-app/main/default/classes/lexRentalFixtureSetAssignController.cls-meta.xml	补丁 \| 查看 \| 原始文档 \| blame \| 历史
	force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.js	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -1,3 +1,11 @@
			/**
			* *
			ODescription:
			GAuthor: sun xia
			@Date: 2023-07-11 15:31:56
			GIastEditors: sun xia
			@IastEditTime: 2023-07-11 15:31:56
			* */
			public with sharing class lexRentalFixtureSetAssignController {

			@AuraEnabled