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/AssetMaintain.page | 66 ++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 22 deletions(-)
diff --git a/force-app/main/default/pages/AssetMaintain.page b/force-app/main/default/pages/AssetMaintain.page
index 937b6a0..6b50d1e 100644
--- a/force-app/main/default/pages/AssetMaintain.page
+++ b/force-app/main/default/pages/AssetMaintain.page
@@ -1,7 +1,8 @@
-<apex:page controller="AssetMaintainController" title="鏁版嵁缁存姢" showHeader="true" sidebar="false" id="allPage" action="{!init}" docType="html-5.0" lightningStylesheets="true">
+<apex:page controller="AssetMaintainController" title="鏁版嵁缁存姢" showHeader="false" sidebar="false" id="allPage" action="{!init}" 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;
@@ -46,7 +47,6 @@
}
div#in_Div_L td.dataCellBorder1 {
border-width: 1px;
- border-left: 1px solid rgb(229, 229, 229);
}
div#in_Div_R td.dataCellBorder1 {
border-width: 1px;
@@ -198,21 +198,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() {
@@ -395,7 +395,8 @@
<!-- 鍙栨秷鏄竻绌烘绱㈠尯 -->
<apex:actionFunction name="clearAllSearchConditionWhenCancel" action="{!clearAllSearchConditionWhenCancel}"></apex:actionFunction>
<!-- 宸︿晶鎸夐挳鍖� -->
- <apex:outputPanel layout="block" style="width: 13%; float: left;" rendered="{!showTop}">
+ <!-- chenjingwu 2023.8.2 start-->
+ <!-- <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>
@@ -409,9 +410,10 @@
<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 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 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}" 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 blueStyle"><apex:commandButton 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>
@@ -419,9 +421,21 @@
<tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鏌ョ湅宸茶繃鏈熺殑淇濇湁璁惧" rendered="{!expiredBlueFlag}" onclick="checkAssetJs('expired'); return false;" /></td></tr>
</table>
</apex:pageBlock>
- </apex:outputPanel>
+ </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> -->
+ <!-- chenjingwu 2023.8.2 end-->
<!-- 鍙充晶妫�绱㈠尯 -->
- <apex:outputPanel layout="block" style="width: 87%; float: right;" rendered="{!showTop}">
+ <apex:outputPanel layout="block" style="width: 100%;margin: 0 auto;" rendered="{!showTop}">
<apex:pageBlock mode="maindetail">
<table style='width: 95%; height: 220px'>
<tr>
@@ -541,6 +555,14 @@
</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>
</table>
</apex:pageBlock>
--
Gitblit v1.9.1