From b5c77579789941a2a05a3b3958fc45857c2cfe4f Mon Sep 17 00:00:00 2001
From: zz <1842059105@qq.com>
Date: 星期一, 10 四月 2023 15:11:17 +0800
Subject: [PATCH] 修改:"授权申请陈老师提出的意见"和"修改招标项目新建医院按钮跳转地址"

---
 force-app/main/default/lwc/lexApplicationSubmitButton/lexApplicationSubmitButton.js |    8 +++-----
 force-app/main/default/lwc/lexTenderingHospitalButton/lexTenderingHospitalButton.js |    4 +++-
 force-app/main/default/classes/ApplicationButtonController.cls                      |   20 +++++++++++---------
 force-app/main/default/classes/TenderingButtonController.cls                        |    3 +++
 force-app/main/default/lwc/lexApplicationCancelSubmit/lexApplicationCancelSubmit.js |   10 +++-------
 5 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/force-app/main/default/classes/ApplicationButtonController.cls b/force-app/main/default/classes/ApplicationButtonController.cls
index ad88920..9910696 100644
--- a/force-app/main/default/classes/ApplicationButtonController.cls
+++ b/force-app/main/default/classes/ApplicationButtonController.cls
@@ -16,6 +16,7 @@
     //鎺堟潈鐢宠鐨勬彁浜ゆ寜閽�
     @AuraEnabled
     public static String submit(String recordId) {
+       String messageText = '';
        try {
         Request_tedner_doc__c rac = [SELECT 	Id,Status__c,Submit_check_flag__c,RecordTypeId,Submit_time__c FROM Request_tedner_doc__c WHERE Id = :recordId LIMIT 1];
         rac.Status__c = LightingButtonConstant.STATUS_Application_Submitted;
@@ -23,18 +24,19 @@
         rac.Submit_check_flag__c = true;
         rac.Submit_time__c = Datetime.now();
         update rac;
-        return '1';
+        messageText = '1';
+        return messageText;
        } catch (Exception ex) {
         System.debug(LoggingLevel.INFO, '*** xu: ' + ex);
-        return ex.getMessage();
-       } finally {
-
+        messageText = ex.getMessage();
+        return messageText;
        }
     }
 
     //鎺堟潈鐢宠鐨勫彇娑堟彁浜ゆ寜閽�
     @AuraEnabled
     public static String submitCancel(String recordId) {
+       String messageText = '';
        try {
         Request_tedner_doc__c report = [SELECT 	Id,Status__c,Submit_check_flag__c,RecordTypeId,Submit_time__c FROM Request_tedner_doc__c WHERE Id = :recordId LIMIT 1];
         report.Status__c = LightingButtonConstant.STATUS_Application_CancelSubmit;
@@ -42,18 +44,18 @@
         report.Submit_check_flag__c = false;
         report.Submit_time__c = null;
         update report;
-        return '1';
+        messageText = '1';
+        return messageText;
        } catch (Exception ex) {
         System.debug(LoggingLevel.INFO, '*** cancelXu: ' + ex);
-        return ex.getMessage();
-       } finally {
-
+        messageText = ex.getMessage();
+        return messageText;
        }
     }
 
     //鑾峰彇褰撳墠鐧诲綍浜虹殑 id
     @AuraEnabled
