From b4848014657dba3ed3ddd0d02ac144aa50be5549 Mon Sep 17 00:00:00 2001
From: 李彤 <litong@prec-tech.com>
Date: 星期四, 18 五月 2023 10:54:11 +0800
Subject: [PATCH] 目标客户页面，呼吸科和消化科显示市场目标产品和共同推进
---
force-app/main/default/classes/AccountTargetTabControllerTest.cls | 6 +-
force-app/main/default/pages/AccountTargetTab.page | 140 ++++++++++++++++++++++++++++++++++++++++++++--
force-app/main/default/classes/AccountTargetTabController.cls | 3
3 files changed, 137 insertions(+), 12 deletions(-)
diff --git a/force-app/main/default/classes/AccountTargetTabController.cls b/force-app/main/default/classes/AccountTargetTabController.cls
index 895af13..06d4269 100644
--- a/force-app/main/default/classes/AccountTargetTabController.cls
+++ b/force-app/main/default/classes/AccountTargetTabController.cls
@@ -2,7 +2,8 @@
//private static integer SECTIONMAX = 10;
private static integer FIELDMAX = 100;
- private Account dept;
+ // private Account dept ; //lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 add { get; private set; }
+ public Account dept { get; private set; }//lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 add { get; private set; }
private Target_account_manage__c layout;
private Map<String, Target_account_manage__c> layoutMap;
diff --git a/force-app/main/default/classes/AccountTargetTabControllerTest.cls b/force-app/main/default/classes/AccountTargetTabControllerTest.cls
index 9295561..ddf9d0d 100644
--- a/force-app/main/default/classes/AccountTargetTabControllerTest.cls
+++ b/force-app/main/default/classes/AccountTargetTabControllerTest.cls
@@ -74,9 +74,9 @@
String api = String.valueOf(m.get('api'));
if (String.isBlank(api) == false) {
- soql += ', Target_amount_' + api + '__c';
- soql += ', OPD_' + api + '__c';
- soql += ', OPD_amount_' + api + '__c';
+ // soql += ', Target_amount_' + api + '__c';
+ // soql += ', OPD_' + api + '__c';
+ // soql += ', OPD_amount_' + api + '__c';
}
}
}
diff --git a/force-app/main/default/pages/AccountTargetTab.page b/force-app/main/default/pages/AccountTargetTab.page
index be1f829..d457e8a 100644
--- a/force-app/main/default/pages/AccountTargetTab.page
+++ b/force-app/main/default/pages/AccountTargetTab.page
@@ -32,7 +32,12 @@
</script>
<apex:form id="Form">
- <div style="height: 265px; overflow-y: auto;">
+ <!-- lt 鐩爣瀹㈡埛鍏卞悓鎺ㄨ繘 start -->
+ <!-- overflow-y: auto;overflow-x: auto; overflow:scroll -->
+ <!-- <div style="height: 265px; width:1200px;overflow-y:auto;overflow-x:auto; border:1px;
+ border-left-color: black; border-right-color: black"> -->
+ <div style="height: 265px; width:1000px;overflow:scroll;">
+ <!-- lt 鐩爣瀹㈡埛鍏卞悓鎺ㄨ繘 end -->
<apex:pageMessages />
<apex:outputPanel layout="none" rendered="{!NOT(ISNULL(history))}">
@@ -80,10 +85,13 @@
<tr>
<!-- 宸� -->
<td>
- <table border="1" frame="void">
+ <table border="1" frame="void" width="300px"> <!-- lt 鐩爣瀹㈡埛鍏卞悓鎺ㄨ繘 add width -->
<tr>
- <th width="100" style="height:20px;"> </th>
- <th width="100" style="text-align: center;">鐩爣鏁�</th>
+ <!-- 20230320 ljh DB202302341475 start-->
+ <!-- <th width="100" style="height:20px;"> </th> -->
+ <th width="155" style="height:20px;"> </th>
+ <!-- 20230320 ljh DB202302341475 end-->
+ <th width="80" style="text-align: center;">鐩爣鏁�</th>
</tr>
<apex:variable value="{!1}" var="cnt" />
<apex:repeat value="{!history.dataList}" var="data" id="repeat">
@@ -140,14 +148,25 @@
<!-- 鍙� -->
<td>
- <table border="1" frame="void">
+ <!-- <div style="height: 265px; overflow:scroll"> -->
+ <table border="1" frame="void" width="1000px"> <!-- lt 鐩爣瀹㈡埛鍏卞悓鎺ㄨ繘 add width -->
<tr>
- <th width="110" style="height:20px;"> </th>
+ <th width="210" style="height:20px;"> </th>
<th width="100" style="text-align: center;">閲戦</th>
- <th width="130"> </th>
+ <th width="160"> </th>
<!-- <th width="100" style="text-align: center;">涓绘満鏁�</th> -->
- <th width="100"> </th>
+ <th width="80"> </th>
+
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 start -->
+ <apex:variable var="type" value="" rendered="{!IF(dept.RecordType.DeveloperName ='Department_Class_BF' || dept.RecordType.DeveloperName ='Department_Class_GI',true,false)}">
+ <th width="190" > </th>
+ <th width="100" style="text-align: center;">甯傚満鐩爣浜у搧</th>
+ <th width="160" > </th>
+ <th width="100" style="text-align: center;">鍏卞悓鎺ㄨ繘</th>
+ </apex:variable>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 end -->
</tr>
+
<tr>
<td style="width:180px;height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.Opp_Actual_ThousandY__c.label}</td>
<td style="text-align: center;">
@@ -157,6 +176,18 @@
<td style="text-align: center;">
<apex:outputField value="{!history.rec.RivalCustomers_first__c}" style="width:90%; text-align: right;" />
</td>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 start -->
+ <apex:variable var="type" value="" rendered="{!IF(dept.RecordType.DeveloperName ='Department_Class_BF' || dept.RecordType.DeveloperName ='Department_Class_GI',true,false)}">
+ <td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.MarketTarget_Product_JF__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.MarketTarget_Product_JF__c}" style="width:90%; text-align: right;" />
+ </td>
+ <td>{!$ObjectType.Account_Number_of_target__c.fields.Promote_Together_JF__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.Promote_Together_JF__c}" style="width:90%; text-align: right;" />
+ </td>
+ </apex:variable>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 end -->
</tr>
<tr>
<!-- 20220331 lt 浠婂勾娉ㄦ畫瀛楁淇敼 3.6.浣嶇疆浜掓崲 -->
@@ -172,6 +203,18 @@
<td style="text-align: center;">
<apex:outputField value="{!history.rec.RivalHostsProportion_first__c}" style="width:90%; text-align: right;" />
</td>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 start -->
+ <apex:variable var="type" value="" rendered="{!IF(dept.RecordType.DeveloperName ='Department_Class_BF' || dept.RecordType.DeveloperName ='Department_Class_GI',true,false)}">
+ <td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.MarketTarget_Product_EUS__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.MarketTarget_Product_EUS__c}" style="width:90%; text-align: right;" />
+ </td>
+ <td>{!$ObjectType.Account_Number_of_target__c.fields.Promote_Together_EUS__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.Promote_Together_EUS__c}" style="width:90%; text-align: right;" />
+ </td>
+ </apex:variable>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 end -->
</tr>
<tr>
<td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.OP_ThousandY__c.label}</td>
@@ -182,6 +225,18 @@
<td style="text-align: center;">
<apex:outputField value="{!history.rec.RivalHostsNumber__c}" style="width:90%; text-align: right;" />
</td>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 start -->
+ <apex:variable var="type" value="" rendered="{!IF(dept.RecordType.DeveloperName ='Department_Class_BF' || dept.RecordType.DeveloperName ='Department_Class_GI',true,false)}">
+ <td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.MarketTarget_Product_CV290__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.MarketTarget_Product_CV290__c}" style="width:90%; text-align: right;" />
+ </td>
+ <td>{!$ObjectType.Account_Number_of_target__c.fields.Promote_Together_CV290__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.Promote_Together_CV290__c}" style="width:90%; text-align: right;" />
+ </td>
+ </apex:variable>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 end -->
<!-- <td ></td>
<td ></td> -->
</tr>
@@ -194,6 +249,18 @@
<td style="text-align: center;">
<apex:outputField value="{!history.rec.RivalHostsNumber_first__c}" style="width:90%; text-align: right;" />
</td>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 start -->
+ <apex:variable var="type" value="" rendered="{!IF(dept.RecordType.DeveloperName ='Department_Class_BF' || dept.RecordType.DeveloperName ='Department_Class_GI',true,false)}">
+ <td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.MarketTarget_Product_GIFH290T__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.MarketTarget_Product_GIFH290T__c}" style="width:90%; text-align: right;" />
+ </td>
+ <td>{!$ObjectType.Account_Number_of_target__c.fields.Promote_Together_GIFH290T__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.Promote_Together_GIFH290T__c}" style="width:90%; text-align: right;" />
+ </td>
+ </apex:variable>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 end -->
<!-- <td ></td>
<td ></td> -->
</tr>
@@ -211,6 +278,18 @@
<td style="text-align: center;">
<apex:outputField value="{!history.rec.AllHostsNumber__c}" style="width:90%; text-align: right;" />
</td>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 start -->
+ <apex:variable var="type" value="" rendered="{!IF(dept.RecordType.DeveloperName ='Department_Class_BF' || dept.RecordType.DeveloperName ='Department_Class_GI',true,false)}">
+ <td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.MarketTarget_Product_BFUC290F__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.MarketTarget_Product_BFUC290F__c}" style="width:90%; text-align: right;" />
+ </td>
+ <td>{!$ObjectType.Account_Number_of_target__c.fields.Promote_Together_BFUC290F__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.Promote_Together_BFUC290F__c}" style="width:90%; text-align: right;" />
+ </td>
+ </apex:variable>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 end -->
<!-- <td ></td>
<td ></td> -->
</tr>
@@ -227,6 +306,18 @@
<td style="text-align: center;">
<apex:outputField value="{!history.rec.AllHostsNumber_first__c}" style="width:90%; text-align: right;" />
</td>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 start -->
+ <apex:variable var="type" value="" rendered="{!IF(dept.RecordType.DeveloperName ='Department_Class_BF' || dept.RecordType.DeveloperName ='Department_Class_GI',true,false)}">
+ <td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.MarketTarget_Product_SXFD__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.MarketTarget_Product_SXFD__c}" style="width:90%; text-align: right;" />
+ </td>
+ <td>{!$ObjectType.Account_Number_of_target__c.fields.Promote_Together_SXFD__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.Promote_Together_SXFD__c}" style="width:90%; text-align: right;" />
+ </td>
+ </apex:variable>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 end -->
</tr>
<tr>
<!--<td style="height:20px;"></td>
@@ -237,6 +328,18 @@
</td>
<td style="height:20px;"></td>
<td style=""></td>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 start -->
+ <apex:variable var="type" value="" rendered="{!IF(dept.RecordType.DeveloperName ='Department_Class_BF' || dept.RecordType.DeveloperName ='Department_Class_GI',true,false)}">
+ <td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.MarketTarget_Product_XXFD__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.MarketTarget_Product_XXFD__c}" style="width:90%; text-align: right;" />
+ </td>
+ <td>{!$ObjectType.Account_Number_of_target__c.fields.Promote_Together_XXFD__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.Promote_Together_XXFD__c}" style="width:90%; text-align: right;" />
+ </td>
+ </apex:variable>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 end -->
</tr>
<tr>
<!--<td style="height:20px;"></td>
@@ -247,6 +350,18 @@
</td>
<td style="height:20px;"></td>
<td style=""></td>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 start -->
+ <apex:variable var="type" value="" rendered="{!IF(dept.RecordType.DeveloperName ='Department_Class_BF' || dept.RecordType.DeveloperName ='Department_Class_GI',true,false)}">
+ <td style="height:20px;">{!$ObjectType.Account_Number_of_target__c.fields.MarketTarget_Product_XXHQ__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.MarketTarget_Product_XXHQ__c}" style="width:90%; text-align: right;" />
+ </td>
+ <td>{!$ObjectType.Account_Number_of_target__c.fields.Promote_Together_XXHQ__c.label}</td>
+ <td style="text-align: center;">
+ <apex:outputField value="{!history.rec.Promote_Together_XXHQ__c}" style="width:90%; text-align: right;" />
+ </td>
+ </apex:variable>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 end -->
</tr>
<!--20230224 you end DB202302339407-->
<!-- 2022/01/07 ssm 鍙充晶琛ョ┖琛� start -->
@@ -266,9 +381,18 @@
</td>
<td ></td>
<td ></td>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 start -->
+ <apex:variable var="type" value="" rendered="{!IF(dept.RecordType.DeveloperName ='Department_Class_BF' || dept.RecordType.DeveloperName ='Department_Class_GI',true,false)}">
+ <td ></td>
+ <td ></td>
+ <td ></td>
+ <td ></td>
+ </apex:variable>
+ <!-- lt 20230419 DB202303610487 鐩爣瀹㈡埛椤甸潰澧炲姞甯傚満鐩爣浜у搧淇℃伅 甯傚満鐩爣浜у搧 鍏卞悓鎺ㄨ繘 end -->
</tr>
<!-- 2022/01/07 ssm 鍙充晶鏈�鍚庣殑鍦版柟鎷嗘垚2琛� 涓庝箣鍓嶇殑鏁堟灉淇濇寔涓�鑷� end -->
</table>
+ <!-- </div> -->
</td>
</tr>
<!-- lt 鐩爣瀹㈡埛鐨勭敾闈㈣皟鏁� 20220106 end -->
--
Gitblit v1.9.1