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/CheckAllOlympusAsset.page | 232 +++++++++++++++++++++++++++-------------------------------
1 files changed, 108 insertions(+), 124 deletions(-)
diff --git a/force-app/main/default/pages/CheckAllOlympusAsset.page b/force-app/main/default/pages/CheckAllOlympusAsset.page
index ca66de2..00d4217 100644
--- a/force-app/main/default/pages/CheckAllOlympusAsset.page
+++ b/force-app/main/default/pages/CheckAllOlympusAsset.page
@@ -60,7 +60,7 @@
height:50px;
width:90%;
}
- table.list .col_Internal_asset_location__c {width:130px;}
+ table.list .col_Internal_asset_location__c {width:100px;}
table.list .col_Salesdepartment__c {width:110px;}
table.list .col_SalesProvince__c {width:70px;}
table.list .col_Asset_loaner_category__c {width:80px;}
@@ -68,14 +68,14 @@
table.list .col_CompanyOfEquipment__c {width:60px;}
table.list .col_Asset_name__c {width:60px;}
table.list .col_Internal_Asset_number__c {width:80px;}
- table.list .col_Internal_Asset_number_key__c {width:80px;}
+ table.list .col_Internal_Asset_number_key__c {width:100px;}
- table.list .col_SerialNumber {width:60px;} /*鏈鸿韩缂栧彿*/
+ table.list .col_SerialNumber {width:40px;} /*鏈鸿韩缂栧彿*/
table.list .col_Product_Serial_No__c {width:60px;} /*浜у搧 + 鏈轰綋缂栫爜*/
table.list .col_Product_category__c {width:60px;}
- table.list .col_Equipment_Type__c {width:120px;}
+ table.list .col_Equipment_Type__c {width:70px;}/* 澶囧搧鍒嗙被zyh*/
table.list .col_Consumable_Guaranteen_end__c {width:70px;}
- table.list .col_Manage_type__c {width:80px;} /*绠＄悊绉嶇被*/
+ table.list .col_Manage_type__c {width:60px;} /*绠＄悊绉嶇被*/
table.list .col_Loaner_accsessary__c {width:50px;}
table.list .col_EquipmentSet_Managment_Code__c {width:50px;}
table.list .col_AssetManageConfirm__c {width:50px;}
@@ -92,6 +92,7 @@
table.list .col_Repairing_Count__c {width:30px;}
table.list .col_Fixture_Status__c {width:30px;}
table.list .col_Main_OneToOne__c {width:40px;}
+ table.list .col_Status {width:40px;}
.navigationBarBlock {
width: 100%;
@@ -135,7 +136,7 @@
width: 9%;
}
.inputTextStyle input {
- width: 90%;
+ width: 95%;
}
.inputTextStyle select {
width: 95%;
@@ -152,6 +153,11 @@
#pageBlockButton1 {
margin: 0pxt;
}
+ /*20230815 ljh start*/
+ table.mytable tr{
+ height:45px;
+ }
+ /*20230815 ljh end*/
</style>
<script type="text/javascript">
// 鏀瑰彉table灏哄
@@ -220,21 +226,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() {
@@ -359,6 +365,12 @@
window.open('{!$Page.InventoryResultRecord}');
}
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+ function gotoInventoryTemperatureHumidity() {
+ window.open('{!$Page.InventoryTemperatureHumidity}');
+ }
+ // 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start
+
function gotoInventoryReport() {
window.open('{!$Page.InventoryReport}');
}
@@ -445,60 +457,42 @@
<apex:actionFunction name="clearAllSearchConditionWhenCancel" action="{!clearAllSearchConditionWhenCancel}"></apex:actionFunction>
<!-- 宸︿晶鎸夐挳鍖� -->
<!-- chenjingwu 2023.8.2 start-->
- <!-- <apex:outputPanel layout="block" style="width: 13%; float: left;">
+ <apex:outputPanel layout="block" style="width: 16%; float: left;">
<apex:pageBlock mode="maindetail">
- <table style='height: 220px'>
+ <table style='height: 370px'>
<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 style="background-color: silver;" 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 blueStyle"><apex:commandButton style="background-color: silver;" 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 blueStyle"><apex:commandButton style="background-color: silver;" 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 blueStyle"><apex:commandButton style="background-color: silver;" 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>
- <apex:outputText rendered="{!angecylookrole}"> -->
- <!-- 1650-->
- <!-- <tr><td class="checkButtonStyle"><apex:commandButton value="鏌ョ湅宸叉姤搴熶繚鏈夎澶�" rendered="{!!scrappedBlueFlag && angecylookrole}" 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 blueStyle"><apex:commandButton style="background-color: silver;" 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 style="background-color: silver;" value="鏌ョ湅宸叉姤搴熶繚鏈夎澶�" rendered="{!scrappedBlueFlag}" onclick="checkAssetJs('scrapped'); return false;" /></td></tr>
<!-- OLY_OCM-818 -->
- <!-- <tr><td class="checkButtonStyle"><apex:commandButton value="鏌ョ湅宸叉秷鑰楃殑淇濇湁璁惧" rendered="{!!consumedBlueFlag && angecylookrole}" 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="{!!soonExpiredBlueFlag && angecylookrole}" 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 value="鏌ョ湅宸茶繃鏈熺殑淇濇湁璁惧" rendered="{!!expiredBlueFlag && angecylookrole}" onclick="checkAssetJs('expired'); return false;" /></td></tr>
- <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鏌ョ湅宸茶繃鏈熺殑淇濇湁璁惧" rendered="{!expiredBlueFlag}" onclick="checkAssetJs('expired'); return false;" /></td></tr>
- </apex:outputText> -->
- <!-- OLY_OCM-818 -->
- <!-- <tr>
- <td class="checkButtonStyle">
- <apex:commandButton value="鐩樼偣缁撴灉璁板綍" onclick="checkChangeFlg(); gotoInventoryResultRecord(); return false;" />
- </td>
- </tr>
+ <tr><td class="checkButtonStyle"><apex:commandButton value="鏌ョ湅宸叉秷鑰楃殑淇濇湁璁惧" rendered="{!!consumedBlueFlag}" onclick="checkAssetJs('consumed'); return false;" /></td></tr>
+ <tr><td class="checkButtonStyle blueStyle"><apex:commandButton style="background-color: silver;" 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 style="background-color: silver;" 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 style="background-color: silver;" value="鏌ョ湅宸茶繃鏈熺殑淇濇湁璁惧" rendered="{!expiredBlueFlag}" onclick="checkAssetJs('expired'); return false;" /></td></tr>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc Start -->
<tr>
<td class="checkButtonStyle">
- <apex:commandButton value="澶囧搧鐩樼偣鎶ュ憡" onclick="checkChangeFlg(); gotoInventoryReport(); return false;" />
+ <apex:commandButton value="娓╂箍搴︾洏鐐�" rendered="{!angecylookrole}" onclick="checkChangeFlg(); gotoInventoryTemperatureHumidity(); return false;" />
</td>
</tr>
- <tr>
- <td class="checkButtonStyle">
- <apex:commandButton value="鑰楁潗鐩樼偣鎶ュ憡" rendered="{!angecylookrole}" onclick="checkChangeFlg(); gotoConsumInventoryReport(); return false;" />
- </td>
- </tr>
- <tr>
- <td class="checkButtonStyle">
- <apex:commandButton value="鏁版嵁缁存姢" rendered="{!angecylookrole}" onclick="checkChangeFlg(); gotoAssetMaintain(); return false;" />
- </td>
- </tr>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230804 by lc End -->
</table>
</apex:pageBlock>
- </apex:outputPanel> -->
- <!-- chenjingwu 2023.8.2 end-->
+ </apex:outputPanel>
<!-- 鍙充晶妫�绱㈠尯 -->
- <apex:outputPanel layout="block" style="width: 90%;margin: 0 auto;">
+ <apex:outputPanel layout="block" style="width: 83%; float: right;">
<apex:pageBlock mode="maindetail">
- <table style='width: 95%; height: 220px'>
+ <table style='width: 100%; height: 370px'>
<tr>
<td class="labelStyle">澶囧搧瀛樻斁鍦�</td>
<td class="inputTextStyle">
@@ -597,10 +591,30 @@
<apex:inputText id="consumable_Guaranteen_endStr" value="{!searchB.consumable_Guaranteen_endStr}" size="12" onfocus="DatePicker.pickDate(true, '{!$Component.consumable_Guaranteen_endStr}', false)" />
</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" />
- <apex:commandButton style="width: 30%" value="瀵煎嚭鏁版嵁" disabled="{!onlyReadFlag}" onclick="checkCsvExport(); return false;" />
+ </tr>
+ <tr><td><br /><br /></td></tr>
+ <tr>
+ <td class="labelStyle">澶囧搧绫诲埆</td>
+ <td class="inputTextStyle">
+ <apex:selectList value="{!searchB.asset_loaner_category}" id="assetLoanerCategory" size="1">
+ <apex:selectOptions value="{!assetLoanerCategoryOpts}"/>
+ </apex:selectList>
+ </td>
+ <td class="blankStyle"></td>
+ <td class="labelStyle">鍒版湡鏃堕棿</td>
+ <td class="inputTextStyle">
+ <apex:selectList value="{!searchB.daysToExpired}" id="daysToExpired" size="1">
+ <apex:selectOptions value="{!daysToExpiredOpts}"/>
+ </apex:selectList>
+ </td>
+ <td class="blankStyle"></td>
+ <td class="blankStyle"></td>
+ <td class="blankStyle"></td>
+ <td class="blankStyle"></td>
+ <td colspan="2">
+ <apex:commandButton style="width: 28%" value="妫�绱�" onclick="searchBtnJs(); return false;" rerender="allForm" />
+ <apex:commandButton style="width: 28%" value="鍙栨秷" onclick="cancelBtnJs(); return false;" rerender="allForm" />
+ <apex:commandButton style="width: 36%" value="瀵煎嚭鏁版嵁" disabled="{!onlyReadFlag}" onclick="checkCsvExport(); return false;" />
</td>
<apex:actionFunction name="csvExprot" action="{!csvExprot}" />
<script type="text/javascript">
@@ -621,38 +635,6 @@
}
</script>
</tr>
- <tr><td><br /><br /></td></tr>
- <tr>
- <td class="labelStyle">澶囧搧绫诲埆</td>
- <td class="inputTextStyle">
- <apex:selectList value="{!searchB.asset_loaner_category}" id="assetLoanerCategory" size="1">
- <apex:selectOptions value="{!assetLoanerCategoryOpts}"/>
- </apex:selectList>
- </td>
- <td class="blankStyle"></td>
- <td class="labelStyle">鍒版湡鏃堕棿</td>
- <td class="inputTextStyle">
- <apex:selectList value="{!searchB.daysToExpired}" id="daysToExpired" size="1">
- <apex:selectOptions value="{!daysToExpiredOpts}"/>
- </apex:selectList>
- </td>
- <td class="blankStyle"></td>
- <!-- chenjingwu 2023.8.2 start-->
- <td class="labelStyle">璁惧鐘舵��</td>
- <td class="inputTextStyle">
- <apex:selectList value="{!assertQueryCondition}" id="assertQueryCondition" size="1">
- <apex:selectOptions value="{!assertQueryConditionOpts}"/>
- </apex:selectList>
- </td>
- <!-- chenjingwu 2023.8.2 end-->
- </tr>
- <tr><td><br /><br /></td></tr>
- <tr>
- <td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td><td></td>
- <td class="searchButtonStyle">
- <apex:commandButton style="width: 100%;float:right" value="鏁版嵁缁存姢鈥�" onclick="gotoAssetMaintain(); return false;" rerender="allForm" />
- </td>
- </tr>
</table>
</apex:pageBlock>
</apex:outputPanel>
@@ -667,11 +649,11 @@
<apex:inputHidden id="clearApplyFlagId" />
<table>
<tr>
- <td style="width: 2%"></td>
- <td class="labelSettingStyle">澶囧搧瀛樻斁鍦�</td>
- <td class="blankStyle"></td>
+ <!-- <td style="width: 2%"></td> -->
+ <td class="">澶囧搧瀛樻斁鍦�</td>
+ <td width="10px"></td>
<td class="inputTextStyle">
- <apex:selectList value="{!internalAssetLocationSet}" id="stockId" size="1" rendered="{!beipincunfangdiEditableFlag}">
+ <apex:selectList value="{!internalAssetLocationSet}" id="stockId" size="1" rendered="{!beipincunfangdiEditableFlag}" style="margin-left: 3px;">
<apex:selectOptions value="{!internalAssetDataLocationOptionList}"/>
</apex:selectList>
<apex:inputText disabled="true" rendered="{!!beipincunfangdiEditableFlag}" />
@@ -694,7 +676,7 @@
<td><apex:inputText id="otherSelectionId" rendered="{!angecylookrole}"/>
<apex:inputText disabled="true" rendered="{!!angecylookrole}" /></td>
- <td class="setButtonStyle">
+ <td class="setButtonStyle" style="padding-right: 10px;">
<apex:commandButton value="閫傜敤" reRender="allForm" onclick="applyJs(); return false;" disabled="{!onlyReadFlag}" />
<script type="text/javascript">
// 閫傜敤鎸夐挳
@@ -865,7 +847,7 @@
<apex:param name="applyMsgType" value="" />
</apex:actionFunction>
- <td class="setButtonStyle"><apex:commandButton action="{!saveBtn}" value="淇濆瓨" onclick="blockme();" rerender="allForm" oncomplete="unblockUI(); checkSavingJs();" disabled="{!onlyReadFlag}" /></td>
+ <td class="setButtonStyle" style="padding-right: 10px;"><apex:commandButton action="{!saveBtn}" value="淇濆瓨" onclick="blockme();" rerender="allForm" oncomplete="unblockUI(); checkSavingJs();" disabled="{!onlyReadFlag}" /></td>
<!-- 鎵归噺鏇存柊 -->
<td class="setButtonStyle"><apex:commandButton value="鎵归噺鏇存柊" onclick="openPopup(); return false;" oncomplete="refresh" disabled="{!onlyReadFlag}" /></td>
<td style="width: auto"></td>
@@ -913,25 +895,26 @@
<apex:outputPanel id="popupBox" layout="block">
<input type="file" id="file_input" name="attFile" accept=".csv" /><br/>
<center>
+ <input type="hidden" id="other_hidden"/>
<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>
</apex:outputPanel>
</apex:outputPanel>
- <table>
+ <table style="width: 100%">
<tr>
- <td style="width: 5%"></td>
- <td>鏄剧ず鏈�変腑鏁版嵁鏁伴噺</td>
- <td class="blankStyle"></td>
- <td class="inputTextStyle">
- <apex:selectList value="{!selRecordOption}" size="1" onchange="searchBtnJs(); return false;"><apex:selectOptions value="{!limitOpts}"/></apex:selectList>
+ <!-- <td style="width: 5%"></td> -->
+ <td width="70px">鏄剧ず鏈�変腑鏁版嵁鏁伴噺</td>
+ <!-- <td class="blankStyle"></td> -->
+ <td class="inputTextStyle" style="padding-left: 35px;">
+ <apex:selectList value="{!selRecordOption}" size="1" style="margin-top: 10px;margin-left: 5px;" onchange="searchBtnJs(); return false;"><apex:selectOptions value="{!limitOpts}"/></apex:selectList>
</td>
- <td width="45px"></td>
- <td align="right">鍏辨绱㈠嚭 {!totalSoqlRecordNum + totalFixDataNum} 鏉℃暟鎹�</td>
- <td width="45px"></td>
- <td id="checkedNumId" align="right">鏈〉宸查�変腑 {!totalFixDataNum} 鏉℃暟鎹�</td>
- <td width="45px"></td>
- <td id="uncheckedNumId" align="right"> 鏈〉鏈�変腑 {!totalUnfixDataNum} 鏉℃暟鎹�</td>
+ <td width="30px"></td>
+ <td align="right" style="width: 130px">鍏辨绱㈠嚭 {!totalSoqlRecordNum + totalFixDataNum} 鏉℃暟鎹�</td>
+ <td width="30px"></td>
+ <td id="checkedNumId" align="right" style="width: 180px">鏈〉宸查�変腑 {!totalFixDataNum} 鏉℃暟鎹�</td>
+ <td width="10px"></td>
+ <td id="uncheckedNumId" align="right" style="width: 153px"> 鏈〉鏈�変腑 {!totalUnfixDataNum} 鏉℃暟鎹�</td>
<script>
j$(function() {
// 缁熻鎵撳嬀鏁伴噺
@@ -948,29 +931,30 @@
});
</script>
<td width="45px"></td>
- <td align="right">绗� {!currPage} 椤�</td>
+ <td align="right" style="width:41px">绗� {!currPage} 椤�</td>
<td width="45px"></td>
- <td align="right">鍏� {!totalPage} 椤�</td>
- <td width="45px"></td>
+ <td align="right" style="width:55px">鍏� {!totalPage} 椤�</td>
+ <td width="60px"></td>
<td align="right" width="45px">
<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 width="10px"></td>
<td align="right" width="45px">
<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 width="10px"></td>
<td align="right" 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 width="10px"></td>
<td align="right" 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>
+ <td class="blankStyle"></td>
</tr>
</table>
</apex:pageBlock>
@@ -980,7 +964,7 @@
<input type="hidden" id="count_hidden" value="{!allAssetDataListSize}"/>
<!-- 鏌ョ湅鍏ㄩ儴淇濇湁璁惧 -->
<div id="out_Div_L" style="overflow:auto">
- <table class="list" border="1" style="border-collapse: collapse; table-layout: fixed; border-bottom-width: 0px; border-spacing: 0px; height: 80px; width: 600px;">
+ <table class="list" border="1" style="border-collapse: collapse; table-layout: fixed; border-bottom-width: 0px; border-spacing: 0px; height: 40px; width: 600px;">
<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>
@@ -995,7 +979,7 @@
</table>
</div>
<div id="out_Div_R">
- <table class="list" border="1" style="border-collapse: collapse; table-layout:fixed; border-bottom-width: 0px; border-spacing:0; width:700px; height: 80px;">
+ <table class="list" border="1" style="border-collapse: collapse; table-layout:fixed; border-bottom-width: 0px; border-spacing:0; width:2660px; height: 40px;">
<tr class="headerRow" style="background-color: #DCDCDC; text-align: left; vertical-align: top;">
<apex:variable value="{!0}" var="cnt" />
<apex:repeat value="{!rightLabelList}" var="t">
@@ -1064,13 +1048,13 @@
}
</script>
<div id="in_Div_R" style="overflow:auto;">
- <table class="list" border="1" style="border-collapse:collapse;table-layout:fixed;border-bottom-width:0px;border-spacing:0;width:660px;" id="tableData_R">
+ <table class="list" border="1" style="border-collapse:collapse;table-layout:fixed;border-bottom-width:0px;border-spacing:0;width:2660px;" id="tableData_R">
<apex:variable value="{!0}" var="Cnt_R" />
<apex:repeat id="dataline_R" value="{!allAssetInfoList}" var="eachAssetData">
<tr id="tableData_R_{!Cnt_R}" class="dataRow" onmouseover="if (window.hiOn){hiOn(this);} " onmouseout="if (window.hiOff){hiOff(this);} " onblur="if (window.hiOff){hiOff(this);}" onfocus="if (window.hiOn){hiOn(this);}" >
<apex:variable value="{!0}" var="cnt2" />
<apex:repeat id="eachdata_R" value="{!rightApiList}" var="eachRightApi">
- <td class="col_{!columnRightCssList[cnt2]} dataCellBorder1 {!eachRightApi[0]}" style="word-wrap:break-word">
+ <td class="col_{!columnRightCssList[cnt2]} dataCellBorder1 {!eachRightApi[0]}" style="word-wrap:break-word;min-width: 100px">
<!-- r -->
<apex:outputPanel rendered="{!(eachRightApi.size>1 || columnRightRWMap[eachRightApi[0]]=='r')}" layout="none">
<apex:outputPanel rendered="{!eachRightApi.size == 1}" layout="none">
--
Gitblit v1.9.1