-    public static UserResult UserInfo_Owner() {
+    public static UserResult userInfo_Owner() {
         UserResult result = new UserResult();
         ID myUserID = UserInfo.getUserId();
         try { 
diff --git a/force-app/main/default/classes/TenderingButtonController.cls b/force-app/main/default/classes/TenderingButtonController.cls
index 26eb6dd..5a2d0ea 100644
--- a/force-app/main/default/classes/TenderingButtonController.cls
+++ b/force-app/main/default/classes/TenderingButtonController.cls
@@ -11,6 +11,7 @@
             res.opportunityNum = String.valueOf(report.OpportunityNum__c);
             res.isRelateProject = report.IsRelateProject__c;
             res.profileId = UserInfo.getProfileId();
+            res.Environment_Url = System.Label.Environment_Url;
             System.debug(LoggingLevel.INFO, '*** xu: ' + res);
         }catch(Exception e){
             System.debug(LoggingLevel.INFO, '*** xu: ' + e);
@@ -47,5 +48,7 @@
         public String isRelateProject;
         @AuraEnabled
         public String profileId;
+        @AuraEnabled
+        public String Environment_Url;
     }
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexApplicationCancelSubmit/lexApplicationCancelSubmit.js b/force-app/main/default/lwc/lexApplicationCancelSubmit/lexApplicationCancelSubmit.js
index 9bb6831..ee9ec67 100644
--- a/force-app/main/default/lwc/lexApplicationCancelSubmit/lexApplicationCancelSubmit.js
+++ b/force-app/main/default/lwc/lexApplicationCancelSubmit/lexApplicationCancelSubmit.js
@@ -5,7 +5,7 @@
 import { updateRecord } from 'lightning/uiRecordApi';
 import { ShowToastEvent } from 'lightning/platformShowToastEvent';
 import submitCancel from '@salesforce/apex/ApplicationButtonController.submitCancel';
-import UserInfo_Owner from '@salesforce/apex/ApplicationButtonController.UserInfo_Owner';
+import userInfo_Owner from '@salesforce/apex/ApplicationButtonController.userInfo_Owner';
 export default class lexApplicationCancelSubmit extends LightningElement {
     @api recordId;//OwnerId
     ownerId;
@@ -31,16 +31,12 @@
                 this.ownerId = result.OwnerId;
                 this.monthlyReportId = result.Id;
                 this.cancelSubmit();
-        }).catch(() => {
-
-        }).finally(() => {
-            
-        });        
+        })       
     }
     //鎺堟潈鐢宠 鍙栨秷鎻愪氦
     cancelSubmit(){
         //'鑾峰彇褰撳墠鐧婚檰浜篿d'
-        UserInfo_Owner({}).then(result=>{
+        userInfo_Owner({}).then(result=>{
             if(this.ownerId == result.id){
                 submitCancel({
                     recordId: this.recordId
diff --git a/force-app/main/default/lwc/lexApplicationSubmitButton/lexApplicationSubmitButton.js b/force-app/main/default/lwc/lexApplicationSubmitButton/lexApplicationSubmitButton.js
index 6a76d14..90688a9 100644
--- a/force-app/main/default/lwc/lexApplicationSubmitButton/lexApplicationSubmitButton.js
+++ b/force-app/main/default/lwc/lexApplicationSubmitButton/lexApplicationSubmitButton.js
@@ -2,7 +2,7 @@
 import { CurrentPageReference } from "lightning/navigation";
 import { CloseActionScreenEvent } from 'lightning/actions';
 import  init  from '@salesforce/apex/ApplicationButtonController.initSubmitButton';
-import UserInfo_Owner from '@salesforce/apex/ApplicationButtonController.UserInfo_Owner';
+import userInfo_Owner from '@salesforce/apex/ApplicationButtonController.userInfo_Owner';
 import submit  from '@salesforce/apex/ApplicationButtonController.submit';
 import { updateRecord } from 'lightning/uiRecordApi';
 import { ShowToastEvent } from 'lightning/platformShowToastEvent';
@@ -34,15 +34,13 @@
                 this.id = result.Id;
                 this.Submit();
             }
-        }).catch(() => {
-        }).finally(() => {
-        });        
+        })       
     }
 
     Submit(){
         this.arrMessage = [];
         //鑾峰彇鑾峰彇褰撳墠鐧婚檰浜�
-        UserInfo_Owner({}).then(result=>{
+        userInfo_Owner({}).then(result=>{
             if(this.ownerId == result.id){
                 submit({
                     recordId: this.recordId
diff --git a/force-app/main/default/lwc/lexTenderingHospitalButton/lexTenderingHospitalButton.js b/force-app/main/default/lwc/lexTenderingHospitalButton/lexTenderingHospitalButton.js
index 37f9f44..5ad29ea 100644
--- a/force-app/main/default/lwc/lexTenderingHospitalButton/lexTenderingHospitalButton.js
+++ b/force-app/main/default/lwc/lexTenderingHospitalButton/lexTenderingHospitalButton.js
@@ -6,6 +6,7 @@
     @api recordId;//褰撳墠杩欐潯鏁版嵁鐨刬d
     id;//杩斿洖鍊肩殑id  Tender_information__c鎷涙爣椤圭洰鐨刬d
     name;//鎷涙爣椤圭洰鍚�
+    Environment_Url;//鏂板缓鍖婚櫌鍦板潃
     IsLoading = true;
 
     @wire(CurrentPageReference)
@@ -26,6 +27,7 @@
                 this.IsLoading = false;
                 this.id = result.Id;
                 this.name = result.name;
+                this.Environment_Url = result.Environment_Url;
                 this.HospitalButton();
                 this.dispatchEvent(new CloseActionScreenEvent());
         }).catch(() => {
@@ -36,7 +38,7 @@
 
     //鏂板缓鍖婚櫌
     HospitalButton(){
-        var url = 'https://ocsm.my.salesforce.com/?ec=302&startURL=%2F'+'001/e?CF00N10000009I0o7='+encodeURIComponent(this.name)
+        var url = this.Environment_Url+'001/e?CF00N10000009I0o7='+encodeURIComponent(this.name)
         +'&CF00N10000009I0o7_lkid='+encodeURIComponent(this.id)
         +'&00N10000009HFQT='+encodeURIComponent('鎷涙爣椤圭洰')
         +'&RecordType=01210000000QemG'

--
Gitblit v1.9.1