From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/EnquiryDetails.page | 71 +++++++++++++++++++++++++++--------
1 files changed, 55 insertions(+), 16 deletions(-)
diff --git a/force-app/main/default/pages/EnquiryDetails.page b/force-app/main/default/pages/EnquiryDetails.page
index 3119892..e5bca7b 100644
--- a/force-app/main/default/pages/EnquiryDetails.page
+++ b/force-app/main/default/pages/EnquiryDetails.page
@@ -1,5 +1,9 @@
-<apex:page Controller="EnquiryDetailsController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="璇环淇℃伅">
+<apex:page Controller="EnquiryDetailsController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="璇环淇℃伅" lightningStylesheets="true">
+ <apex:includeScript value="/soap/ajax/51.0/connection.js"/>
+ <apex:includeScript value="/soap/ajax/51.0/apex.js"/>
+ <apex:includeScript value="/resource/CommonUtilJs"/>
<script>
+
function saveJs() {
// body...
save();
@@ -16,13 +20,30 @@
window.opener=null;
window.close();
}
+
+//20220805 SWAG-CGXCDV lt start
+function changeJs() {
+ var oppId = document.getElementById('allPage:allForm:allBlock:Editable:IdOpp').value;
+
+ sforce.connection.sessionId = '{!$Api.Session_ID}';
+ var flg = sforce.apex.execute("EnquiryDetailsWebService", "change", { oppId: oppId });
+ if(flg == "true"){
+ alert('宸插瓨鍦ㄥ緟瀹℃壒鐨勫彉鏇寸敵璇枫��');
+ }else{
+ window.open('/apex/ImprovedForecastTimeAno?id='+ oppId ,'','height=500,width=800,top=200,left=250,location=no');
+ }
+}
+//20220805 SWAG-CGXCDV lt end
+
</script>
<style>
.dateFormat {
display: none;
}
.pbSubsection {
- height: 285px;
+ height: 300px;
+ width: 400px;
+ /* height: 285px; */
}
</style>
<apex:form id="allForm">
@@ -34,26 +55,44 @@
</apex:outputPanel>
<apex:pageBlock title="濉啓璇环淇℃伅" id="Editable" >
<apex:inputHidden value="{!goOrNot}" id="goOrNot" />
- <apex:pageBlockSection columns="1" id="inList" >
- <apex:outputField id="EnquiryName" value="{!insOppo.name}" />
- <apex:outputField id="Status_Formula__c" value="{!insOppo.Status_Formula__c}" />
- <apex:outputField id="Department_Name__c" value="{!insOppo.Department_Name__c}" />
- <apex:inputField id="Opportunity_stage__c" value="{!insOppo.Opportunity_stage__c}" required="true"/>
- <apex:inputField id="Close_Forecasted_Assume_Date__c" value="{!insOppo.Close_Forecasted_Assume_Date__c}" label="棰勬祴OCSM绛剧害鏃�(鎷呭綋)" />
+ <!-- 20220805 SWAG-CGXCDV lt start -->
+ <apex:inputHidden id="IdOpp" value="{!insOppo.Id}" />
+ <apex:pageBlockSection columns="2" id="inList" > <!-- 1鍙�2 -->
+ <!-- 20220805 SWAG-CGXCDV lt end <td></td>-->
+ <apex:outputField id="EnquiryName" value="{!insOppo.name}" /><td></td>
+ <apex:outputField id="Status_Formula__c" value="{!insOppo.Status_Formula__c}" /><td></td>
+ <apex:outputField id="Department_Name__c" value="{!insOppo.Department_Name__c}" /><td></td>
+ <apex:inputField id="Opportunity_stage__c" value="{!insOppo.Opportunity_stage__c}" required="true"/><td></td>
+ <!-- 璇环杩涘彛璁鸿瘉 fy 20220803 start -->
+ <!-- 璇环杩涘彛璁鸿瘉 ssm 20220823 椤甸潰甯冨眬鍒嗘垚宸﹀彸涓ゅ垪 绌挎彃鎺掔増 start -->
+ <!-- <apex:inputField id="Close_Forecasted_Assume_Date__c" value="{!insOppo.Close_Forecasted_Assume_Date__c}" label="棰勬祴OCSM绛剧害鏃�(鎷呭綋)" /> -->
+ <!-- lt -->
+ <!-- <apex:outputField id="Close_Forecasted_Assume_Date__c" value="{!insOppo.Close_Forecasted_Assume_Date__c}" label="棰勬祴OCSM绛剧害鏃�(鎷呭綋)" /> -->
+ <apex:outputField id="Close_Forecasted_Date__c" value="{!insOppo.Close_Forecasted_Date__c}" label="棰勬祴OCSM绛剧害鏃�(KPI)" />
+ <!-- lt -->
<!-- <apex:inputField id="Application_Amount_Submit__c" value="{!insOppo.Application_Amount_Submit__c}" />
<apex:inputField id="Budget_Amount_Approval__c" value="{!insOppo.Budget_Amount_Approval__c}"/> -->
- <apex:inputField id="Bid_Date__c" value="{!insOppo.Bid_Date__c}" label="鎷涙爣鏃�" />
- <apex:inputField id="Closing_Bid_Date__c" value="{!insOppo.Closing_Bid_Date__c}" label="涓爣鏃�" />
- <apex:inputField id="TenderBeginDate__c" value="{!insOppo.TenderBeginDate__c}" label="鎷涙爣鏃ワ紙鎷涙爣椤圭洰锛�" />
- <apex:inputField id="Closing_Bid_Date_Bid__c" value="{!insOppo.Closing_Bid_Date_Bid__c}" label="涓爣鏃ワ紙鎷涙姇鏍囷級"/>
-
+ <apex:inputField id="ImportDemonstration_state__c" value="{!insOppo.ImportDemonstration_state__c}" label="杩涘彛璁鸿瘉鐘舵��"/>
+ <apex:inputField id="Bid_Date__c" value="{!insOppo.Bid_Date__c}" label="12.鎷涙爣鏃�" />
+ <apex:inputField id="if_NeedImportDemonstration__c" value="{!insOppo.if_NeedImportDemonstration__c}" label="闇�瑕佽繘鍙ｈ璇�"/>
+ <apex:inputField id="Closing_Bid_Date__c" value="{!insOppo.Closing_Bid_Date__c}" label="13.涓爣鏃�" />
+ <apex:inputField id="ImportDemonstration_Filing_date__c" value="{!insOppo.ImportDemonstration_Filing_date__c}" label="杩涘彛璁鸿瘉鐢宠鏃�"/>
+ <apex:inputField id="TenderBeginDate__c" value="{!insOppo.TenderBeginDate__c}" label="椤圭洰:鎷涙爣鏃�" />
+ <apex:inputField id="ImportDemonstration_Approval_date__c" value="{!insOppo.ImportDemonstration_Approval_date__c}" label="杩涘彛璁鸿瘉鎵瑰噯鏃�"/>
+ <apex:inputField id="Closing_Bid_Date_Bid__c" value="{!insOppo.Closing_Bid_Date_Bid__c}" label="椤圭洰:涓爣鏃�"/>
+ <apex:inputField id="ImportDemonstration_Rejection_date__c" value="{!insOppo.ImportDemonstration_Rejection_date__c}" label="杩涘彛璁鸿瘉椹冲洖鏃�"/>
+ <!-- 璇环杩涘彛璁鸿瘉 fy 20220803 end -->
</apex:pageBlockSection>
- <apex:commandButton onclick="saveJs()" rerender="goOrNot,inList"
- value="淇濆瓨" style="width: 150px;margin-left: 50px;"/>
+
+ <apex:commandButton onclick="saveJs()" rerender="goOrNot,inList"
+ value="淇濆瓨" style="width: 100px;margin-left: 50px;"/>
<!-- SWAG-B8Y84V 2019-02-11 淇濆瓨鎸夐挳娉ㄩ噴鎺夌殑鍐呭 start
onComplete="goOrNotJs();"
SWAG-B8Y84V 2019-02-11 end-->
- <apex:commandButton onClick="cancelJs()" value="鍙栨秷" style="width: 150px;margin-left: 50px;"/>
+ <apex:commandButton onClick="cancelJs()" value="鍙栨秷" style="width: 100px;margin-left: 50px;"/>
+ <!-- 20220805 SWAG-CGXCDV lt start -->
+ <apex:commandButton onClick="changeJs()" value="淇敼棰勬祴鏃�" style="width: 100px;margin-left: 50px;"/>
+ <!-- 20220805 SWAG-CGXCDV lt end -->
</apex:pageBlock>
</apex:pageBlock>
</apex:form>
--
Gitblit v1.9.1