From 7010e9512fb18cbef30f8beb685bf99596056489 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期二, 25 四月 2023 14:06:08 +0800
Subject: [PATCH] 查询借出中备品
---
force-app/main/default/pages/EquipmentRentalExtend.page-meta.xml | 7
force-app/main/default/pages/EquipmentRentalExtend.page | 573 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 580 insertions(+), 0 deletions(-)
diff --git a/force-app/main/default/pages/EquipmentRentalExtend.page b/force-app/main/default/pages/EquipmentRentalExtend.page
new file mode 100644
index 0000000..945edbd
--- /dev/null
+++ b/force-app/main/default/pages/EquipmentRentalExtend.page
@@ -0,0 +1,573 @@
+<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)}"/>
+<style>
+ .dateFormat {
+ display: none;
+ }
+ .requiredBlock {
+ display: none;
+ }
+ .message {
+ width: 1184px;
+ }
+
+ div#out_Div_R {
+ position:relative;
+ overflow: hidden;
+ width: 1200px;
+ margin-left: 915px;
+ }
+ div#in_Div_R {
+ position:relative;
+ overflow: auto;
+ width: 754px;
+ height: 451px;
+ margin-left: 915px;
+ margin-top: -451px;
+ }
+ div#out_Div_L {
+ position:relative;
+ overflow: hidden;
+ width: 915px;
+ }
+ div#in_Div_L {
+ position:relative;
+ width: 915px;
+ height: 451px;
+
+ }
+
+ 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;
+ }
+ div#in_Div_L td.tdYellow {
+ background-color:yellow;
+ }
+ div#in_Div_L td.tdGray {
+ background-color:gray;
+ }
+ div#in_Div_L td.tdBlue {
+ background-color:Cyan;
+ }
+ div#in_Div_L td.tdNormal {
+ background-color:none;
+ }
+ 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;
+ }
+ div#in_Div_R td.tdYellow {
+ background-color:yellow;
+ }
+ div#in_Div_R td.tdGray {
+ background-color:gray;
+ }
+ div#in_Div_R td.tdBlue {
+ background-color:Cyan;
+ }
+ div#in_Div_R td.tdNormal {
+ background-color:none;
+ }
+</style>
+<script>
+function searchJs() {
+ blockme();
+ searchfunc();
+}
+function searchsp1Js() {
+
+ blockme();
+ searchsp1func();
+}
+function searchsp2Js() {
+ blockme();
+ searchsp2func();
+}
+function searchsp3Js() {
+ blockme();
+ searchsp3func();
+}
+function searchsp4Js() {
+ blockme();
+ searchsp4func();
+}
+function setDatejs() {
+ blockme();
+ setDatefunc();
+}
+function closePage(){
+ window.opener = window;
+ var win = window.open("","_self");
+ win.close();
+}
+function saveJs() {
+ blockme();
+ var flgReturn = j$(escapeVfId('allPage:allForm:returnIMFupdate')).value();
+ if(flgReturn == 'Changed'){
+ var rg=confirm("娉ㄦ剰鏁村崟褰掕繕澶囧搧锛屽惁鍒欏皢鎸夌幇鍦鸿浆鍊熻杩濊3鐐�");
+ if(rg){
+ savefunc();
+ }else{
+ unblockUI();
+ }
+ }else{
+ savefunc();
+ }
+
+}
+//bp2
+// function extendJs() {
+// blockme();
+// extendfunc();
+// }
+function sortTableJs(key) {
+ blockme();
+ sortTablefunc(key);
+}
+//bp2
+// function setDisabled() {
+// var count = j$('input#count_hidden').value();
+// for (var i = 0; i < count; i++) {
+// var canChange = j$(escapeVfId('allPage:allForm:dataBlock:dataline:'+ i + ':canChange')).value();
+// if (canChange == 'false') {
+// j$(escapeVfId('allPage:allForm:dataBlock:dataline:'+ i + ':extend_day')).attr('disabled',true);
+// j$(escapeVfId('allPage:allForm:dataBlock:dataline:'+ i + ':extend_reason')).attr('disabled',true);
+// }
+// }
+// }
+function submitListener(e){
+ var keynum = 0;
+ if (window.event){
+ keynum = window.event.keyCode;
+ }
+ else if (e.which){
+ keynum = e.which;
+ }
+
+ // Here we check whether the Enter button was pressed
+ // if (keynum == 13){
+ // searchJs();
+ // }
+}
+function ShowDetails(argument) {
+ // body...
+ var flgReturn = j$(escapeVfId('allPage:allForm:returnIMFupdate')).value();
+ if(flgReturn == 'None'){
+ j$(escapeVfId('allPage:allForm:returnIMFupdate')).val('Changed');
+ }
+
+}
+var heightAjustment = 120;
+var widthAjustment = 30;
+function windowResize() {
+ blockHeight = j$(window).innerHeight() - j$(escapeVfId('allPage:allForm:searchBlock')).height() - j$(escapeVfId('allPage:allForm:dataBlock:pageBlockButton1')).height() - j$('table#msgtable').height() - heightAjustment;
+ sbwidth = scrollbarWidth();
+ R_width = j$(escapeVfId('allPage:allForm:dataBlock')).width();
+ blockWidth = 745;
+ j$(escapeVfId('allPage:allForm:dataBlock')).css('height', blockHeight + 78 + 'px');
+ j$('div#in_Div_L').css('width', blockWidth+170 + 'px');
+ j$('div#out_Div_L').css('width', blockWidth+170 + 'px');
+ j$('div#in_Div_L').css('height', blockHeight + 'px');
+ //**************************************************************
+ j$('div#in_Div_R').css('width', R_width-blockWidth- 190 + 'px');
+ j$('div#out_Div_R').css('width', R_width-blockWidth-190 + 'px');
+ j$('div#in_Div_R').css('height', blockHeight+ 20 + 'px');
+ var titleHeight_L = j$('div#out_Div_L').height();
+ var titleHeight_R = j$('div#out_Div_R').height();
+ if(titleHeight_L >= titleHeight_R){
+ j$('div#out_Div_R').css('height',(titleHeight_L)+'px');
+ j$('div#out_Div_R').css('margin-top',(-titleHeight_L)+'px');
+ j$('table#table_out_Div_R').css('height',(titleHeight_L)+'px');
+ }else{
+ j$('div#out_Div_L').css('height',titleHeight_R+'px');
+
+ }
+ // j$('div#in_Div_L').css('width', (745) + 'px');
+ // j$('div#in_Div_R').css('width', (770) + 'px');
+ j$('div#in_Div_R').css('margin-top', (-j$('div#in_Div_L').height()) + 'px');
+ var number = j$('table#tableData_L').find('tr').length;
+ if(number>0){
+ for(var i = 0 ; i <number ;i++){
+//bp2 EquipmentSetSRList2銉氥兗銈搞仹銈勩倠
+// j$(escapeVfId('allPage:allForm:dataBlock:dataline_R:'+ i +':received_staff_mlktp')).attr('hidden','hidden');
+ if(j$('tr#tableData_R_'+i).height() > j$('tr#tableData_L_'+i).height()){
+ j$('tr#tableData_L_'+i).css('height',j$('tr#tableData_R_'+i).height());
+ }else{
+ j$('tr#tableData_R_'+i).css('height',j$('tr#tableData_L_'+i).height());
+ }
+
+ }
+ }
+ if (j$('table#tableData_R').height() > j$('div#in_Div_R').height()) {
+ j$('div#in_Div_R').css('width', (R_width-blockWidth-190 + sbwidth) + 'px');
+ } else {
+ j$('div#out_Div_R').css('width', (R_width-blockWidth-190 + sbwidth) + 'px');
+ j$('div#in_Div_R').css('width', (R_width-blockWidth-190 + sbwidth) + 'px');
+ }
+}
+
+function checkAll() {
+ j$(escapeVfId('checker')).prop('disabled', true);
+ var productCount = j$('input#count_hidden').value();
+ //var productCount = j$(escapeVfId('allPage:allForm:allBlock:equipmentSetDetailSection:equipmentSetDetailCnt')).value();
+ if (j$(escapeVfId('checker')).attr('checked') == 'checked') {
+ for (var i = 0; i < productCount; i++) {
+ var disabled = j$(escapeVfId('allPage:allForm:dataBlock:dataline_L:'+ i + ':rowCheck')).prop('disabled');
+ if (disabled == false) {
+ j$(escapeVfId('allPage:allForm:dataBlock:dataline_L:'+ i + ':rowCheck')).attr('checked',true);
+ }
+ }
+ } else {
+ for (var i = 0; i < productCount; i++) {
+ var disabled = j$(escapeVfId('allPage:allForm:dataBlock:dataline_L:'+ i + ':rowCheck')).prop('disabled');
+ if (disabled == false) {
+ j$(escapeVfId('allPage:allForm:dataBlock:dataline_L:'+ i + ':rowCheck')).attr('checked',false);
+ }
+ }
+ }
+ j$(escapeVfId('checker')).prop('disabled', false);
+}
+
+/*bp2 EquipmentSetSRList2銉氥兗銈搞仹銈勩倠
+// onComplete="unblockUI();hiddenBtn();" 銇т娇銇�
+function hiddenBtn(){
+ var cut = j$('input#count_hidden').value();
+ for(var i = 0;i<cut;i++){
+ if( document.getElementById('allPage:allForm:dataBlock:dataline:'+i+':received_staff_mlktp')){
+ document.getElementById('allPage:allForm:dataBlock:dataline:'+i+':received_staff_mlktp').style.display="none";
+ document.getElementById('allPage:allForm:dataBlock:dataline:'+i+':received_staff_mlktp').style.width="75px";
+ document.getElementById('allPage:allForm:dataBlock:dataline:'+i+':received_staff').style.width="75px";
+ }
+ if(document.getElementById('allPage:allForm:dataBlock:dataline:'+i+':Delivery_staff_mlktp')){
+ document.getElementById('allPage:allForm:dataBlock:dataline:'+i+':Delivery_staff_mlktp').style.display="none";
+ document.getElementById('allPage:allForm:dataBlock:dataline:'+i+':Delivery_staff_mlktp').style.width="75px";
+ document.getElementById('allPage:allForm:dataBlock:dataline:'+i+':Delivery_staff').style.width="75px";
+ }
+ }
+}
+window.onload = function hiddenBtninit(){
+ var cut = j$('input#count_hidden').value();
+ for(var i = 0;i<cut;i++){
+ if( document.getElementById('allPage:allForm:dataBlock:dataline:'+i+':received_staff_mlktp')){
+ document.getElementById('allPage:allForm:dataBlock:dataline:'+i+':received_staff_mlktp').style.display="none";
+ document.getElementById('allPage:allForm:dataBlock:dataline:'+i+':received_staff_mlktp').style.width="75px";
+ document.getElementById('allPage:allForm:dataBlock:dataline:'+i+':received_staff').style.width="75px";
+ }
+ if(document.getElementById('allPage:allForm:dataBlock:dataline:'+i+':Delivery_staff_mlktp')){
+ document.getElementById('allPage:allForm:dataBlock:dataline:'+i+':Delivery_staff_mlktp').style.display="none";
+ document.getElementById('allPage:allForm:dataBlock:dataline:'+i+':Delivery_staff_mlktp').style.width="75px";
+ document.getElementById('allPage:allForm:dataBlock:dataline:'+i+':Delivery_staff').style.width="75px";
+ }
+ }
+}
+*/
+window.onresize = windowResize;
+</script>
+ <apex:form id="allForm" onkeyup="submitListener(event);">
+ <apex:actionFunction name="searchfunc" action="{!searchBtn}" rerender="allForm" onComplete="unblockUI();"></apex:actionFunction>
+ <apex:actionFunction name="searchsp1func" action="{!searchsp1Btn}" rerender="allForm" onComplete="unblockUI();"></apex:actionFunction>
+ <apex:actionFunction name="searchsp2func" action="{!searchsp2Btn}" rerender="allForm" onComplete="unblockUI();"></apex:actionFunction>
+ <apex:actionFunction name="searchsp3func" action="{!searchsp3Btn}" rerender="allForm" onComplete="unblockUI();"></apex:actionFunction>
+ <apex:actionFunction name="searchsp4func" action="{!searchsp4Btn}" rerender="allForm" onComplete="unblockUI();"></apex:actionFunction>
+ <apex:actionFunction name="setDatefunc" action="{!setDate}" rerender="allForm" onComplete="unblockUI();"></apex:actionFunction>
+ <apex:actionFunction name="savefunc" action="{!saveBtn}" rerender="allForm" onComplete="unblockUI();"></apex:actionFunction>
+ <!-- 鍒嗛〉鐢� SWAG-B9UBDP start -->
+ <apex:actionFunction name="recordNumChangeAction" action="{!recordNumChange}" rerender="allForm" oncomplete="unblockUI();">
+ </apex:actionFunction>
+ <!-- 鍒嗛〉鐢� SWAG-B9UBDP end -->
+<!-- //bp2
+ <apex:actionFunction name="extendfunc" action="{!extendBtn}" rerender="allForm" onComplete="unblockUI();"></apex:actionFunction>
+-->
+ <apex:actionFunction name="sortTablefunc" action="{!sortTable}" rerender="allForm" onComplete="unblockUI();">
+ <apex:param name="firstParam" assignTo="{!sortKey}" value="" />
+ </apex:actionFunction>
+ <apex:inputHidden value="{!returnIMFupdate}" id="returnIMFupdate" />
+ <apex:pageBlock id="searchBlock" title="妫�绱�">
+ <apex:pageBlockButtons location="top">
+ <table>
+ <tr>
+ <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 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: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>
+ </tr>
+ <tr>
+ <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 style="width:115px" value="{!finalDayFrom.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>
+ <td></td>
+ <!-- 20210628 ljh update SFDC-C4BBFH -->
+ <td style="width:135px" align="center"><!-- <input type="button" value="PDF" onclick="alert('寮�鍙戜腑');" style="width:130px"/> --></td>
+ </tr>
+ </table>
+ </apex:pageBlock>
+ <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;"/>
+ <!-- 鍒嗛〉鐢� SWAG-B9UBDP start -->
+ <table align="right" style="width: 700px;">
+ <tr>
+ <td>{!(currPage-1)*selctRecordNum} - {!IF(currPage*selctRecordNum > totalRecords, totalRecords, currPage*selctRecordNum)}</td>
+ <td> 鍏眥!totalRecords}涓�</td>
+ <td align="right" width="150px">鏄剧ず
+ <apex:selectList value="{!selRecordOption}" id="selRecordOption" size="1" onchange="blockme();recordNumChangeAction();" disabled="{!IF(totalRecords<10,true,false)}"><apex:selectOptions value="{!recordNum}"/></apex:selectList>鏉¤褰�
+ </td>
+ <td align="right" width="55px">绗瑊!currPage}椤�</td>
+ <td align="right" width="45px">
+ <apex:commandLink action="{!firstPage}" value="棣栭〉" id="firstPg" onclick="blockme();" oncomplete="unblockUI();" reRender="allForm" style="{!IF(currPage==1,'display: none;','')}color: blue;"/>
+ <apex:outputText value="棣栭〉" style="{!IF(currPage!=1,'display: none;','')}color: gray;"></apex:outputText>
+ </td>
+ <td align="right" width="55px">
+ <apex:commandLink action="{!previousPage}" value="涓婁竴椤�" id="previous" onclick="blockme();" oncomplete="unblockUI();" reRender="allForm" style="{!IF(currPage==1,'display: none;','')}color: blue;"/>
+ <apex:outputText value="涓婁竴椤�" style="{!IF(currPage!=1,'display: none;','')}color: gray;"></apex:outputText>
+ </td>
+ <td width="3px"></td>
+ <td align="left" width="55px">
+ <!-- HWAG-B4R3SS START 20181026-->
+ <apex:commandLink action="{!nextPage}" value="涓嬩竴椤�" id="next" onclick="blockme();" oncomplete="unblockUI();" reRender="allForm" style="{!IF(totalPage==currPage ||totalPage == 0,'display: none;','')}color: blue;"/>
+ <apex:outputText value="涓嬩竴椤�" style="{!IF(totalPage!=currPage && totalPage != 0,'display: none;','')}color: gray;"></apex:outputText>
+ </td>
+ <td align="left" width="45px">
+ <apex:commandLink action="{!endPage}" value="灏鹃〉" id="endPg" onclick="blockme();" oncomplete="unblockUI();" reRender="allForm" style="{!IF(totalPage==currPage||totalPage == 0,'display: none;','')}color: blue;"/>
+ <apex:outputText value="灏鹃〉" style="{!IF(totalPage!=currPage
+ && totalPage != 0,'display: none;','')}color: gray;"></apex:outputText>
+ </td>
+ <!-- HWAG-B4R3SS END 20181026-->
+ <td align="left">鍏眥!totalPage}椤�</td>
+ </tr>
+ </table>
+ <!-- 鍒嗛〉鐢� SWAG-B9UBDP end -->
+
+ <!-- <input type="button" value="寤堕暱鐢宠" onclick="extendJs();" style="width:80px;background-color:red;height:22px"/> -->
+ </apex:pageBlockButtons>
+ <input type="hidden" id="count_hidden" value="{!raesInfoListSize}"/>
+<!-- <table>
+ <tr>
+ <td style="width:20px"></td>
+ <td style="width:100px" align="right">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Request_extend_day__c.label}</td>
+ <td style="width:100px" align="left"><apex:inputField value="{!finalDayFrom.Request_extend_day__c}"/></td>
+ <td style="width:100px" align="right">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Extend_request_reason__c.label}</td>
+ <td style="width:100px" align="left"><apex:inputField value="{!finalDayFrom.Extend_request_reason__c}"/></td>
+ <td style="width:50px"></td>
+ <td style="width:100px" align="right"><input type="button" value="閫傜敤" onclick="setDatejs();" style="width:80px"/></td>
+ <td style="width:100px" align="left"><input type="button" value="淇濆瓨" onclick="saveJs();" style="width:80px;background-color: red"/></td>
+ </tr>
+ </table> -->
+ <table id="msgtable">
+ <tr>
+ <td>
+ <apex:outputPanel id="message">
+ <apex:pageMessages />
+ </apex:outputPanel>
+ </td>
+ </tr>
+ </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;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;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>
+ <!-- 澶囧搧鍑哄�熸媴褰� -->
+ <td style="width:110px" align="center">{!$ObjectType.Rental_Apply__c.fields.Person_In_Charge__c.label}</td>
+ <!-- 鍖婚櫌鍚� -->
+ <td style="width:100px" align="center">
+ <a href="#" onclick="sortTableJs('4');return false;" style="text-decoration: underline;">{!$ObjectType.Account.fields.Hospital_Name__c.label}</a>銆�{!sortOrder[4]}
+ </td>
+ <td style="width:110px" align="center">{!$ObjectType.Fixture_Set__c.fields.Name.label}</td>
+ <td style="width:100px" align="center">
+ <a href="#" onclick="sortTableJs('3');return false;" style="text-decoration: underline;">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.First_RAESD_Model_No_F__c.label}</a>銆�{!sortOrder[3]}
+ </td>
+
+ <td style="width:85px" align="center">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.SerialNumber_F__c.label}</td>
+ <td style="width:85px" align="center">璁板綍绫诲瀷</td>
+ </tr>
+ </table>
+ </div>
+ <div id="out_Div_R" >
+ <table class="list" border="1" style="border-collapse: collapse;table-layout:fixed;border-bottom-width: 0px;border-spacing:0;width:660px;" id="table_out_Div_R">
+ <tr style="background-color:#DCDCDC;" class="headerRow">
+
+ <td style="width:85px" align="center">
+ <a href="#" onclick="sortTableJs('6');return false;" style="text-decoration: underline;">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Demo_purpose1__c.label}</a>銆�{!sortOrder[6]}
+ </td>
+ <td style="width:90px" align="center">
+ <a href="#" onclick="sortTableJs('2');return false;" style="text-decoration: underline;">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Demo_purpose2__c.label}</a>銆�{!sortOrder[2]}
+ </td>
+
+
+ <td style="width:100px" align="center">{!$ObjectType.Fixture_Set__c.fields.Loaner_name__c.label}</td>
+
+
+ <td style="width:164px" align="center">闄勫睘鍝佹槑缁�</td>
+
+
+ <!-- <td style="width:80px" align="center">{!$ObjectType.Rental_Apply__c.fields.Rental_Start_Date__c.label}</td>
+ <td style="width:80px" align="center">{!$ObjectType.Rental_Apply__c.fields.Rental_End_Date__c.label}</td> -->
+<!-- *************************insert 20160720 澧炲姞鍙戣揣淇℃伅 瓒欏境鑺� End*************************** -->
+ <td style="width:120px" align="center">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Received_Confirm__c.label}</td>
+ <td style="width:140px" align="center">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Received_ng_detail__c.label}</td>
+
+ <td style="width:80px" align="center">
+ <a href="#" onclick="sortTableJs('5');return false;" style="text-decoration: underline;">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Final_reply_day__c.label}</a>銆�{!sortOrder[5]}
+ </td>
+ <td style="width:80px" align="center">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Bollow_Date__c.label}</td>
+ <td style="width:80px" align="center">杩濊鐞嗙敱</td>
+<!-- *************************Delete 20160602 No.153 瓒欏境鑺� Start************************* -->
+ <!-- <td style="width:90px" align="center">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Request_extend_day__c.label}</td> -->
+ <!-- <td style="width:140px" align="center">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Extend_request_reason__c.label}</td> -->
+<!-- *************************Delete 20160602 No.153 瓒欏境鑺� End*************************** -->
+<!-- //bp2 EquipmentSetSRList2銉氥兗銈搞仹銈勩倠 <td style="width:80px" align="center">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Return_delivery_company2__c.label}</td>
+ <td style="width:80px" align="center">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Return_Fedex_number2__c.label}</td>
+ <td style="width:80px" align="center">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Return_Distributor_method2__c.label}</td>
+ <td style="width:195px" align="center">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Received_confirmation_staff2__c.label}</td>
+-->
+ <!-- *************************insert 20160720 澧炲姞鍙戣揣淇℃伅 瓒欏境鑺� Start************************* -->
+ <!-- <td style="width:110px" align="center"> -->
+ <!-- <a href="#" onclick="sortTableJs('7');return false;" style="text-decoration: underline;">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Bollow_Date__c.label}</a>銆�{!sortOrder[7]} -->
+ <!-- </td> -->
+ <!-- 鍙戣揣杩愯緭鍗� -->
+ <td style="width:110px" align="center">
+ <a href="#" onclick="sortTableJs('7');return false;" style="text-decoration: underline;">{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.DeliverySlip__c.label}</a>銆�{!sortOrder[7]}
+ </td>
+ <!-- 鍥炲瘎杩愯緭鍗� -->
+ <td style="width:110px" align="center">
+ <a href="#" onclick="sortTableJs('7');return false;" style="text-decoration: underline;">{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Return_DeliverySlip__c.label}</a>銆�{!sortOrder[7]}
+ </td>
+<!-- //bp2
+ <td style="width:110px" align="center">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.delivery_company__c.label}</td>
+ <td style="width:80px" align="center">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Fedex_number__c.label}</td>
+ <td style="width:110px" align="center">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Distributor_method__c.label}</td>
+ <td style="width:100px" align="center">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Return_to_wh_staff__c.label}</td>
+-->
+ </tr>
+ </table>
+ </div>
+ <div id="in_Div_L" style="overflow:hidden">
+ <table class="list" border="1" style="border-collapse: collapse;table-layout:fixed;border-bottom-width: 0px;border-spacing:0;width:915px;" id="tableData_L">
+ <apex:variable value="{!0}" var="Cnt" />
+ <apex:repeat id="dataline_L" value="{!raesInfoListList[currPage-1]}" var="info">
+ <tr class="dataRow" id="tableData_L_{!Cnt}" onmouseover="if (window.hiOn){hiOn(this);} " onmouseout="if (window.hiOff){hiOff(this);} " onblur="if (window.hiOff){hiOff(this);}" onfocus="if (window.hiOn){hiOn(this);}">
+ <td class="dataCellBorder1" style="width:20px" align="center"><apex:inputCheckbox value="{!info.check}" id="rowCheck" disabled="{!!info.canChange}"/><apex:inputHidden id="canChange" value="{!info.canChange}"/></td>
+ <td class="dataCellBorder1 td{!info.status}" style="width:110px;" align="left"><apex:outputField value="{!info.raes.Rental_Apply__c}"/></td>
+
+ <td class="dataCellBorder1" style="width:60px" align="left"><apex:outputField value="{!info.raes.RAES_Status__c}"/></td>
+ <td class="dataCellBorder1" align="left" style="width:110px"><apex:outputText value="{!info.rentalPerson}"/></td>
+ <td class="dataCellBorder1" align="left" style="width:100px"><apex:outputText value="{!info.hpName}"/></td>
+ <td class="dataCellBorder1" style="width:110px" align="left"><apex:outputField value="{!info.raes.Fixture_Set__c}"/></td>
+
+ <td class="dataCellBorder1" style="width:100px" align="left"><apex:outputText value="{!info.esCode}"/></td>
+ <td class="dataCellBorder1" style="width:85px" align="left"><apex:outputText value="{!info.serialNumber}"/></td>
+ <td class="dataCellBorder1" style="width:85px" align="left"><apex:outputText value="{!info.recordTypeName}"/></td>
+ </tr>
+ <apex:variable value="{!Cnt+1}" var="Cnt" />
+ </apex:repeat>
+ </table>
+ </div>
+ <div id="in_Div_R" style="overflow:auto;">
+ <table class="list" border="1" style="border-collapse: collapse;table-layout:fixed;border-bottom-width: 0px;border-spacing:0;width:660px;" id="tableData_R">
+ <apex:variable value="{!0}" var="Cnt_R" />
+ <apex:repeat id="dataline_R" value="{!raesInfoListList[currPage-1]}" var="info">
+ <tr id="tableData_R_{!Cnt_R}" class="dataRow" onmouseover="if (window.hiOn){hiOn(this);} " onmouseout="if (window.hiOff){hiOff(this);} " onblur="if (window.hiOff){hiOff(this);}" onfocus="if (window.hiOn){hiOn(this);}" >
+
+ <td class="dataCellBorder1" style="width:85px" align="left"><apex:outputField value="{!info.raes.Demo_purpose1__c}"/></td>
+ <td class="dataCellBorder1" style="width:90px" align="left"><apex:outputField value="{!info.raes.Demo_purpose2__c}"/></td>
+ <td class="dataCellBorder1" style="width:100px" align="left"><apex:outputText value="{!info.esName}"/></td>
+
+
+ <!-- <td class="dataCellBorder1" style="width:80px" align="left"><apex:outputField value="{!info.raes.Rental_Apply__r.Rental_Start_Date__c}"/></td>
+ <td class="dataCellBorder1" style="width:80px" align="left"><apex:outputField value="{!info.raes.Rental_Apply__r.Rental_End_Date__c}"/></td> -->
+
+
+ <td class="dataCellBorder1" style="width:164px" align="left"><apex:outputText value="{!info.DetailsLine}"/></td>
+ <td class="dataCellBorder1" style="width:120px" align="left">
+ <apex:inputField rendered="{!IF(((info.raes.Received_Confirm__c=='榛樿绛炬敹-OK'&&isStockUser)||info.raes.Received_Confirm__c!='榛樿绛炬敹-OK') && info.raes.Wei_loaner_arranged__c = 0,true,false)}" value="{!info.raes.Received_Confirm__c}"/>
+ <apex:outputField rendered="{!IF((info.raes.Received_Confirm__c=='榛樿绛炬敹-OK'&&isStockUser==false) || info.raes.Wei_loaner_arranged__c > 0,true,false)}" value="{!info.raes.Received_Confirm__c}"/>
+ </td>
+ <td class="dataCellBorder1" style="width:140px" align="left">
+ <apex:inputField style="width:95%" rendered="{!IF(((info.raes.Received_Confirm__c=='榛樿绛炬敹-OK'&&isStockUser)||info.raes.Received_Confirm__c!='榛樿绛炬敹-OK') && info.raes.Wei_loaner_arranged__c = 0,true,false)}" value="{!info.raes.Received_ng_detail__c}"/>
+ <apex:outputField style="width:95%" rendered="{!IF((info.raes.Received_Confirm__c=='榛樿绛炬敹-OK'&&isStockUser==false) || info.raes.Wei_loaner_arranged__c > 0,true,false)}" value="{!info.raes.Received_ng_detail__c}"/>
+ <!-- <apex:inputField value="{!info.raes.Received_ng_detail__c}" style="width:95%"/> -->
+ </td>
+
+ <td class="dataCellBorder1" style="width:80px" align="left"><apex:outputField value="{!info.raes.Final_reply_day__c}"/></td>
+ <td class="dataCellBorder1" style="width:80px" align="left"><apex:outputField value="{!info.raes.Bollow_Date__c}"/></td>
+ <td class="dataCellBorder1" style="width:80px" align="left"><apex:outputText value="{!info.FoulReasonStr}"/></td>
+<!-- *************************Delete 20160602 No.153 瓒欏境鑺� Start************************* -->
+ <!-- <td class="dataCellBorder1" style="width:90px" align="left"><apex:inputField id="extend_day" value="{!info.raes.Request_extend_day__c}"/></td> -->
+ <!-- <td class="dataCellBorder1" style="width:140px" align="left"><apex:inputField id="extend_reason" value="{!info.raes.Extend_request_reason__c}" style="width:95%"/></td> -->
+<!-- *************************Delete 20160602 No.153 瓒欏境鑺� End*************************** -->
+<!-- //bp2 EquipmentSetSRList2銉氥兗銈搞仹銈勩倠
+ <td class="dataCellBorder1" style="width:80px" align="left"><apex:inputField onchange="ShowDetails(this)" id="return_company" value="{!info.raes.Return_delivery_company2__c}" /></td>
+ <td class="dataCellBorder1" style="width:80px" align="left"><apex:inputField onchange="ShowDetails(this)" id="return_Fedex" value="{!info.raes.Return_Fedex_number2__c}" style="width:95%"/></td>
+ <td class="dataCellBorder1" style="width:80px" align="left"><apex:inputField onchange="ShowDetails(this)" id="return_method" value="{!info.raes.Return_Distributor_method2__c}"/></td>
+ <td class="dataCellBorder1" style="width:200px" align="left"><apex:inputField id="received_staff" value="{!info.raes.Received_confirmation_staff2__c}" style="width:75%"/></td>
+ -->
+ <script type="text/javascript">
+
+ </script>
+ <!-- <td class="dataCellBorder1" style="width:110px" align="left"><apex:outputField value="{!info.raes.Bollow_Date__c}"/></td> -->
+ <td class="dataCellBorder1" style="width:110px" align="left"><apex:outputField value="{!info.raes.First_RAESD__r.DeliverySlip__c}"/></td>
+ <td class="dataCellBorder1" style="width:110px" align="left"><apex:outputField value="{!info.raes.First_RAESD__r.Return_DeliverySlip__c}"/></td>
+<!-- //bp2
+ <td class="dataCellBorder1" style="width:110px" align="left"><apex:outputField id="Delivery_company" value="{!info.raes.delivery_company__c}" style="width:95%"/></td>
+ <td class="dataCellBorder1" style="width:80px" align="left"><apex:outputField id="Delivery_Fedex" value="{!info.raes.Fedex_number__c}" style="width:95%"/></td>
+ <td class="dataCellBorder1" style="width:110px" align="left"><apex:outputField id="Delivery_method" value="{!info.raes.Distributor_method__c}" style="width:95%"/></td>
+ <td class="dataCellBorder1" style="width:100px" align="left"><apex:outputField id="Delivery_staff" value="{!info.raes.Return_to_wh_staff__c}" style="width:75%"/></td>
+-->
+ </tr>
+ <apex:variable value="{!Cnt_R+1}" var="Cnt_R" />
+ </apex:repeat>
+ </table>
+ </div>
+ <script>
+ j$('div#in_Div_R').scroll(function() {
+ j$('div#out_Div_R').scrollLeft(j$(this).scrollLeft());
+ });
+ j$('div#in_Div_R').scroll(function() {
+ j$('div#in_Div_L').scrollTop(j$(this).scrollTop());
+ });
+//bp2 setDisabled();
+ windowResize();
+ </script>
+ </apex:pageBlock>
+ </apex:form>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/EquipmentRentalExtend.page-meta.xml b/force-app/main/default/pages/EquipmentRentalExtend.page-meta.xml
new file mode 100644
index 0000000..61a2f16
--- /dev/null
+++ b/force-app/main/default/pages/EquipmentRentalExtend.page-meta.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
+ <apiVersion>40.0</apiVersion>
+ <availableInTouch>false</availableInTouch>
+ <confirmationTokenRequired>false</confirmationTokenRequired>
+ <label>EquipmentRentalExtend</label>
+</ApexPage>
--
Gitblit v1.9.1