From d77b6353ca9b59a6398df3eae9912f9fd766946d Mon Sep 17 00:00:00 2001
From: zhangzhengmei <zhangzhengmei@prec-tech.com>
Date: 星期六, 05 八月 2023 17:04:22 +0800
Subject: [PATCH] fix: lightning 页面确认
---
force-app/main/default/pages/PersonalCalendar.page | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 102 insertions(+), 16 deletions(-)
diff --git a/force-app/main/default/pages/PersonalCalendar.page b/force-app/main/default/pages/PersonalCalendar.page
index 8936dab..35f4a22 100644
--- a/force-app/main/default/pages/PersonalCalendar.page
+++ b/force-app/main/default/pages/PersonalCalendar.page
@@ -9,7 +9,74 @@
<apex:stylesheet value="{!URLFOR($Resource.fullcalendarCss)}"/>
<apex:stylesheet value="{!URLFOR($Resource.PersonalCalendarCssTwo)}"/>
+<style>
+
+ div.calendarHeader div.line2 input.dayViewIconOn, div.calendarHeader div.line2 input.weekViewIconOn {
+ background-color: rgb(243, 243, 243);
+ }
+ div.calendarHeader div.line2 input.dayViewIcon,div.calendarHeader div.line2 input.weekViewIcon {
+ background-color: transparent;
+ }
+ div.calendarHeader div.line2 {
+ display: inline-block;
+ }
+ .calendarHeader .dayViewIconOn , .calendarHeader .dayViewIcon,
+ .calendarHeader .weekViewIconOn ,.calendarHeader .weekViewIcon {
+ float: left;
+ background-repeat: no-repeat;
+ margin-right: 3px;
+ width: 24px;
+ height: 18px;
+ }
+ .calendarHeader .dayViewIconOn {
+ background-image: url(/img/sprites/calendar.gif);
+ background-position: -26px -36px;
+ display: block
+ }
+ .calendarHeader .dayViewIcon {
+ background-image: url(/img/sprites/calendar.gif);
+ background-position: 0 -36px;
+ display: block
+ }
+ .calendarHeader .weekViewIconOn {
+ background-image: url(/img/sprites/calendar.gif);
+ background-position: -26px -146px;
+ display: block
+ }
+ .calendarHeader .weekViewIcon {
+ background-image: url(/img/sprites/calendar.gif);
+ background-position: 0 -146px;
+ display: block
+ }
+
+ .calendarHeader .arrowIcons .prevCalArrow,.calendarHeader .arrowIcons .nextCalArrow {
+ width: 22px;
+ height: 19px;
+ margin: 0;
+ background: url(/img/alohaSkin/nextPrevBtn_sprite.png) left top no-repeat
+ }
+
+ .calendarHeader .arrowIcons .nextCalArrow {
+ background-position: right top
+ }
+
+ .calendarHeader .arrowIcons a:hover .prevCalArrow {
+ background-position: left -19px
+ }
+
+ .calendarHeader .arrowIcons a:hover .nextCalArrow {
+ background-position: right -19px
+ }
+ .dateLinks .datePickerIcon {
+ background-image: url(/img/func_icons/util/datePicker16.gif);
+ background-position: 0 0;
+ width: 16px;
+ height: 17px
+ }
+
+
+</style>
<script type="text/javascript">
function searchBySalesDptJs() {
var baseUrl = '{!ProvinceUrl}';
@@ -74,6 +141,7 @@
document.location.href = baseUrl;
}
function change2DayView() {
+ debugger
var baseUrl = '{!DayViewUrl}';
var pSearch = encodeURIComponent(j$(escapeVfId('Page:Form:searchText')).val());
if (pSearch != '') {
@@ -192,18 +260,21 @@
<apex:selectList value="{!cond1}" id="cond1" size="1"><apex:selectOptions value="{!equalOpts}"/></apex:selectList>
<apex:inputText value="{!val1}" id="val1" style="width:200px"/>
<input type="submit" value="Search" onclick="searchJs();return false;"/>
- <apex:inputCheckbox value="{!ocmUser}" id="ocmUser" onclick="searchJs();return false;"/><apex:outputLabel value="閿�鍞湰閮�" for="ocmUser"/>
- <apex:inputCheckbox value="{!allProvince}" id="allProvince" onclick="searchJs();return false;"/><apex:outputLabel value="鍏ㄩ儴鐪�" for="allProvince"/>
+ <apex:inputCheckbox value="{!ocmUser}" id="ocmUser" onclick="searchJs();return false;" style='vertical-align: text-bottom;'/><apex:outputLabel value="閿�鍞湰閮�" for="ocmUser"/>
+ <apex:inputCheckbox value="{!allProvince}" id="allProvince" style='vertical-align: text-bottom;' onclick="searchJs();return false;"/><apex:outputLabel value="鍏ㄩ儴鐪�" for="allProvince"/>
</div>
<div style="clear:both;"></div>
<div class="dateLinks line2" style="margin:1px 10px;">
<apex:inputText value="{!searchText}" id="searchText" style="width:200px" html-placeholder="Search Calendar" onchange="searchMark();return false;" onkeypress="return onKeyEvent(event);"/>
- <input type="button" value="Prev" onclick="prevMark();return false;"/>
- <input type="button" value="Next" onclick="nextMark();return false;"/>
+ <input type="button" value="Prev" class='btn' onclick="prevMark();return false;"/>
+ <input type="button" value="Next" class='btn' onclick="nextMark();return false;"/>
</div><script type="text/javascript">var jSearch = j$(escapeVfId('Page:Form:searchText'));jSearch.attr("current", "0");jSearch.attr("max", "{!markCnt}");</script>
<apex:outputPanel layout="none" rendered="{!IF(IsWeek, true, false)}">
<!-- 閫� -->
- <div class="dwmIcons line2">
+ <div class="dwmIcons line2" style="margin-right:20px;height: 29px;vertical-align: bottom;">
+ <!-- <input type="button" value="鏃ヨ鍥�" onclick="change2DayView();return false;" class="btn dayViewIcon" onblur="this.className = 'btn dayViewIcon';" onfocus="this.className = 'btn dayViewIconOn';" onmouseout="this.className = 'btn dayViewIcon';this.className = 'btn dayViewIcon';" onmouseover="this.className = 'btn dayViewIconOn';this.className = 'btn dayViewIconOn';"/>
+ <input type="button" value="鍛ㄨ鍥�" onclick="change2WeekView();return false;" class="btn weekViewIconOn" onblur="this.className = 'btn weekViewIconOn';" onfocus="this.className = 'btn weekViewIconOn';" onmouseout="this.className = 'btn weekViewIconOn';this.className = 'btn weekViewIconOn';" onmouseover="this.className = 'btn weekViewIconOn';this.className = 'btn weekViewIconOn';"/> -->
+
<a onclick="change2DayView();" title="鏃ヨ鍥�"><img src="/s.gif" alt="鏃ヨ鍥�" class="dayViewIcon" onblur="this.className = 'dayViewIcon';" onfocus="this.className = 'dayViewIconOn';" onmouseout="this.className = 'dayViewIcon';this.className = 'dayViewIcon';" onmouseover="this.className = 'dayViewIconOn';this.className = 'dayViewIconOn';" title="鏃ヨ鍥�" /></a>
<a onclick="change2WeekView();" title="鍛ㄨ鍥�"><img src="/s.gif" alt="鍛ㄨ鍥�" class="weekViewIconOn" onblur="this.className = 'weekViewIconOn';" onfocus="this.className = 'weekViewIconOn';" onmouseout="this.className = 'weekViewIconOn';this.className = 'weekViewIconOn';" onmouseover="this.className = 'weekViewIconOn';this.className = 'weekViewIconOn';" title="鍛ㄨ鍥�" /></a>
</div>
@@ -217,9 +288,13 @@
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!IF(IsWeek, false, true)}">
<!-- 鏃� -->
- <div class="dwmIcons line2">
+ <div class="dwmIcons line2" style="margin-right:20px;height: 29px;vertical-align: bottom;">
+ <!-- <input type="button" value="鏃ヨ鍥�" onclick="change2DayView();return false;" class="btn dayViewIconOn" onblur="this.className = 'btn dayViewIconOn';" onfocus="this.className = 'btn dayViewIconOn';" onmouseout="this.className = 'btn dayViewIconOn';this.className = 'btn dayViewIconOn';" onmouseover="this.className = 'btn dayViewIconOn';this.className = 'btn dayViewIconOn';"/>
+ <input type="button" value="鍛ㄨ鍥�" onclick="change2WeekView();return false;" class="btn weekViewIcon" onblur="this.className = 'btn weekViewIcon';" onfocus="this.className = 'btn weekViewIconOn';" onmouseout="this.className = 'btn weekViewIcon';this.className = 'btn weekViewIcon';" onmouseover="this.className = 'btn weekViewIconOn';this.className = 'btn weekViewIconOn';"/> -->
+
<a onclick="change2DayView();" title="鏃ヨ鍥�"><img src="/s.gif" alt="鏃ヨ鍥�" class="dayViewIconOn" onblur="this.className = 'dayViewIconOn';" onfocus="this.className = 'dayViewIconOn';" onmouseout="this.className = 'dayViewIconOn';this.className = 'dayViewIconOn';" onmouseover="this.className = 'dayViewIconOn';this.className = 'dayViewIconOn';" title="鏃ヨ鍥�" /></a>
<a onclick="change2WeekView();" title="鍛ㄨ鍥�"><img src="/s.gif" alt="鍛ㄨ鍥�" class="weekViewIcon" onblur="this.className = 'weekViewIcon';" onfocus="this.className = 'weekViewIconOn';" onmouseout="this.className = 'weekViewIcon';this.className = 'weekViewIcon';" onmouseover="this.className = 'weekViewIconOn';this.className = 'weekViewIconOn';" title="鍛ㄨ鍥�" /></a>
+
</div>
<div class="dateText line2">
<apex:outputText value="{0, date, E yyyy/MM/dd}">
@@ -228,30 +303,41 @@
<apex:inputCheckbox value="{!t2}" onclick="showDayAll(this);"/><span style="font-size:80%;">鍏ㄩ儴灞曞紑</span>
</div>
</apex:outputPanel>
- <div class="arrowIcons line2">
+ <div class="arrowIcons line2" style="height: 32px;line-height: 32px;vertical-align: bottom;">
<a href="{!PrevUrl}" title="Prev" class="prev"><img src="/s.gif" alt="Prev" title="Prev" class="prevCalArrow"/></a>
- <a href="{!NextUrl}" title="Next" class="next"><img src="/s.gif" alt="Next" title="Next" class="nextCalArrow"/></a>
+ <a href="{!NextUrl}" title="Next" class="next"><img src="/s.gif" alt="Next" title="Next" class="nextCalArrow" style="margin-left: -4px;"/></a>
</div>
- <div class="dateLinks line2" style="margin:4px 10px 2px 0px;">
+ <div class="dateLinks line2" style=" height: 29px;vertical-align: bottom;">
+
<input type="hidden" value="{!mdDayFormat}" id="mdDayFormat" onchange="changedDay(this.value)" />
<img src="/s.gif" alt="閫夋嫨鏃ユ湡" class="datePickerIcon" onclick="DatePicker.pickDate(true, 'mdDayFormat', false, this);DatePicker.datePicker.cancelHide(getEvent(event));" title="閫夋嫨鏃ユ湡"/>
</div>
- <div class="reportActions" style="float:left;margin-left:20px;margin-bottom:0px;">
- <div class="menuButton" id="runMutton" style="position:relative;margin-bottom:0px;">
- <div class="menuButtonButton hasDefault" id="runMuttonButton" style="height:16px;padding-top:2px;padding-bottom:2px;">
- <span class="menuButtonLabel" id="runMuttonLabel" tabindex="0" style="position:absolute;top:3px;left:5px;">鎶ヨ〃锛忎华琛ㄦ澘</span>
+ <div class="reportActions" style="margin-left:20px;margin-bottom:1px;display: inline-block;">
+ <div class="menuButton" id="runMutton" style="position:relative;margin-bottom:1px;width:120px;height: 32px;">
+ <div class="menuButtonButton hasDefault" id="runMuttonButton" style="height:16px;padding-bottom:2px;">
+ <span class="menuButtonLabel" id="runMuttonLabel" tabindex="0" style="position:absolute;left:5px;">鎶ヨ〃锛忎华琛ㄦ澘</span>
</div>
- <div class="menuButtonMenu" id="runMuttonMenu" style="display:none;">
+ <div class="menuButtonMenu" id="runMuttonMenu" style="display:none;margin-top:15px;">
<!-- <a href="/00O10000003s5pN" target="_blank" class="menuButtonMenuLink">鎶ュ憡璇︾粏</a>
<a href="/00O10000003sfjN" target="_blank" class="menuButtonMenuLink">鏈懆璁″垝</a>
<a href="/00O10000004UUa5" target="_blank" class="menuButtonMenuLink">姣忔湀鎶ュ憡鍜屽疄闄呮嫓璁垮尮閰�</a>
<a href="/01Z10000000foL2" target="_blank" class="menuButtonMenuLink">閿�鍞华琛ㄦ澘</a>
<a href="/01Z10000000fqLn" target="_blank" class="menuButtonMenuLink">FSE浠〃鏉�</a> -->
- <a href="/00O10000003s5pN" target="_blank" class="menuButtonMenuLink">涓婂懆鎶ュ憡鏄庣粏</a>
+
+ <!-- 淇敼纭紪鐮� zzm 20230602-->
+ <!-- <a href="/00O10000003s5pN" target="_blank" class="menuButtonMenuLink">涓婂懆鎶ュ憡鏄庣粏</a>
<a href="/00O10000004wbL7" target="_blank" class="menuButtonMenuLink">鏈懆璁″垝</a>
<a href="/00O10000004UUa5" target="_blank" class="menuButtonMenuLink">鏈堝埆璁″垝瀹炴柦鎯呭喌</a>
<a href="/01Z100000010pq7" target="_blank" class="menuButtonMenuLink">鎺ㄥ箍浠〃鏉�</a>
- <a href="/01Z10000000T76l" target="_blank" class="menuButtonMenuLink">鏈嶅姟浠〃鏉�</a>
+ <a href="/01Z10000000T76l" target="_blank" class="menuButtonMenuLink">鏈嶅姟浠〃鏉�</a> -->
+
+ <a href="/{!preweekPlanID}" target="_blank" class="menuButtonMenuLink">涓婂懆鎶ュ憡鏄庣粏</a>
+ <a href="/{!weekPlanID}" target="_blank" class="menuButtonMenuLink">鏈懆璁″垝</a>
+ <a href="/{!monthPlanID}" target="_blank" class="menuButtonMenuLink">鏈堝埆璁″垝瀹炴柦鎯呭喌</a>
+ <a href="/{!promotPlanId}" target="_blank" class="menuButtonMenuLink">鎺ㄥ箍浠〃鏉�</a>
+ <a href="/{!servePlanId}" target="_blank" class="menuButtonMenuLink">鏈嶅姟浠〃鏉�</a>
+
+
</div>
</div><script type="text/javascript">new MenuButton('runMutton', false);</script>
</div>
--
Gitblit v1.9.1