From fd9df05c48c09b4d7f39a3b401882bda226dedea Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期二, 31 十月 2023 20:38:18 +0800
Subject: [PATCH] 近期修改
---
force-app/main/default/pages/CheckAllOlympusAsset.page | 73 ++++++++++++++++++++++++------------
1 files changed, 49 insertions(+), 24 deletions(-)
diff --git a/force-app/main/default/pages/CheckAllOlympusAsset.page b/force-app/main/default/pages/CheckAllOlympusAsset.page
index 6653502..c3052d7 100644
--- a/force-app/main/default/pages/CheckAllOlympusAsset.page
+++ b/force-app/main/default/pages/CheckAllOlympusAsset.page
@@ -159,6 +159,11 @@
height:45px;
}
/*20230815 ljh end*/
+ /*20231007 ljh start*/
+ body .datePicker .calDays, .slds-vf-scope .datePicker .calDays {
+ width:auto !important
+ }
+ /*20231007 ljh end*/
</style>
<script type="text/javascript">
// 鏀瑰彉table灏哄
@@ -166,19 +171,19 @@
var widthAjustment = 30;
function showCalendar(inputId, position) {
- // 浣跨敤jQuery UI DatePicker鎴栧叾浠栨棩鏈熼�夋嫨鍣ㄥ簱锛屽皢鏃ュ巻寮瑰嚭鍒版寚瀹氱殑浣嶇疆
- // 杩欓噷鍋囪鎮ㄤ娇鐢ㄤ簡jQuery UI DatePicker浣滀负绀轰緥
- $("#" + inputId).datepicker({
- // 鍦ㄨ繖閲岄厤缃瓺atePicker鐨勯�夐」
- // 姣斿锛岃缃棩鏈熼�夋嫨鍣ㄧ殑浣嶇疆
- beforeShow: function(input, inst) {
- inst.dpDiv.addClass(position);
- }
- });
+ // 浣跨敤jQuery UI DatePicker鎴栧叾浠栨棩鏈熼�夋嫨鍣ㄥ簱锛屽皢鏃ュ巻寮瑰嚭鍒版寚瀹氱殑浣嶇疆
+ // 杩欓噷鍋囪鎮ㄤ娇鐢ㄤ簡jQuery UI DatePicker浣滀负绀轰緥
+ $("#" + inputId).datepicker({
+ // 鍦ㄨ繖閲岄厤缃瓺atePicker鐨勯�夐」
+ // 姣斿锛岃缃棩鏈熼�夋嫨鍣ㄧ殑浣嶇疆
+ beforeShow: function(input, inst) {
+ inst.dpDiv.addClass(position);
+ }
+ });
- // 鎵嬪姩瑙﹀彂鏃ユ湡閫夋嫨鍣ㄧ殑鏄剧ず
- $("#" + inputId).datepicker('show');
- }
+ // 鎵嬪姩瑙﹀彂鏃ユ湡閫夋嫨鍣ㄧ殑鏄剧ず
+ $("#" + 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;
@@ -498,11 +503,12 @@
<tr><td class="checkButtonStyle"><apex:commandButton value="鏌ョ湅宸茶繃鏈熺殑淇濇湁璁惧" rendered="{!!expiredBlueFlag}" onclick="checkAssetJs('expired'); return false;" /></td></tr>
<tr><td class="checkButtonStyle blueStyle"><apex:commandButton style="background-color: silver;" value="鏌ョ湅宸茶繃鏈熺殑淇濇湁璁惧" rendered="{!expiredBlueFlag}" onclick="checkAssetJs('expired'); return false;" /></td></tr>
<!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start -->
- <tr>
+ <!-- 202310109 ljh 杩佺Щ鍒扮洏鐐规ā鍧椾簡 -->
+ <!-- <tr>
<td class="checkButtonStyle">
<apex:commandButton value="娓╂箍搴︾洏鐐�" rendered="{!angecylookrole}" onclick="checkChangeFlg(); gotoInventoryTemperatureHumidity(); return false;" />
</td>
- </tr>
+ </tr> -->
<!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End -->
</table>
</apex:pageBlock>
@@ -527,12 +533,14 @@
<apex:inputText disabled="true" rendered="{!!angecylookrole}" />
</td>
<td class="blankStyle"></td>
- <td class="labelStyle">澶囧搧鐘舵��</td>
+ <td class="labelStyle">鏈鸿韩鍙�</td>
+ <td class="inputTextStyle"><apex:inputText value="{!searchB.serialNumber}" id="serialNoId" /></td>
+ <!-- <td class="labelStyle">澶囧搧鐘舵��</td>
<td class="inputTextStyle">
<apex:selectList value="{!searchB.fixture_Status}" id="assetStatusId" size="1">
<apex:selectOptions value="{!assetStatusOptionList}"/>
</apex:selectList>
- </td>
+ </td> -->
</tr>
<tr><td><br /><br /></td></tr>
<tr>
@@ -548,8 +556,12 @@
<apex:inputText value="{!searchB.internal_Asset_number}" id="fixedAssetNumId2" rendered="{!!internalAssetNumberEditableFlag}" />
</td>
<td class="blankStyle"></td>
- <td class="labelStyle">鏈鸿韩鍙�</td>
- <td class="inputTextStyle"><apex:inputText value="{!searchB.serialNumber}" id="serialNoId" /></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);showCalendar('consumable_Guaranteen_endStr','right');" />
+ </td>
+ <!-- <td class="labelStyle">鏈鸿韩鍙�</td>
+ <td class="inputTextStyle"><apex:inputText value="{!searchB.serialNumber}" id="serialNoId" /></td> -->
<td class="blankStyle"></td>
<td class="labelStyle">鍒嗗叕鍙稿彿</td>
<td class="inputTextStyle">
@@ -581,12 +593,15 @@
</apex:selectList>
</td>
<td class="blankStyle"></td>
- <td class="labelStyle">绠＄悊绉嶇被</td>
+
+ <!-- <td class="labelStyle">绠＄悊绉嶇被</td>
<td class="inputTextStyle">
<apex:selectList value="{!searchB.manage_type}" id="manage_type" size="1">
<apex:selectOptions value="{!manage_typeOpts}"/>
</apex:selectList>
- </td>
+ </td> -->
+ <td class="blankStyle"></td>
+ <td class="blankStyle"></td>
</tr>
<tr><td><br /><br /></td></tr>
<tr>
@@ -604,9 +619,15 @@
</apex:selectList>
</td>
<td class="blankStyle"></td>
- <td class="labelStyle">娑堣�楀搧鏈夋晥鏈熻嚦</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);showCalendar('consumable_Guaranteen_endStr','right');" />
+ </td> -->
+ <td class="labelStyle">澶囧搧鐘舵��</td>
+ <td class="inputTextStyle">
+ <apex:selectList value="{!searchB.fixture_Status}" id="assetStatusId" size="1">
+ <apex:selectOptions value="{!assetStatusOptionList}"/>
+ </apex:selectList>
</td>
<td class="blankStyle"></td>
</tr>
@@ -626,8 +647,12 @@
</apex:selectList>
</td>
<td class="blankStyle"></td>
- <td class="blankStyle"></td>
- <td class="blankStyle"></td>
+ <td class="labelStyle">绠＄悊绉嶇被</td>
+ <td class="inputTextStyle">
+ <apex:selectList value="{!searchB.manage_type}" id="manage_type" size="1">
+ <apex:selectOptions value="{!manage_typeOpts}"/>
+ </apex:selectList>
+ </td>
<td class="blankStyle"></td>
<td colspan="2">
<apex:commandButton style="width: 28%" value="妫�绱�" onclick="searchBtnJs(); return false;" rerender="allForm" />
@@ -1017,7 +1042,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(columnLeftRWMap[leftApiList[0][0]]=='r' || (internalAssetLocationLogin != 'All' && eachAssetData.assetQuertResult['Internal_asset_location__c'] != internalAssetLocationLogin), true, false)}" onchange="checkboxOnclick(); return false;" />
+ <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:inputHidden id="canChange" />
</td>
<apex:variable value="{!0}" var="cnt2" />
--
Gitblit v1.9.1