From 1727a4f4d02e429475608e60f142a63bc24127bc Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期一, 23 十月 2023 10:07:34 +0800
Subject: [PATCH] 近期修改
---
force-app/main/default/pages/CheckAllOlympusAsset.page | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/pages/CheckAllOlympusAsset.page b/force-app/main/default/pages/CheckAllOlympusAsset.page
index 00d4217..6653502 100644
--- a/force-app/main/default/pages/CheckAllOlympusAsset.page
+++ b/force-app/main/default/pages/CheckAllOlympusAsset.page
@@ -4,6 +4,7 @@
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<style>
+
.dateFormat {
display: none;
}
@@ -37,12 +38,12 @@
div#in_Div_L {
position: relative;
width: 745px;
- height: 451px;
+ height: 470px !important;
}
div#in_Div_R {
position: relative;
overflow: auto;
- height: 451px;
+ height: 485px !important;
margin-left: 686px;
margin-top: -451px;
}
@@ -163,6 +164,22 @@
// 鏀瑰彉table灏哄
var heightAjustment = 120;
var widthAjustment = 30;
+
+ function showCalendar(inputId, position) {
+ // 浣跨敤jQuery UI DatePicker鎴栧叾浠栨棩鏈熼�夋嫨鍣ㄥ簱锛屽皢鏃ュ巻寮瑰嚭鍒版寚瀹氱殑浣嶇疆
+ // 杩欓噷鍋囪鎮ㄤ娇鐢ㄤ簡jQuery UI DatePicker浣滀负绀轰緥
+ $("#" + inputId).datepicker({
+ // 鍦ㄨ繖閲岄厤缃瓺atePicker鐨勯�夐」
+ // 姣斿锛岃缃棩鏈熼�夋嫨鍣ㄧ殑浣嶇疆
+ beforeShow: function(input, inst) {
+ inst.dpDiv.addClass(position);
+ }
+ });
+
+ // 鎵嬪姩瑙﹀彂鏃ユ湡閫夋嫨鍣ㄧ殑鏄剧ず
+ $("#" + inputId).datepicker('show');
+ }
+
function windowResize() {
blockHeight = j$(window).innerHeight() - j$(escapeVfId('allPage:allForm:searchBlock')).height() - j$(escapeVfId('allPage:allForm:dataBlock:pageBlockButton1')).height() - j$('table#msg').height() - heightAjustment;
sbwidth = scrollbarWidth();
@@ -203,6 +220,7 @@
j$('div#in_Div_R').css('width', (R_width-blockWidth-240 + sbwidth) + 'px');
}
}
+
// 鍏ㄩ�夊姛鑳�
function selectAllJs() {
j$(escapeVfId('checker')).prop('disabled', true);
@@ -588,7 +606,7 @@
<td class="blankStyle"></td>
<td class="labelStyle">娑堣�楀搧鏈夋晥鏈熻嚦</td>
<td class="inputTextStyle">
- <apex:inputText id="consumable_Guaranteen_endStr" value="{!searchB.consumable_Guaranteen_endStr}" size="12" onfocus="DatePicker.pickDate(true, '{!$Component.consumable_Guaranteen_endStr}', false)" />
+ <apex:inputText id="consumable_Guaranteen_endStr" value="{!searchB.consumable_Guaranteen_endStr}" size="12" onfocus="DatePicker.pickDate(true, '{!$Component.consumable_Guaranteen_endStr}', false);showCalendar('consumable_Guaranteen_endStr','right');" />
</td>
<td class="blankStyle"></td>
</tr>
@@ -999,7 +1017,7 @@
<tr class="dataRow" id="tableData_L_{!Cnt_L}" onmouseover="if (window.hiOn){hiOn(this);} " onmouseout="if (window.hiOff){hiOff(this);} " onblur="if (window.hiOff){hiOff(this);}" onfocus="if (window.hiOn){hiOn(this);}">
<!-- 鍏ㄩ�� -->
<td class="dataCellBorder1" style="width:20px" align="center">
- <apex:inputCheckbox id="rowCheck" value="{!eachAssetData.isCheck}" disabled="{!IF((internalAssetLocationLogin != 'All' && eachAssetData.assetQuertResult['Internal_asset_location__c'] != internalAssetLocationLogin), true, false)}" onchange="checkboxOnclick(); return false;" />
+ <apex:inputCheckbox id="rowCheck" value="{!eachAssetData.isCheck}" disabled="{!IF(columnLeftRWMap[leftApiList[0][0]]=='r' || (internalAssetLocationLogin != 'All' && eachAssetData.assetQuertResult['Internal_asset_location__c'] != internalAssetLocationLogin), true, false)}" onchange="checkboxOnclick(); return false;" />
<apex:inputHidden id="canChange" />
</td>
<apex:variable value="{!0}" var="cnt2" />
--
Gitblit v1.9.1