20230807页面提交

黄千龙

2023-08-07 cc399638fd26fe0a9f0bc0bb31ed4afcc21c928d

20230807页面提交

 force-app/main/default/classes/ChangeDealerApprovalController.cls

@@ -63,7 +63,7 @@
    }

    private void setThisEstimate() {
        this.estimate = [SELECT Id, Estimate_Target__c, Dealer__c, Changed_Estimate_Target__c, 
        this.estimate = [SELECT Id, Estimate_Target__c, Dealer__r.name, Changed_Estimate_Target__c, 
                                Changed_Dealer__c, Change_Dealer_Approval__c
                         FROM Maintenance_Contract_Estimate__c WHERE Id = :this.estimateId];
    }

 force-app/main/default/pages/ChangeDealerApproval.page

@@ -30,12 +30,17 @@
            var target = j$(escapeVfId('allPage:allForm:changedInput:estimateTarget')).val();
            var etTarget = j$(escapeVfId('allPage:allForm:etTarget')).val();
            var dealer = j$(escapeVfId('allPage:allForm:dealer')).val();

            if (target != '医院') {
                var obj = j$(escapeVfId('allPage:allForm:changedInput:changedDealer')).val();
                if (obj == null || obj == '') {
                    alert('请输入变更后经销商名');
                    return false;
                }
                console.log('etTarget='+etTarget);
                console.log('etTarget='+target);
                console.log('obj='+obj);
                console.log('dealer='+dealer);
                if (etTarget == target && obj == dealer) {
                    alert('报价提交对象没有变更！');
                    return false;
@@ -76,7 +81,7 @@

    <apex:form id="allForm">
        <apex:inputHidden id="etTarget" value="{!estimate.Estimate_Target__c}"/>
        <apex:inputHidden id="dealer" value="{!estimate.Dealer__c}"/>
        <apex:inputHidden id="dealer" value="{!estimate.Dealer__r.name}"/>
        <apex:actionFunction name="submitApproval" action="{!submitApproval}" rerender="allForm" oncomplete="closedWin();"/>
        <apex:pageBlock id="changedInput" title="" mode="edit" >
            <apex:pageMessages id="submitErrorMsg"/>

 force-app/main/default/pages/ProductRepairQuote.page

@@ -1,5 +1,6 @@
<apex:page Controller="ProductRepairQuoteController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="产品修理报价预估" lightningStylesheets="true">
    
<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
    <apex:form id="allForm">
        <apex:outputPanel id="allPanel">
            <apex:pageBlock title="产品修理报价预估" id="allBlock">
@@ -26,22 +27,24 @@
                            </td>
                            <!-- lighting升级 20230210 lt 文字串行问题 add  ;width:200px;height:25px; -->
                            <th style="text-align:right;width:200px;height:25px;">
                                {!$ObjectType.Product2.fields.Can_Repair__c.label} ：
                            </th>
                            <td align="left">
                                <apex:outputText value="{!canRepair}" />
                            </td>
                             
                        </tr>
                        <tr>
                            <th style="text-align:right;width:200px;height:25px;">
                                {!$ObjectType.Product2.fields.RepairListPriceLevelB__c.label} ：
                            </th>
                            <td align="left">
                                <apex:outputText value="{!repairListPriceLevelB}" />
                            </td>
                        </tr>
                        <tr>
                            <!-- lighting升级 20230210 lt 文字串行问题 add  ;height:25px; -->
                            <th style="text-align:right;height:25px;">
                                {!$ObjectType.Product2.fields.RepairListPriceLevelC__c.label} ：
                            </th>
                            <td align="left">
                                <apex:outputText value="{!repairListPriceLevelC}" />
                            </td>
                            <!-- lighting升级 20230210 lt 文字串行问题 add  ;height:25px; -->
                            <th style="text-align:right;height:25px;">
                            
                            
                            <th style="text-align:right;width:200px;height:25px;">
                                {!$ObjectType.Product2.fields.PartSupplyFinishDate__c.label} ：
                            </th>
                            <td align="left">
@@ -49,7 +52,29 @@
                                    <apex:param value="{!partSupplyFinishDate}" />
                                </apex:outputText>
                            </td>
                           
                            
                            <!-- lighting升级 20230210 lt 文字串行问题 add  ;height:25px; -->
                        </tr>
                        <tr>
                            <th style="text-align:right;width:200px;height:25px;">
                                {!$ObjectType.Product2.fields.RepairListPriceLevelC__c.label} ：
                            </th>
                            <td align="left">
                                <apex:outputText value="{!repairListPriceLevelC}" />
                            </td>
                            <th style="text-align:right;width:200px;height:25px;">
                                {!$ObjectType.Product2.fields.PartSupplyFinishDateExp__c.label} ：
                            </th>

                            <td align="left">
                                <apex:outputText value="{0,date,yyyy/MM/dd}">
                                    <apex:param value="{!partSupplyFinishDateExp}" />
                                </apex:outputText>
                                <!-- <apex:outputText value="{!partSupplyFinishDateExp}"/> -->
                            </td>
                        </tr>
                       
                    </table>
                </apex:pageBlock>