From 226ec1cbf306ab7566e738594d5d8e68bdf98cf7 Mon Sep 17 00:00:00 2001
From: 游畅 <youchang@prec-tech.com>
Date: 星期二, 04 四月 2023 09:45:44 +0800
Subject: [PATCH] 20230329-询价中的今年相关字段增加和修改+现场修理逻辑+停止hr信息同步用户
---
force-app/main/default/pages/AccountTargetTab.page | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/pages/AccountTargetTab.page b/force-app/main/default/pages/AccountTargetTab.page
index 4ef0235..be1f829 100644
--- a/force-app/main/default/pages/AccountTargetTab.page
+++ b/force-app/main/default/pages/AccountTargetTab.page
@@ -120,6 +120,14 @@
<td ></td>
</tr>
</apex:repeat>
+ <tr>
+ <td style="height:20px;"></td>
+ <td ></td>
+ </tr>
+ <tr>
+ <td style="height:20px;"></td>
+ <td ></td>
+ </tr>
<!-- 2022/01/07 ssm 宸︿晶绌鸿 end -->
<tr>
<td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.TargetCustomerModifier__c.label}</td>
@@ -151,9 +159,14 @@
</td>
</tr>
<tr>
- <td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.BO_Forecast_ThousandY__c.label}</td>
+ <!-- 20220331 lt 浠婂勾娉ㄦ畫瀛楁淇敼 3.6.浣嶇疆浜掓崲 -->
+ <!-- <td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.BO_Forecast_ThousandY__c.label}</td>
<td style="text-align: center;">
<apex:outputField value="{!history.rec.BO_Forecast_ThousandY__c}" style="width:90%; text-align: right;" />
+ </td> -->
+ <td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.Opportunity_ThousandY__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.Opportunity_ThousandY__c}" style="width:90%; text-align: right;" />
</td>
<td>{!$ObjectType.Account_Number_of_target__c.fields.RivalHostsProportion_first__c.label}</td>
<td style="text-align: center;">
@@ -185,9 +198,14 @@
<td ></td> -->
</tr>
<tr>
- <td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.Opportunity_ThousandY__c.label}</td>
+ <!-- 20220331 lt 浠婂勾娉ㄦ畫瀛楁淇敼 3.6.浣嶇疆浜掓崲 -->
+ <!-- <td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.Opportunity_ThousandY__c.label}</td>
<td style="text-align: center;">
<apex:outputField value="{!history.rec.Opportunity_ThousandY__c}" style="width:90%; text-align: right;" />
+ </td> -->
+ <td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.BO_Forecast_ThousandY__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.BO_Forecast_ThousandY__c}" style="width:90%; text-align: right;" />
</td>
<td>{!$ObjectType.Account_Number_of_target__c.fields.AllHostsNumber__c.label}</td>
<td style="text-align: center;">
@@ -198,13 +216,39 @@
</tr>
<!-- 2022/01/07 ssm 鍙充晶鏈�鍚庣殑鍦版柟鎷嗘垚2琛� 涓庝箣鍓嶇殑鏁堟灉淇濇寔涓�鑷� start -->
<tr>
- <td style="height:20px;"></td>
- <td style=""></td>
+ <!--<td style="height:20px;"></td>
+ <td style=""></td>-->
+ <!--20230224 you start DB202302339407-->
+ <td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.LostPricesqt__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.LostPricesqt__c}" style="width:90%; text-align: right;" />
+ </td>
<td>{!$ObjectType.Account_Number_of_target__c.fields.AllHostsNumber_first__c.label}</td>
<td style="text-align: center;">
<apex:outputField value="{!history.rec.AllHostsNumber_first__c}" style="width:90%; text-align: right;" />
</td>
</tr>
+ <tr>
+ <!--<td style="height:20px;"></td>
+ <td style=""></td>-->
+ <td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.Dealer_Final_Priceqt__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.Dealer_Final_Priceqt__c}" style="width:90%; text-align: right;" />
+ </td>
+ <td style="height:20px;"></td>
+ <td style=""></td>
+ </tr>
+ <tr>
+ <!--<td style="height:20px;"></td>
+ <td style=""></td>-->
+ <td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.HospitalTransactionAmountqt__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.HospitalTransactionAmountqt__c}" style="width:90%; text-align: right;" />
+ </td>
+ <td style="height:20px;"></td>
+ <td style=""></td>
+ </tr>
+ <!--20230224 you end DB202302339407-->
<!-- 2022/01/07 ssm 鍙充晶琛ョ┖琛� start -->
<apex:repeat value="{!history.emptyLineRight}" var="elr" id="elr_repeat">
<tr>
--
Gitblit v1.9.1