From e14d6d0619330cad423f06493e3aa2371faa2a8f Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期六, 09 九月 2023 14:02:23 +0800
Subject: [PATCH] Sit期间修改
---
force-app/main/default/pages/AssetMaintain.page | 233 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 126 insertions(+), 107 deletions(-)
diff --git a/force-app/main/default/pages/AssetMaintain.page b/force-app/main/default/pages/AssetMaintain.page
index 6b50d1e..1f261c9 100644
--- a/force-app/main/default/pages/AssetMaintain.page
+++ b/force-app/main/default/pages/AssetMaintain.page
@@ -4,6 +4,11 @@
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<style>
+ /*20230815 ljh start*/
+ table.mytable tr{
+ height:45px;
+ }
+ /*20230815 ljh end*/
.dateFormat {
display: none;
}
@@ -16,6 +21,7 @@
table {
table-layout: fixed;
border-collapse: collapse;
+ line-height: 28px;
}
a {
text-decoration: none;
@@ -105,7 +111,7 @@
padding-left: 10px;
}
.inputTextStyle input {
- width: 90%;
+ width: 95%;
}
.inputTextStyle select {
width: 95%;
@@ -121,6 +127,30 @@
}
#pageBlockButton1 {
margin: 0pxt;
+ }
+ td{
+ min-height: 28px
+ }
+
+ .you-button {
+ background-color: #d9d8d8 !important;
+ box-shadow: 0px 7px 2px 0px #aeacac !important;
+ transition: all .5s !important;
+ }
+
+ /* .you-button:hover {
+ background-color: #fcdc5e !important;
+ } */
+
+ .you-button:active {
+ transform: translate(0,4px) !important;
+ text-shadow: -2px 2px 2px rgb(209 132 0),
+ -2px 2px 2px rgb(209 132 0),
+ -2px 2px 2px rgb(209 132 0),
+ -2px 2px 2px rgb(209 132 0),
+ -2px 2px 2px rgb(209 132 0),
+ -2px 2px 2px rgb(209 132 0) !important;
+ box-shadow: 0px 1px 0px 0px #aeacac !important;
}
</style>
<script type="text/javascript">
@@ -198,21 +228,21 @@
}
var globalQueryCondition;
var fromQuickBarFlag = 'false';
- // function checkAssetJs(queryCondition) {
- // fromQuickBarFlag = 'true';
- // globalQueryCondition = queryCondition;
- // var changeFlg = checkChangeFlg();
- // if (changeFlg == '1') {
- // blockme();
- // checkAssetFunc(queryCondition, fromQuickBarFlag);
- // } else if (changeFlg == '3') {
- // blockme();
- // checkAssetFunc(queryCondition, fromQuickBarFlag);
- // globalQueryCondition = '';
- // }
- // fromQuickBarFlag = 'false';
- // return false;
- // }
+ function checkAssetJs(queryCondition) {
+ fromQuickBarFlag = 'true';
+ globalQueryCondition = queryCondition;
+ var changeFlg = checkChangeFlg();
+ if (changeFlg == '1') {
+ blockme();
+ checkAssetFunc(queryCondition, fromQuickBarFlag);
+ } else if (changeFlg == '3') {
+ blockme();
+ checkAssetFunc(queryCondition, fromQuickBarFlag);
+ globalQueryCondition = '';
+ }
+ fromQuickBarFlag = 'false';
+ return false;
+ }
// 妫�绱㈡寜閽�
function searchBtnJs() {
@@ -396,48 +426,37 @@
<apex:actionFunction name="clearAllSearchConditionWhenCancel" action="{!clearAllSearchConditionWhenCancel}"></apex:actionFunction>
<!-- 宸︿晶鎸夐挳鍖� -->
<!-- chenjingwu 2023.8.2 start-->
- <!-- <apex:outputPanel layout="block" style="width: 13%; float: left;" rendered="{!showTop}">
+ <!-- 宸︿晶鎸夐挳鍖� -->
+ <apex:outputPanel layout="block" style="width: 17%; float: left;" rendered="{!showTop}">
<apex:pageBlock mode="maindetail">
- <table style='height: 220px'>
+ <table style='height: 390px'>
<tr><td class="checkButtonStyle"><apex:commandButton value="鏌ョ湅鍏ㄩ儴淇濇湁璁惧" rendered="{!!allBlueFlag}" onclick="checkAssetJs('all'); return false;" /></td></tr>
- <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鏌ョ湅鍏ㄩ儴淇濇湁璁惧" rendered="{!allBlueFlag}" onclick="checkAssetJs('all'); return false;" /></td></tr>
+ <tr><td class="checkButtonStyle "><apex:commandButton styleClass="you-button" value="鏌ョ湅鍏ㄩ儴淇濇湁璁惧" rendered="{!allBlueFlag}" onclick="checkAssetJs('all'); return false;" /></td></tr>
<tr><td class="checkButtonStyle"><apex:commandButton value="鏌ョ湅鏈夋晥搴撳瓨" rendered="{!!consumableBlueFlag}" onclick="checkAssetJs('consumable'); return false;" /></td></tr>
- <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鏌ョ湅鏈夋晥搴撳瓨" rendered="{!consumableBlueFlag}" onclick="checkAssetJs('consumable'); return false;" /></td></tr>
+ <tr><td class="checkButtonStyle"><apex:commandButton styleClass="you-button" value="鏌ョ湅鏈夋晥搴撳瓨" rendered="{!consumableBlueFlag}" onclick="checkAssetJs('consumable'); return false;" /></td></tr>
<tr><td class="checkButtonStyle"><apex:commandButton value="鏌ョ湅鍊熷嚭鍒嗛厤鏁�" rendered="{!!lendingBlueFlag}" onclick="checkAssetJs('lending'); return false;" /></td></tr>
- <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鏌ョ湅鍊熷嚭鍒嗛厤鏁�" rendered="{!lendingBlueFlag}" onclick="checkAssetJs('lending'); return false;" /></td></tr>
+ <tr><td class="checkButtonStyle"><apex:commandButton styleClass="you-button" value="鏌ョ湅鍊熷嚭鍒嗛厤鏁�" rendered="{!lendingBlueFlag}" onclick="checkAssetJs('lending'); return false;" /></td></tr>
<tr><td class="checkButtonStyle"><apex:commandButton value="鏌ョ湅淇悊涓繚鏈夎澶�" rendered="{!!repairingBlueFlag}" onclick="checkAssetJs('repairing'); return false;" /></td></tr>
- <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鏌ョ湅淇悊涓繚鏈夎澶�" rendered="{!repairingBlueFlag}" onclick="checkAssetJs('repairing'); return false;" /></td></tr>
+ <tr><td class="checkButtonStyle"><apex:commandButton styleClass="you-button" value="鏌ョ湅淇悊涓繚鏈夎澶�" rendered="{!repairingBlueFlag}" onclick="checkAssetJs('repairing'); return false;" /></td></tr>
<tr><td class="checkButtonStyle"><apex:commandButton value="鏌ョ湅寰呮姤搴熶繚鏈夎澶�" rendered="{!!scrappingBlueFlag}" onclick="checkAssetJs('scrapping'); return false;" /></td></tr>
- <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鏌ョ湅寰呮姤搴熶繚鏈夎澶�" rendered="{!scrappingBlueFlag}" onclick="checkAssetJs('scrapping'); return false;" /></td></tr>
+ <tr><td class="checkButtonStyle"><apex:commandButton styleClass="you-button" value="鏌ョ湅寰呮姤搴熶繚鏈夎澶�" rendered="{!scrappingBlueFlag}" onclick="checkAssetJs('scrapping'); return false;" /></td></tr>
<tr><td class="checkButtonStyle"><apex:commandButton value="鏌ョ湅宸叉姤搴熶繚鏈夎澶�" rendered="{!!scrappedBlueFlag}" onclick="checkAssetJs('scrapped'); return false;" /></td></tr>
- <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鏌ョ湅宸叉姤搴熶繚鏈夎澶�" rendered="{!scrappedBlueFlag}" onclick="checkAssetJs('scrapped'); return false;" /></td></tr> -->
+ <tr><td class="checkButtonStyle"><apex:commandButton styleClass="you-button" value="鏌ョ湅宸叉姤搴熶繚鏈夎澶�" rendered="{!scrappedBlueFlag}" onclick="checkAssetJs('scrapped'); return false;" /></td></tr>
<!-- OLY_OCM-818 -->
-
- <!-- <tr><td class="checkButtonStyle"><apex:commandButton value="鏌ョ湅宸叉秷鑰楃殑淇濇湁璁惧" rendered="{!!consumedBlueFlag}" onclick="checkAssetJs('consumed'); return false;" /></td></tr>
- <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鏌ョ湅宸叉秷鑰楃殑淇濇湁璁惧" rendered="{!consumedBlueFlag}" onclick="checkAssetJs('consumed'); return false;" /></td></tr>
+ <tr><td class="checkButtonStyle"><apex:commandButton value="鏌ョ湅宸叉秷鑰楃殑淇濇湁璁惧" rendered="{!!consumedBlueFlag}" onclick="checkAssetJs('consumed'); return false;" /></td></tr>
+ <tr><td class="checkButtonStyle"><apex:commandButton styleClass="you-button" value="鏌ョ湅宸叉秷鑰楃殑淇濇湁璁惧" rendered="{!consumedBlueFlag}" onclick="checkAssetJs('consumed'); return false;" /></td></tr>
<tr><td class="checkButtonStyle"><apex:commandButton value="鏌ョ湅鍗冲皢鍒版湡鐨勪繚鏈夎澶�" rendered="{!!soonExpiredBlueFlag}" onclick="checkAssetJs('soonExpired'); return false;" /></td></tr>
- <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鏌ョ湅鍗冲皢鍒版湡鐨勪繚鏈夎澶�" rendered="{!soonExpiredBlueFlag}" onclick="checkAssetJs('soonExpired'); return false;" /></td></tr>
+ <tr><td class="checkButtonStyle"><apex:commandButton styleClass="you-button" value="鏌ョ湅鍗冲皢鍒版湡鐨勪繚鏈夎澶�" rendered="{!soonExpiredBlueFlag}" onclick="checkAssetJs('soonExpired'); return false;" /></td></tr>
<tr><td class="checkButtonStyle"><apex:commandButton value="鏌ョ湅宸茶繃鏈熺殑淇濇湁璁惧" rendered="{!!expiredBlueFlag}" onclick="checkAssetJs('expired'); return false;" /></td></tr>
- <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鏌ョ湅宸茶繃鏈熺殑淇濇湁璁惧" rendered="{!expiredBlueFlag}" onclick="checkAssetJs('expired'); return false;" /></td></tr>
+ <tr><td class="checkButtonStyle"><apex:commandButton styleClass="you-button" value="鏌ョ湅宸茶繃鏈熺殑淇濇湁璁惧" rendered="{!expiredBlueFlag}" onclick="checkAssetJs('expired'); return false;" /></td></tr>
</table>
</apex:pageBlock>
- </apex:outputPanel> -->
-
- <!-- <apex:outputPanel layout="block" style="width: 13%; float: left;" rendered="{!showTop}">
- <apex:pageBlock mode="maindetail">
- <table style='height: 220px'>
- <tr><td class="checkButtonStyle"><apex:commandButton value="鏌ョ湅鍏ㄩ儴淇濇湁璁惧" rendered="{!!allBlueFlag}" onclick="checkAssetJs('all'); return false;" /></td></tr>
- <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鏌ョ湅鍏ㄩ儴淇濇湁璁惧" rendered="{!allBlueFlag}" onclick="checkAssetJs('all'); return false;" /></td></tr>
- <tr><td class="checkButtonStyle"><apex:commandButton value="鏌ョ湅鏈夋晥搴撳瓨" rendered="{!!consumableBlueFlag}" onclick="checkAssetJs('consumable'); return false;" /></td></tr>
- <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鏌ョ湅鏈夋晥搴撳瓨" rendered="{!consumableBlueFlag}" onclick="checkAssetJs('consumable'); return false;" /></td></tr>
- </table>
- </apex:pageBlock>
- </apex:outputPanel> -->
+ </apex:outputPanel>
<!-- chenjingwu 2023.8.2 end-->
<!-- 鍙充晶妫�绱㈠尯 -->
- <apex:outputPanel layout="block" style="width: 100%;margin: 0 auto;" rendered="{!showTop}">
+ <apex:outputPanel layout="block" style="width: 82%;margin: 0 auto;float: right;" rendered="{!showTop}">
<apex:pageBlock mode="maindetail">
- <table style='width: 95%; height: 220px'>
+ <table style='width: 100%; height: 390px' class="mytable">
<tr>
<td class="labelStyle">澶囧搧瀛樻斁鍦�</td>
<td class="inputTextStyle">
@@ -452,14 +471,11 @@
<td class="labelStyle">璐ф灦鍙�</td>
<td class="inputTextStyle"><apex:inputText value="{!searchB.wh_location}" id="shelfNumId" /></td>
<td class="blankStyle"></td>
- <td class="labelStyle">澶囧搧鐘舵��</td>
+ <td class="labelStyle">娑堣�楀搧鏈夋晥鏈熻嚦</td>
<td class="inputTextStyle">
- <apex:selectList value="{!searchB.fixture_Status}" id="assetStatusId" size="1">
- <apex:selectOptions value="{!assetStatusOptionList}"/>
- </apex:selectList>
+ <apex:inputText id="consumable_Guaranteen_endStr" value="{!searchB.consumable_Guaranteen_endStr}" size="12" onfocus="DatePicker.pickDate(true, '{!$Component.consumable_Guaranteen_endStr}', false)" />
</td>
</tr>
- <tr><td><br /><br /></td></tr>
<tr>
<td class="labelStyle">澶囧搧绠＄悊缂栫爜</td> <!-- 銈枫儶銈€儷鐣彿 -->
<td class="inputTextStyle">
@@ -483,7 +499,6 @@
</apex:selectList>
</td>
</tr>
- <tr><td><br /><br /></td></tr>
<tr>
<td class="labelStyle">涓讳綋/闄勫睘鍝�</td>
<td class="inputTextStyle">
@@ -506,14 +521,7 @@
</apex:selectList>
</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>
</tr>
- <tr><td><br /><br /></td></tr>
<tr>
<td class="labelStyle">鎵�鍦ㄥ湴鍖�(鏈儴)</td>
<td class="inputTextStyle">
@@ -529,17 +537,14 @@
</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)" />
+ <apex:selectList value="{!searchB.fixture_Status}" id="assetStatusId" size="1">
+ <apex:selectOptions value="{!assetStatusOptionList}"/>
+ </apex:selectList>
</td>
<td class="blankStyle"></td>
- <td class="searchButtonStyle" colspan="2">
- <apex:commandButton style="width: 30%" value="妫�绱�" onclick="searchBtnJs(); return false;" rerender="allForm" />
- <apex:commandButton style="width: 30%" value="鍙栨秷" onclick="cancelBtnJs(); return false;" rerender="allForm" />
- </td>
</tr>
- <tr><td><br /><br /></td></tr>
<tr>
<td class="labelStyle">澶囧搧绫诲埆</td>
<td class="inputTextStyle">
@@ -555,14 +560,18 @@
</apex:selectList>
</td>
<td class="blankStyle"></td>
- <!-- chenjingwu 2023.8.2 start-->
- <td class="labelStyle">璁惧鐘舵��</td>
+ <td class="labelStyle">绠＄悊绉嶇被</td>
<td class="inputTextStyle">
- <apex:selectList value="{!assertQueryCondition}" id="assertQueryCondition" size="1">
- <apex:selectOptions value="{!assertQueryConditionOpts}"/>
+ <apex:selectList value="{!searchB.manage_type}" id="manage_type" size="1">
+ <apex:selectOptions value="{!manage_typeOpts}"/>
</apex:selectList>
</td>
- <!-- chenjingwu 2023.8.2 end-->
+ <td class="blankStyle"></td>
+ <td class="searchButtonStyle" colspan="2" style="text-align: right;">
+ <apex:commandButton style="width: 30%" value="妫�绱�" onclick="searchBtnJs(); return false;" rerender="allForm" />
+ <apex:commandButton style="width: 30%" value="鍙栨秷" onclick="cancelBtnJs(); return false;" rerender="allForm" />
+ </td>
+
</tr>
</table>
</apex:pageBlock>
@@ -576,11 +585,12 @@
<apex:inputHidden id="clearApplyFlagId" />
<apex:outputPanel style="display:none">
<apex:outputPanel id="popupBox" layout="block">
- <input type="file" id="file_input" name="attFile" accept=".csv" /><br/>
+ <input type="file" id="file_input" name="attFile" accept=".csv" style="padding-left: 8px;"/><br/><br/>
<apex:selectList size="1" id="csvMaintaintype">
<apex:selectOptions value="{!maintainTypeOptionList}"/>
</apex:selectList>
<center>
+ <input type="hidden" id="customHidden"/>
<apex:commandButton value="纭" onclick="remoteLocationPost(); return false;" style="width: 20%; margin: 20px 10px 0px 10px" />
<apex:commandButton value="鍙栨秷" onclick="popupBox.hide();" style="width: 20%; margin: 20px 10px 0px 10px" />
</center>
@@ -675,10 +685,10 @@
<table border="0">
<tr>
- <td style="width: 2%"></td>
- <td class="setButtonStyle"><apex:commandButton value="EXCEL瀵煎叆" onclick="openPopupCSV(); return false;" oncomplete="refresh" disabled="{!!importCSVButtonActive}" /></td>
- <td class="setButtonStyle"><apex:commandButton action="{!saveApply}" value="淇濆瓨鐢宠" onclick="blockme();" rerender="allForm" oncomplete="unblockUI()" disabled="{!!saveButtonActive}" /></td>
- <td class="setButtonStyle"><apex:commandButton value="鎻愪氦鐢宠" onclick="submitApplyJS();return false;" disabled="{!!submitButtonActive}" /></td>
+ <!-- <td style="width: 2%"></td> -->
+ <td class="setButtonStyle"><apex:commandButton style="width: 90%" value="EXCEL瀵煎叆" onclick="openPopupCSV(); return false;" oncomplete="refresh" disabled="{!!importCSVButtonActive}" /></td>
+ <td class="setButtonStyle"><apex:commandButton style="width: 90%" action="{!saveApply}" value="淇濆瓨鐢宠" onclick="blockme();" rerender="allForm" oncomplete="unblockUI()" disabled="{!!saveButtonActive}" /></td>
+ <td class="setButtonStyle"><apex:commandButton style="width: 90%" value="鎻愪氦鐢宠" onclick="submitApplyJS();return false;" disabled="{!!submitButtonActive}" /></td>
<apex:actionFunction name="submitApply" action="{!submitApply}" rerender="allForm" onComplete="unblockUI();" />
<script>
function submitApplyJS(){
@@ -688,7 +698,7 @@
}
}
</script>
- <td class="setButtonStyle"><apex:commandButton value="鍒犻櫎" onclick="deleteApplyJS();return false;" disabled="{!!deleteButtonActive}" /></td>
+ <td class="setButtonStyle"><apex:commandButton style="width: 90%" value="鍒犻櫎" onclick="deleteApplyJS();return false;" disabled="{!!deleteButtonActive}" /></td>
<apex:actionFunction name="deleteApply" action="{!deleteApply}" rerender="allForm" onComplete="unblockUI();" />
<script>
function deleteApplyJS() {
@@ -698,14 +708,14 @@
}
}
</script>
- <td class="setButtonStyle"><apex:commandButton action="{!abandon}" value="搴熷純" onclick="blockme();" rerender="allForm" oncomplete="unblockUI()" disabled="{!!abandonButtonActive}" /></td>
+ <td class="setButtonStyle"><apex:commandButton style="width: 90%" action="{!abandon}" value="搴熷純" onclick="blockme();" rerender="allForm" oncomplete="unblockUI()" disabled="{!!abandonButtonActive}" /></td>
<td>
<apex:selectList size="1" id="reportMaintaintype">
<apex:selectOptions value="{!maintainTypeOptionList}"/>
</apex:selectList>
</td>
<td>
- <apex:commandButton onclick="openReport();return false;" value="鏌ョ湅鎶ヨ〃" />
+ <apex:commandButton style="width: 90px" onclick="openReport();return false;" value="鏌ョ湅鎶ヨ〃" />
</td>
<script type="text/javascript">
var popupBox;
@@ -762,31 +772,35 @@
else{
reportId = "{!notScrappedReportId}";
}
- var url = `/${reportId}?pv0=${maintainType}`;
+ var url = `/lightning/r/Report/${reportId}?fv0=${maintainType}`;
window.open(url);
}
</script>
</tr>
+ <tr><td> </td></tr>
<tr>
- <td class="labelSettingStyle">缁存姢绫诲瀷</td>
- <td class="inputTextStyle">
- <apex:selectList id="maintainTypeId" size="1">
+ <td>
+ <font>缁存姢绫诲瀷</font>
+ <apex:selectList id="maintainTypeId" size="1" style="width: 100px;">
<apex:selectOptions value="{!maintainTypeOptionList}"/>
- </apex:selectList>
+ </apex:selectList>
</td>
+ <!-- <td class="inputTextStyle">
+
+ </td> -->
<td class="labelSettingStyle">缁存姢鏁伴噺</td>
<td class="inputTextStyle">
- <apex:inputText id="maintainCountId"/>
+ <apex:inputText id="maintainCountId" style="width: 90%"/>
</td>
<td class="labelSettingStyle">搴熷純鏁伴噺</td>
<td class="inputTextStyle">
- <apex:inputText id="abandonCountId"/>
+ <apex:inputText id="abandonCountId" style="width: 90%"/>
</td>
- <td class="setButtonStyle"><apex:commandButton action="{!changeEditable}" value="缂栬緫" onclick="blockme();" rerender="allForm" oncomplete="unblockUI();" disabled="{!!editButtonActive}" /></td>
+ <td class="setButtonStyle"><apex:commandButton style="width: 70%" action="{!changeEditable}" value="缂栬緫" onclick="blockme();" rerender="allForm" oncomplete="unblockUI();" disabled="{!!editButtonActive}" /></td>
<td class="setButtonStyle">
- <apex:commandButton value="閫傜敤" reRender="allForm" onclick="applyJs(); return false;" disabled="{!!editmode}" />
+ <apex:commandButton style="width: 58%" value="閫傜敤" reRender="allForm" onclick="applyJs(); return false;" disabled="{!!editmode}" />
<script type="text/javascript">
// 閫傜敤鎸夐挳
function applyJs() {
@@ -851,50 +865,55 @@
</script>
</td>
</tr>
+ <tr><td> </td></tr>
</table>
<table>
<tr>
- <td>
+ <td style="width: 49%;">
<font>鏁版嵁瀛楁</font>
- <apex:selectList value="{!fieldName}" size="1" style="width:110px"><apex:selectOptions value="{!fieldNameOpts}"/></apex:selectList>銆�
+ <apex:selectList value="{!fieldName}" size="1" style="width:100px"><apex:selectOptions value="{!fieldNameOpts}"/></apex:selectList>銆�
<apex:selectList value="{!operator}" size="1"><apex:selectOptions value="{!operatorOpts}"/></apex:selectList>銆�
<apex:inputText value="{!fieldvalue}" style="width:80px"/>
- <apex:commandButton value="绛涢��" action="{!filter}" onclick="blockme();" rerender="allForm" oncomplete="unblockUI()"/>
+ <apex:commandButton style="width: 18%;" value="绛涢��" action="{!filter}" onclick="blockme();" rerender="allForm" oncomplete="unblockUI()"/>
</td>
- <td>鏄剧ず鏁版嵁鏁伴噺</td>
+ <td style="width: 8%;">鏄剧ず鏁版嵁鏁伴噺</td>
<td class="inputTextStyle">
<apex:actionFunction name="firstPg" action="{!firstPage}" rerender="allForm" onComplete="unblockUI();" />
<apex:selectList value="{!selRecordOption}" size="1" onchange="blockme();firstPg(); return false;">
<apex:selectOptions value="{!limitOpts}"/>
</apex:selectList>
</td>
- <td align="right">鍏眥!allAssetDataListSize}鏉℃暟鎹�</td>
+ <td align="right" style="width: 8%;">鍏眥!allAssetDataListSize}鏉℃暟鎹�</td>
<td width="20px"></td>
- <td align="right"> 宸查�変腑<label id="checkedNumId">{!checkedSize}</label>鏉℃暟鎹�</td>
+ <td align="right" style="width: 10%;"> 宸查�変腑<label id="checkedNumId">{!checkedSize}</label>鏉℃暟鎹�</td>
<td width="20px"></td>
- <td align="right"> 鏈�変腑<label id="uncheckedNumId">{!allAssetDataListSize - checkedSize}</label>鏉℃暟鎹�</td>
- <td width="20px"></td>
- <td align="right">绗� {!currPage} 椤�</td>
- <td width="20px"></td>
- <td align="right">鍏� {!totalPage} 椤�</td>
- <td width="20px"></td>
- <td align="right" width="45px">
+ <td style="width: 13%;"> 鏈�変腑<label id="uncheckedNumId">{!allAssetDataListSize - checkedSize}</label>鏉℃暟鎹�</td>
+
+ </tr>
+
+ </table>
+ <table style="width: 97%">
+ <tr>
+ <td></td>
+ <td style="width: 40%" align="right">绗� {!currPage} 椤� 鍏� {!totalPage} 椤�</td>
+ <td align="left"></td>
+ <td width="120px"></td>
+ <td style="width: 8%">
<apex:commandLink action="{!firstPage}" value="棣栭〉" id="firstPg" onclick="blockme();" oncomplete="unblockUI();" reRender="allForm" style="{!IF(currPage==1,'display: none;','')}color: blue;"/>
<apex:outputText value="棣栭〉" style="{!IF(currPage!=1,'display: none;','')}color: gray;"></apex:outputText>
+
</td>
- <td width="45px"></td>
- <td align="right" width="45px">
+ <td width="4%">
<apex:commandLink action="{!previousPage}" value="涓婁竴椤�" id="previous" onclick="blockme();" oncomplete="unblockUI();" reRender="allForm" style="{!IF(currPage==1,'display: none;','')}color: blue;"/>
<apex:outputText value="涓婁竴椤�" style="{!IF(currPage!=1,'display: none;','')}color: gray;"></apex:outputText>
</td>
- <td width="45px"></td>
- <td align="right" width="45px">
+ <td width="45px">
<apex:commandLink action="{!nextPage}" value="涓嬩竴椤�" id="next" onclick="blockme();" oncomplete="unblockUI();" reRender="allForm" style="{!IF(totalPage==currPage ||totalPage == 0,'display: none;','')}color: blue;"/>
<apex:outputText value="涓嬩竴椤�" style="{!IF(totalPage!=currPage && totalPage != 0,'display: none;','')}color: gray;"></apex:outputText>
</td>
- <td width="45px"></td>
- <td align="right" width="45px">
+ <td width="50px"></td>
+ <td width="45px">
<apex:commandLink action="{!endPage}" value="灏鹃〉" id="endPg" onclick="blockme();" oncomplete="unblockUI();" reRender="allForm" style="{!IF(totalPage==currPage||totalPage == 0,'display: none;','')}color: blue;"/>
<apex:outputText value="灏鹃〉" style="{!IF(totalPage!=currPage && totalPage != 0,'display: none;','')}color: gray;"></apex:outputText>
</td>
@@ -912,7 +931,7 @@
<table class="list" border="1" style="border-collapse: collapse; table-layout: fixed; border-bottom-width: 0px; border-spacing: 0px; height: 30px;">
<tr class="headerRow" style="background-color: #DCDCDC; text-align: left; vertical-align: top;">
<!-- 鍏ㄩ�� -->
- <td style="width:20px"><input type='checkbox' onclick='selectAllJs()' id='checker' onchange='checkboxOnclick(); return false;'/></td>
+ <td style="width:23px"><input type='checkbox' onclick='selectAllJs()' id='checker' onchange='checkboxOnclick(); return false;'/></td>
<apex:variable value="{!0}" var="cnt" />
<apex:repeat value="{!amdLeftLabelList}" var="t">
<td class="col_{!columnAmdLeftCssList[cnt]}" style="word-wrap:break-word">
@@ -943,7 +962,7 @@
<apex:repeat id="dataline_L1" value="{!allAssetInfoShowList}" var="eachAssetData">
<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">
+ <td class="dataCellBorder1" style="width:23px" align="center">
<apex:inputCheckbox id="rowCheck" value="{!eachAssetData.isCheck}" disabled="{!IF((internalAssetLocationLogin != 'All' && eachAssetData.amd['Internal_asset_location__c'] != internalAssetLocationLogin), true, false)}" onchange="checkboxOnclick(); return false;" />
<apex:inputHidden id="canChange" />
</td>
@@ -972,7 +991,7 @@
<apex:repeat id="dataline_L2" value="{!assetFromSearchList}" var="eachAssetData">
<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">
+ <td class="dataCellBorder1" style="width:23px" align="center">
<apex:inputCheckbox id="rowCheck" value="{!eachAssetData.isCheck}" disabled="{!IF((internalAssetLocationLogin != 'All' && eachAssetData.amd['Internal_asset_location__c'] != internalAssetLocationLogin), true, false)}" onchange="checkboxOnclick(); return false;" />
<apex:inputHidden id="canChange" />
</td>
--
Gitblit v1.9.1