From 5fa4c7d6c8d987891ffe5ef8fae615b33e032886 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期四, 20 七月 2023 10:32:10 +0800
Subject: [PATCH] button-lexRentalFixtureSetAssignAgency
---
force-app/main/default/classes/RentalApplyWebService.cls | 6 ++-
force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.js | 84 +++++++++++++++++++++--------------------
force-app/main/default/classes/lexRentalFixtureSetAssignController.cls-meta.xml | 2
force-app/main/default/classes/lexRentalFixtureSetAssignController.cls | 8 ++++
4 files changed, 56 insertions(+), 44 deletions(-)
diff --git a/force-app/main/default/classes/RentalApplyWebService.cls b/force-app/main/default/classes/RentalApplyWebService.cls
index 63fe20e..af448ab 100644
--- a/force-app/main/default/classes/RentalApplyWebService.cls
+++ b/force-app/main/default/classes/RentalApplyWebService.cls
@@ -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';
diff --git a/force-app/main/default/classes/lexRentalFixtureSetAssignController.cls b/force-app/main/default/classes/lexRentalFixtureSetAssignController.cls
index 990b7bc..27adb98 100644
--- a/force-app/main/default/classes/lexRentalFixtureSetAssignController.cls
+++ b/force-app/main/default/classes/lexRentalFixtureSetAssignController.cls
@@ -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
diff --git a/force-app/main/default/classes/lexRentalFixtureSetAssignController.cls-meta.xml b/force-app/main/default/classes/lexRentalFixtureSetAssignController.cls-meta.xml
index 9662499..541584f 100644
--- a/force-app/main/default/classes/lexRentalFixtureSetAssignController.cls-meta.xml
+++ b/force-app/main/default/classes/lexRentalFixtureSetAssignController.cls-meta.xml
@@ -2,4 +2,4 @@
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
<apiVersion>50.0</apiVersion>
<status>Active</status>
-</ApexClass>
\ No newline at end of file
+</ApexClass>
diff --git a/force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.js b/force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.js
index 67d459e..9ec851a 100644
--- a/force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.js
+++ b/force-app/main/default/lwc/lexRentalFixtureSetAssignAgency/lexRentalFixtureSetAssignAgency.js
@@ -13,51 +13,53 @@
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(result){
+ 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 != '' || 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;
+ 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;
+ }
}
- }
- assignBtn({
- Rid: this.recordId
- }).then(resultMsg => {
- if(res.Status__c == '鍙栨秷' && res.Rental_Apply_Equipment_Set_Cnt__c != 0){
- 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 != '宸插嚭搴撴寚绀�'){
- this.isShow = true;
- this.msg = "涓嶈兘鍒嗛厤锛岃纭鐢宠鐨勭姸鎬�";
- return;
- }else if(resultMsg == 'Fin'){
- window.open("/apex/RentalFixtureSetAssignAgency?pt_recid=" + this.recordId);
- this.closeAction();
- return;
- }else{
- this.isShow = true;
- this.msg = resultMsg;
- return;
- }
- })
+ assignBtn({
+ Rid: this.recordId
+ }).then(resultMsg => {
+ if(res.Status__c == '鍙栨秷' && res.Rental_Apply_Equipment_Set_Cnt__c != 0){
+ 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 != '宸插嚭搴撴寚绀�'){
+ this.isShow = true;
+ this.msg = "涓嶈兘鍒嗛厤锛岃纭鐢宠鐨勭姸鎬�";
+ return;
+ }else if(resultMsg == 'Fin'){
+ window.open("/apex/RentalFixtureSetAssignAgency?pt_recid=" + this.recordId);
+ this.closeAction();
+ return;
+ }else{
+ this.isShow = true;
+ this.msg = resultMsg;
+ return;
+ }
+ })
+ }
})
.catch(err=>{
console.log('initErr==='+err);
--
Gitblit v1.9.1