From 212967a5a65a12f9673170b80e3d8c766dcee5d0 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期四, 06 七月 2023 10:46:18 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.js | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.js b/force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.js
index 55736c9..eaf7afa 100644
--- a/force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.js
+++ b/force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.js
@@ -1,9 +1,9 @@
import { LightningElement,wire,track,api} from 'lwc';
import { CurrentPageReference, NavigationMixin} from "lightning/navigation";
import { CloseActionScreenEvent } from 'lightning/actions';
-import init from '@salesforce/apex/lexEquipmentRentalApply_FromQISCtl.rentalApp';
-import rentalApp from '@salesforce/apex/lexEquipmentRentalApply_FromQISCtl.init';
-import UserInfo_Owner from '@salesforce/apex/lexEquipmentRentalApply_FromQISCtl.UserInfo_Owner';
+import rentalApp from '@salesforce/apex/LexEquipmentRentalApply_FromQISCtl.rentalApp';
+import init from '@salesforce/apex/LexEquipmentRentalApply_FromQISCtl.init';
+import UserInfo_Owner from '@salesforce/apex/LexEquipmentRentalApply_FromQISCtl.UserInfo_Owner';
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
@@ -33,7 +33,7 @@
rentalApp({
recordId: this.recordId
}).then(result => {
- console.log('rentalApp============' + result);
+ console.log('rentalApp============',result);
if(result.lenth > 0){
const evt = new ShowToastEvent({
title : 'Error',
@@ -47,22 +47,23 @@
recordId: this.recordId
}).then(result => {
this.IsLoading = false;
-
+ console.log('init============',result);
if (result != null) {
if(result.nextAction=='閫佸洖'){
- this.showToast('QIS瀵瑰簲鏂规硶涓衡�滈�佸洖鈥濓紝涓嶈兘鐢宠','warning');
+ this.showToast('QIS瀵瑰簲鏂规硶涓衡�滈�佸洖鈥濓紝涓嶈兘鐢宠','error');
return;
}
if(result.qISStatus=='鑽夋涓�'){
- this.showToast('QIS鐘舵�佷负鑽夋涓紝涓嶈兘鐢宠','warning');
+ // this.msg = 'QIS鐘舵�佷负鑽夋涓紝涓嶈兘鐢宠';
+ this.showToast('QIS鐘舵�佷负鑽夋涓紝涓嶈兘鐢宠','error');
return;
}
if(result.qISStatus=='FSE濉啓瀹屾瘯'){
- this.showToast('QIS鐘舵�佷负FSE濉啓瀹屾瘯锛屼笉鑳界敵璇�','warning');
+ this.showToast('QIS鐘舵�佷负FSE濉啓瀹屾瘯锛屼笉鑳界敵璇�','error');
return;
}
if(result.qISStatus=='鍙栨秷'){
- this.showToast('QIS鐘舵�佷负鍙栨秷锛屼笉鑳界敵璇�','warning');
+ this.showToast('QIS鐘舵�佷负鍙栨秷锛屼笉鑳界敵璇�','error');
return;
}
// if('{!$User.isFormal_Stuff__c}'=='true'){
@@ -73,22 +74,22 @@
// }
UserInfo_Owner({}).then(res=>{
if(res.isFormalStuff == 'true'){
- this.showToast('璇曠敤鏈熷唴锛屼笉鑳界敵璇�','warning');
+ this.showToast('璇曠敤鏈熷唴锛屼笉鑳界敵璇�','error');
return;
}else{
const defaultValues = encodeDefaultFieldValues({
QIS_Report__c: this.recordId,
- Hospital: result.hospital,
- Strategic_dept: result.departmentClass,
- Account:result.hospitalDepartment,
- Demo_purpose1:'缁翠慨浠ｇ敤',
- demo_purpose2:'绱㈣禂QIS',
+ Hospital__c: result.hospital,
+ Strategic_dept__c: result.departmentClass,
+ Account__c:result.hospitalDepartment,
+ Demo_purpose1__c:'缁翠慨浠ｇ敤',
+ demo_purpose2__c:'绱㈣禂QIS',
Name:'*',
- Person_In_Charge:res.lastName + res.firstName,
- applyUser:res.lastName + res.firstName,
- Loaner_received_staff:res.lastName + res.firstName,
- QIS_number:result.name,
- QISRepair:result.repair
+ Person_In_Charge__c:res.lastName + res.firstName,
+ applyUser__c:res.lastName + res.firstName,
+ Loaner_received_staff__c:res.lastName + res.firstName,
+ QIS_number__c:result.name,
+ QISRepair__c:result.repair
});
this[NavigationMixin.Navigate]({
@@ -122,11 +123,12 @@
showToast(message, type) {
const evt = new ShowToastEvent({
- title: '',
+ title: 'Error',
message: message,
variant: type
});
this.dispatchEvent(evt);
+ this.dispatchEvent(new CloseActionScreenEvent());
}
}
\ No newline at end of file
--
Gitblit v1.9.1