From 752e01145d2546a069ba0ddb39ca5874acaa6e19 Mon Sep 17 00:00:00 2001
From: LiJinHuan <lijinhuan@prec-tech.com>
Date: 星期一, 03 七月 2023 15:06:56 +0800
Subject: [PATCH] 查询出借中备品
---
force-app/main/default/pages/EquipmentRentalExtend.page | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/force-app/main/default/pages/EquipmentRentalExtend.page b/force-app/main/default/pages/EquipmentRentalExtend.page
index 945edbd..cb846d6 100644
--- a/force-app/main/default/pages/EquipmentRentalExtend.page
+++ b/force-app/main/default/pages/EquipmentRentalExtend.page
@@ -1,7 +1,8 @@
-<apex:page standardController="Rental_Apply__c" extensions="EquipmentRentalExtendController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
+<apex:page standardController="Rental_Apply__c" extensions="EquipmentRentalExtendController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true" title="鏌ヨ鍊熷嚭涓鍝�">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230525 ljh lightning -->
<style>
.dateFormat {
display: none;
@@ -45,6 +46,7 @@
word-break: break-all;
word-wrap: break-word;
}
+ /* 20230703 ljh 棰滆壊涓嶉偅涔堥珮浜� */
div#in_Div_L td.tdRed {
background-color:red;
}
@@ -57,6 +59,7 @@
div#in_Div_L td.tdBlue {
background-color:Cyan;
}
+ /* 20230703 ljh 棰滆壊涓嶉偅涔堥珮浜� */
div#in_Div_L td.tdNormal {
background-color:none;
}
@@ -81,6 +84,15 @@
div#in_Div_R td.tdNormal {
background-color:none;
}
+ div#in_Div_L td.dataCellBorder1{
+ border-bottom: 1px solid rgb(201, 201, 201);
+ }
+ div#in_Div_R td.dataCellBorder1{
+ border-bottom: 1px solid rgb(201, 201, 201);
+ }
+
+ #in_Div_L table tr:nth-child(2n){background-color:#f2f2f2;}
+ #in_Div_R table tr:nth-child(2n){background-color:#f2f2f2;}
</style>
<script>
function searchJs() {
@@ -296,13 +308,15 @@
</apex:actionFunction>
<apex:inputHidden value="{!returnIMFupdate}" id="returnIMFupdate" />
<apex:pageBlock id="searchBlock" title="妫�绱�">
- <apex:pageBlockButtons location="top">
+ <!-- 20230616 ljh start-->
+ <!-- <apex:pageBlockButtons location="top">
<table>
<tr>
- <td align="right" style="padding-left: 1000px"><input type="button" value="鍏抽棴" onclick="closePage()" style="width:70px;"/></td>
+ <td align="right" style="padding-left: 1000px"><input type="button" class="btn" value="鍏抽棴" onclick="closePage()" style="width:70px;"/></td>
</tr>
</table>
- </apex:pageBlockButtons>
+ </apex:pageBlockButtons> -->
+ <!-- 20230616 ljh end-->
<table style='width:1150px;'>
<tr style="height:55px">
<td style="width:85px" align="right">閫夋嫨鏉′欢</td>
@@ -311,10 +325,10 @@
<td style="width:95px" align="left"><apex:inputText value="{!val1}" id="val1" style="width:100px;"/></td>
<td style="width:85px" align="right">鎵�鏈夎��</td>
<td style="width:120px" align="left"><apex:inputText value="{!ownerSearch}" style="width:100px;" /></td>
- <td style="width:135px" align="center"><input type="button" value="鍊熷嚭涓叏閮�" onclick="searchsp1Js();" style="width:130px"/></td>
- <td style="width:135px" align="center"><input type="button" value="瓒呰繃涓�" onclick="searchsp2Js();" style="width:130px"/></td>
- <td style="width:135px" align="center"><input type="button" value="1鍛ㄤ互鍐呭洖鏀堕瀹�" onclick="searchsp3Js();" style="width:130px"/></td>
- <td style="width:135px" align="center"><input type="button" value="鍏ㄩ儴" onclick="searchsp4Js();" style="width:130px"/></td>
+ <td style="width:135px" align="center"><input class="btn" type="button" value="鍊熷嚭涓叏閮�" onclick="searchsp1Js();" style="width:130px"/></td>
+ <td style="width:135px" align="center"><input class="btn" type="button" value="瓒呰繃涓�" onclick="searchsp2Js();" style="width:130px"/></td>
+ <td style="width:135px" align="center"><input class="btn" type="button" value="1鍛ㄤ互鍐呭洖鏀堕瀹�" onclick="searchsp3Js();" style="width:130px"/></td>
+ <td style="width:135px" align="center"><input class="btn" type="button" value="鍏ㄩ儴" onclick="searchsp4Js();" style="width:130px"/></td>
</tr>
<tr>
<td align="right" colspan="2">{!$ObjectType.Rental_Apply__c.fields.Demo_purpose1__c.label} <apex:inputField value="{!searchCondition.Demo_purpose1__c}"/></td>
@@ -324,7 +338,7 @@
锝�
<apex:inputField style="width:115px" value="{!finalDayTo.Birth_Date__c}"/>
</td>
- <td align="center"><input type="button" value="妫�绱�" onclick="searchJs();" style="width:130px;font-weight:bold"/></td>
+ <td align="center"><input type="button" class="btn" value="妫�绱�" onclick="searchJs();" style="width:130px;"/></td>
<td></td>
<td></td>
<!-- 20210628 ljh update SFDC-C4BBFH -->
@@ -335,7 +349,7 @@
<apex:pageBlock id="dataBlock" title="缁撴灉">
<apex:pageBlockButtons location="top" id="pageBlockButton1">
- <input type="button" value="淇濆瓨" onclick="saveJs();" style="width:80px;background-color:red;height:22px;margin-right: 20px;margin-top: 5px;"/>
+ <input type="button" class="btn" value="淇濆瓨" onclick="saveJs();" style="width:80px;background-color:#08107b;height:32px;margin-right: 20px;margin-top: 5px;color: white;text-align: center; line-height: 32px;"/>
<!-- 鍒嗛〉鐢� SWAG-B9UBDP start -->
<table align="right" style="width: 700px;">
<tr>
@@ -385,7 +399,8 @@
<td style="width:100px" align="left"><input type="button" value="淇濆瓨" onclick="saveJs();" style="width:80px;background-color: red"/></td>
</tr>
</table> -->
- <table id="msgtable">
+ <!-- 20230616 ljh-->
+ <!-- <table id="msgtable">
<tr>
<td>
<apex:outputPanel id="message">
@@ -393,7 +408,11 @@
</apex:outputPanel>
</td>
</tr>
- </table>
+ </table> -->
+ <apex:outputPanel id="message">
+ <apex:pageMessages />
+ </apex:outputPanel>
+ <!-- 20230616 ljh-->
<div id="out_Div_L">
<table class="list" border="1" style="border-collapse: collapse;table-layout:fixed;border-bottom-width: 0px;border-spacing:0;width:915px;">
<tr style="background-color:#DCDCDC;height: 50px;" class="headerRow">
--
Gitblit v1.9.1