From cc399638fd26fe0a9f0bc0bb31ed4afcc21c928d Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期一, 07 八月 2023 09:39:03 +0800
Subject: [PATCH] 20230807页面提交
---
force-app/main/default/pages/ProductRepairQuote.page | 47 ++++++++++++++++++++++++++++++++++++-----------
force-app/main/default/pages/ChangeDealerApproval.page | 7 ++++++-
force-app/main/default/classes/ChangeDealerApprovalController.cls | 2 +-
3 files changed, 43 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/classes/ChangeDealerApprovalController.cls b/force-app/main/default/classes/ChangeDealerApprovalController.cls
index 7fe40f9..35b8c25 100644
--- a/force-app/main/default/classes/ChangeDealerApprovalController.cls
+++ b/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];
}
diff --git a/force-app/main/default/pages/ChangeDealerApproval.page b/force-app/main/default/pages/ChangeDealerApproval.page
index 41b0145..bdb462b 100644
--- a/force-app/main/default/pages/ChangeDealerApproval.page
+++ b/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"/>
diff --git a/force-app/main/default/pages/ProductRepairQuote.page b/force-app/main/default/pages/ProductRepairQuote.page
index 9870619..5e9db9f 100644
--- a/force-app/main/default/pages/ProductRepairQuote.page
+++ b/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>
--
Gitblit v1.9.1