From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/EquipmentRentalExtend.page | 49 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 32 insertions(+), 17 deletions(-)
diff --git a/force-app/main/default/pages/EquipmentRentalExtend.page b/force-app/main/default/pages/EquipmentRentalExtend.page
index ff3ba4f..f1b3099 100644
--- a/force-app/main/default/pages/EquipmentRentalExtend.page
+++ b/force-app/main/default/pages/EquipmentRentalExtend.page
@@ -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)}"/>
@@ -165,7 +165,8 @@
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;
+ blockWidth = 745; //2023-02-24 zyh 娉ㄩ噴
+ // blockWidth = 1075; //2023-02-24 zyh add
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');
@@ -392,29 +393,35 @@
<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">
- <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>
+ <!-- 2023-02-24 zyh add start -->
+ <td style="width:110px" align="center">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Final_reply_day__c.label}</td>
+ <td style="width:110px" align="center">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.RC_return_to_office__c.label}</td>
+ <td style="width:110px" align="center">{!$ObjectType.Rental_Apply__c.fields.Cross_Region_AssignYN__c.label}</td>
+ <!-- 2023-02-24 zyh add end -->
+ <td style="width:60px" 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>
</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">
-
+ <!-- 2023-02-27 zyh add 璋冩暣椤哄簭 start -->
+ <!-- 澶囧搧鍑哄�熸媴褰� -->
+ <td style="width:110px" align="center">{!$ObjectType.Rental_Apply__c.fields.Person_In_Charge__c.label}</td>
+ <td style="width:110px" align="center">{!$ObjectType.Fixture_Set__c.fields.Name.label}</td>
+ <td style="width:85px" align="center">璁板綍绫诲瀷</td>
+ <!-- 2023-02-27 zyh add 璋冩暣椤哄簭 end -->
<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>
@@ -435,9 +442,9 @@
<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">
+ <!-- <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> --><!-- 2023-02-24 zyh 娉ㄩ噴 -->
<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************************* -->
@@ -478,14 +485,16 @@
<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>
+ <!-- 2023-02-24 zyh add start -->
+ <td class="dataCellBorder1" style="width:110px;" align="left"><apex:outputField value="{!info.raes.Final_reply_day__c}"/></td>
+ <td class="dataCellBorder1" style="width:110px;" align="left"><apex:outputField value="{!info.raes.RC_return_to_office__c}"/></td>
+ <td class="dataCellBorder1" style="width:110px;" align="left"><apex:outputField value="{!info.raes.Rental_Apply__r.Cross_Region_AssignYN__c}"/></td>
+ <!-- 2023-02-24 zyh add end -->
+ <td class="dataCellBorder1" style="width:60px" align="left"><apex:outputField value="{!info.raes.RAES_Status__c}"/></td>
</tr>
<apex:variable value="{!Cnt+1}" var="Cnt" />
</apex:repeat>
@@ -496,7 +505,13 @@
<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);}" >
+ <!-- 2023-02-27 zyh add 璋冩暣椤哄簭 start -->
+ <td class="dataCellBorder1" align="left" style="width:110px"><apex:outputText value="{!info.rentalPerson}"/></td>
+
+ <td class="dataCellBorder1" style="width:110px" align="left"><apex:outputField value="{!info.raes.Fixture_Set__c}"/></td>
+ <td class="dataCellBorder1" style="width:85px" align="left"><apex:outputText value="{!info.recordTypeName}"/></td>
+ <!-- 2023-02-27 zyh add 璋冩暣椤哄簭 end -->
<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>
@@ -517,7 +532,7 @@
<!-- <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.Final_reply_day__c}"/></td> --><!-- 2023-02-24 zyh 娉ㄩ噴 -->
<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************************* -->
--
Gitblit v1.9.1