lightningupdate.git

			@@ -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">