From 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期三, 23 八月 2023 14:54:59 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev

---
 force-app/main/default/lwc/lexConsumApply_FromAccount/lexConsumApply_FromAccount.js |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/force-app/main/default/lwc/lexConsumApply_FromAccount/lexConsumApply_FromAccount.js b/force-app/main/default/lwc/lexConsumApply_FromAccount/lexConsumApply_FromAccount.js
index 161d51d..7ad8c63 100644
--- a/force-app/main/default/lwc/lexConsumApply_FromAccount/lexConsumApply_FromAccount.js
+++ b/force-app/main/default/lwc/lexConsumApply_FromAccount/lexConsumApply_FromAccount.js
@@ -7,7 +7,7 @@
 import { ShowToastEvent } from 'lightning/platformShowToastEvent';
 import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
 
-export default class LexConsumApply_FromAccount extends LightningElement {
+export default class LexConsumApply_FromAccount extends NavigationMixin(LightningElement) {
 
     @api recordId;
     IsLoading = true;
@@ -34,8 +34,8 @@
             recordId: this.recordId
         }).then(result=>{
             UserInfo_Owner({}).then(res=>{
-                if(res.isFormalStuff == 'true'){
-                    this.showToast('璇曠敤鏈熷唴锛屼笉鑳界敵璇�','warning');
+                if(res.isFormalStuff){
+                    this.showToast('璇曠敤鏈熷唴锛屼笉鑳界敵璇�','error');
                     return;
                 }else{
     
@@ -55,8 +55,8 @@
                         Account__c:result.name,
                         Name:'*',
                         demo_purpose2__c:'OPD璇曠敤',
-                        Person_In_Charge__c:res.lastName + res.firstName,
-                        applyUser__c:res.lastName + res.firstName
+                        Person_In_Charge__c:res.id,
+                        applyUser__c:res.id
                     });
     
                     this[NavigationMixin.Navigate]({
@@ -66,7 +66,7 @@
                             actionName: 'new'
                         },
                         state:{
-                            defaultFieldValues: this.defaultValues
+                            defaultFieldValues: defaultValues
                         }
                     })
                 }
@@ -92,6 +92,7 @@
             variant: type
         });
         this.dispatchEvent(evt);
+        this.dispatchEvent(new CloseActionScreenEvent());
     }
 
 }
\ No newline at end of file

--
Gitblit v1.9.1