lightningupdate.git

			@@ -1,4 +1,4 @@
			<apex:page standardController="Rental_Apply__c" extensions="EquipmentRentalExtendController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
			<apex:page standardController="Rental_Apply__c" extensions="EquipmentRentalExtendController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
			<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
			<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
			<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
			@@ -41,6 +41,9 @@

			div#in_Div_L td.dataCellBorder1 {
			border-width: 0px 0px 1px 1px;
			white-space: pre-line;
			word-break: break-all;
			word-wrap: break-word;
			}
			div#in_Div_L td.tdRed {
			background-color:red;
			@@ -59,6 +62,9 @@
			}
			div#in_Div_R td.dataCellBorder1 {
			border-width: 0px 0px 1px 1px;
			white-space: pre-line;
			word-break: break-all;
			word-wrap: break-word;
			}
			div#in_Div_R td.tdRed {
			background-color:red;
			@@ -101,6 +107,11 @@
			function setDatejs() {
			blockme();
			setDatefunc();
			}
			function closePage(){
			window.opener = window;
			var win = window.open("","_self");
			win.close();
			}
			function saveJs() {
			blockme();
			@@ -288,18 +299,18 @@
			<apex:pageBlockButtons location="top">
			<table>
			<tr>
			<td align="right"><input type="button" value="关闭" onclick="window.close();" style="width:70px;"/></td>
			<td align="right" style="padding-left: 1000px"><input type="button" value="关闭" onclick="closePage()" style="width:70px;"/></td>
			</tr>
			</table>
			</apex:pageBlockButtons>
			<table style='width:1150px;'>
			<tr>
			<tr style="height:55px">
			<td style="width:85px" align="right">选择条件</td>
			<td style="width:85px" align="right"><apex:selectList value="{!text1}" id="text1" size="1" style="width:80px"><apex:selectOptions value="{!textOpts}"/></apex:selectList></td>
			<td style="width:85px" align="center"><apex:selectList value="{!cond1}" id="cond1" size="1" style="width:80px"><apex:selectOptions value="{!equalOpts}"/></apex:selectList></td>
			<td style="width:95px" align="left"><apex:inputText value="{!val1}" id="val1" style="width:100px"/></td>
			<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:80px;" /></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>
			@@ -309,9 +320,9 @@
			<td align="right" colspan="2">{!$ObjectType.Rental_Apply__c.fields.Demo_purpose1__c.label} <apex:inputField value="{!searchCondition.Demo_purpose1__c}"/></td>
			<td align="center" colspan="4">
			{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Final_reply_day__c.label}
			<apex:inputField value="{!finalDayFrom.Birth_Date__c}"/>
			<apex:inputField style="width:115px" value="{!finalDayFrom.Birth_Date__c}"/>
			～
			<apex:inputField value="{!finalDayTo.Birth_Date__c}"/>
			<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></td>
			@@ -324,7 +335,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"/>
			<input type="button" value="保存" onclick="saveJs();" style="width:80px;background-color:red;height:22px;margin-right: 20px;margin-top: 5px;"/>
			<!-- 分页用 SWAG-B9UBDP start -->
			<table align="right" style="width: 700px;">
			<tr>
			@@ -385,14 +396,14 @@
			</table>
			<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;" class="headerRow">
			<tr style="background-color:#DCDCDC;height: 50px;" class="headerRow">
			<td style="width:20px" align="center">
			<input type='checkbox' onClick='checkAll()' id='checker'/>
			</td>
			<td style="width:110px" align="center">
			<a href="#" onclick="sortTableJs('0');return false;" style="text-decoration: underline;">{!$ObjectType.Rental_Apply__c.fields.Name.label}</a>　{!sortOrder[0]}
			</td>
			<td style="width:60px" align="center">
			<td style="width:60px;white-space:pre-line;word-break:break-all;word-wrap:break-word;" align="center">
			<a href="#" onclick="sortTableJs('1');return false;" style="text-decoration: underline;">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.RAES_Status__c.label}</a>　{!sortOrder[1]}
			</td>
			<!-- 备品出借担当 -->