From e9e1806b0f4b5bae1fc36204ccc5d6fdad52d66f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期一, 05 六月 2023 11:22:08 +0800
Subject: [PATCH] Merge branch 'master' into LightningUpgradeProject
---
force-app/main/default/pages/OpportunityPCLNew.page | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/pages/OpportunityPCLNew.page b/force-app/main/default/pages/OpportunityPCLNew.page
index 9c6793c..f58c9e1 100644
--- a/force-app/main/default/pages/OpportunityPCLNew.page
+++ b/force-app/main/default/pages/OpportunityPCLNew.page
@@ -1,4 +1,4 @@
-<apex:page controller="OpportunityPCLController2" showHeader="false" sidebar="false" id="allPage" action="{!init}">
+<apex:page controller="OpportunityPCLController2" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
<head>
<title>Meeting Mode China</title>
@@ -159,7 +159,7 @@
}
table.list .col_Opportunity_Category__c {
- width: 100px;
+ /* width: 100px; */
}
table.list .col_Important_Rroduct_Flg__c {
@@ -426,7 +426,10 @@
</head>
<apex:form id="allForm">
-
+ <!-- XLIU-CGF4TA 銆愬鎵樸�� 銆愯浠风鐞嗘敼鍠勯渶姹傝瘎浼般�戣浠蜂腑鐨勮繘鍙ｈ璇佸垽鏂� fy start -->
+ <!-- <apex:inputHidden id="HideForecastOCSMflag" value="{!HideForecastOCSMflag}"/> -->
+ <!-- <apex:actionFunction action="{!HideForecastOCSMSigningDate}" name="HideForecastOCSMSigningDate" reRender="mainForm" oncomplete="unblockUI();MarkRed();"/> -->
+ <!-- XLIU-CGF4TA 銆愬鎵樸�� 銆愯浠风鐞嗘敼鍠勯渶姹傝瘎浼般�戣浠蜂腑鐨勮繘鍙ｈ璇佸垽鏂� fy end -->
<!-- SWAG-C9NC23 銆愬鎵樸�慬閲嶈锛屼紭鍏堬紒]鍛ㄤ細璇环绠＄悊琛ㄤ慨鏀� lt 20211217 add MarkRed(); *4 -->
<apex:actionFunction name="saveAndSearch" action="{!save}" rerender="allPanel" oncomplete="unblockUI();MarkRed();">
<apex:param name="firstParam" assignTo="{!saveType}" value="" />
@@ -489,7 +492,7 @@
<!-- <a href="#" onclick="searchOppty();return false;" style="text-decoration: underline;">婊炵暀璇环</a> -->
<!-- <apex:commandButton value="婊炵暀璇环" onclick="expandAll();return false;" style="height:30px;width:70px;" /> -->
<!-- 銆愬鎵樸�戙�愰噸瑕併�戝懆浼氱鐞嗚〃淇敼 tcm start -->
- <td width="80px">婊炵暀璇环 <apex:inputCheckbox value="{!OpptyWait}" /></td>
+ <!-- <td width="80px">婊炵暀璇环 <apex:inputCheckbox value="{!OpptyWait}" /></td> -->
<!-- 銆愬鎵樸�戙�愰噸瑕併�戝懆浼氱鐞嗚〃淇敼 tcm start -->
<!-- </td> -->
</tr>
@@ -525,6 +528,20 @@
<td></td>
</tr>
</table>
+ <!-- XLIU-CGF4TA 銆愬鎵樸�� 銆愯浠风鐞嗘敼鍠勯渶姹傝瘎浼般�戣浠蜂腑鐨勮繘鍙ｈ璇佸垽鏂� fy start 聽-->
+ <!-- <table style="border-bottom-width: 0px; font-size:12px;">
+ <tr> -->
+ <!-- <td >鏆傛椂搴熼櫎
+ <apex:commandButton action="{!save}" value="淇濆瓨" rerender="allPanel" onclick="blockme();" oncomplete="unblockUI();" style="height:30px;width:50px;"/>onchange="HideForecastOCSMSigningDate1()"
+ 闅愯棌棰勬祴OCSM绛剧害鏃� <apex:inputCheckbox value="{!HideForecastOCSMflag}" id="HideForecastOCSMflag1"/>
+ <apex:commandButton action="{!HideForecastOCSMSigningDate}" value="搴旂敤" rerender="allPanel" onclick="blockme();" oncomplete="unblockUI();" style="height:30px;width:50px;"/>
+ </td> 鏆傛椂搴熼櫎-->
+ <!-- <td >
+ <apex:commandButton value="闅愯棌棰勬祴OCSM绛剧害鏃�" onclick="HideForecastOCSMSigningDate1();return false;" style="height:30px;width:150px;"/>
+ </td >
+ </tr>
+ </table> -->
+ <!-- XLIU-CGF4TA 銆愬鎵樸�� 銆愯浠风鐞嗘敼鍠勯渶姹傝瘎浼般�戣浠蜂腑鐨勮繘鍙ｈ璇佸垽鏂� fy end 聽-->
</apex:pageBlock>
<apex:pageBlock id="oppBlock" tabStyle="Report">
@@ -564,7 +581,8 @@
<br/> 05=浠锋牸鐢宠涓�, 06=鐢ㄦ埛鏈绾�, 07=鐢ㄦ埛宸茬绾�, 08=宸茬绾�
</td>
</apex:outputPanel>
- <apex:outputPanel layout="none" rendered="{!cnt < ratingStartIdx || cnt >= ratingStartIdx + 12}">
+ <!-- <apex:outputPanel layout="none" rendered="{!cnt < ratingStartIdx || cnt >= ratingStartIdx + 12}"> -->
+ <apex:outputPanel layout="none">
<td class="col_{!columnRightCss[cnt]}" id="col_{!columnRightCss[cnt]}" style="font-weight: bold; ">
<!-- 鍚堣▓閲戦銈掑嚭銇� -->
<apex:outputPanel layout="none" rendered="{!c.size==1 && columnMoneyFlgMap[c[0]]}">
@@ -727,6 +745,7 @@
</apex:pageBlock>
<script type="text/javascript">
j$(function () {
+ debugger
var tableWidth = 0;
j$('body .pbBody table#tableHeader tr.headerRow td').each(function () {
var colClass = getColClassName(this);
--
Gitblit v1.9.1