Merge branch 'master' into LEXUpgrade2023-Deloitte

buli

2023-07-14 e6068da47c1bef5517c9e5fdc8c726766867ad4e

 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>