From 5363705f99dcbb7c270a619804beb4ac29b3faa0 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期三, 09 八月 2023 20:02:16 +0800
Subject: [PATCH] 今日修改
---
force-app/main/default/pages/CheckAllOlympusAsset.page | 69 ++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 25 deletions(-)
diff --git a/force-app/main/default/pages/CheckAllOlympusAsset.page b/force-app/main/default/pages/CheckAllOlympusAsset.page
index c62df05..ca66de2 100644
--- a/force-app/main/default/pages/CheckAllOlympusAsset.page
+++ b/force-app/main/default/pages/CheckAllOlympusAsset.page
@@ -1,7 +1,8 @@
-<apex:page controller="CheckAllOlympusAssetController" title="妫�绱繚鏈夎澶�" showHeader="true" sidebar="false" id="allPage" action="{!init}" tabStyle="CheckAllOlympusAsset__tab" docType="html-5.0">
+<apex:page controller="CheckAllOlympusAssetController" title="妫�绱繚鏈夎澶�" showHeader="true" sidebar="false" id="allPage" action="{!init}" tabStyle="CheckAllOlympusAsset__tab" docType="html-5.0" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<style>
.dateFormat {
display: none;
@@ -219,21 +220,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() {
@@ -443,7 +444,8 @@
<!-- 鍙栨秷鏄竻绌烘绱㈠尯 -->
<apex:actionFunction name="clearAllSearchConditionWhenCancel" action="{!clearAllSearchConditionWhenCancel}"></apex:actionFunction>
<!-- 宸︿晶鎸夐挳鍖� -->
- <apex:outputPanel layout="block" style="width: 13%; float: left;">
+ <!-- chenjingwu 2023.8.2 start-->
+ <!-- <apex:outputPanel layout="block" style="width: 13%; float: left;">
<apex:pageBlock mode="maindetail">
<table style='height: 220px'>
<tr><td class="checkButtonStyle"><apex:commandButton value="鏌ョ湅鍏ㄩ儴淇濇湁璁惧" rendered="{!!allBlueFlag}" onclick="checkAssetJs('all'); return false;" /></td></tr>
@@ -456,19 +458,20 @@
<tr><td class="checkButtonStyle blueStyle"><apex:commandButton 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>
+ <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> -->
<!-- OLY_OCM-818 -->
- <tr><td class="checkButtonStyle"><apex:commandButton value="鏌ョ湅宸叉秷鑰楃殑淇濇湁璁惧" rendered="{!!consumedBlueFlag && angecylookrole}" onclick="checkAssetJs('consumed'); return false;" /></td></tr>
+ <!-- <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>
+ </apex:outputText> -->
<!-- OLY_OCM-818 -->
- <tr>
+ <!-- <tr>
<td class="checkButtonStyle">
<apex:commandButton value="鐩樼偣缁撴灉璁板綍" onclick="checkChangeFlg(); gotoInventoryResultRecord(); return false;" />
</td>
@@ -490,9 +493,10 @@
</tr>
</table>
</apex:pageBlock>
- </apex:outputPanel>
+ </apex:outputPanel> -->
+ <!-- chenjingwu 2023.8.2 end-->
<!-- 鍙充晶妫�绱㈠尯 -->
- <apex:outputPanel layout="block" style="width: 87%; float: right;">
+ <apex:outputPanel layout="block" style="width: 90%;margin: 0 auto;">
<apex:pageBlock mode="maindetail">
<table style='width: 95%; height: 220px'>
<tr>
@@ -633,6 +637,21 @@
</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>
--
Gitblit v1.9.1