From fd0df4a06ee76d161a39c8f2d6cede15a0915391 Mon Sep 17 00:00:00 2001
From: LiJinHuan <lijinhuan@prec-tech.com>
Date: 星期二, 23 五月 2023 12:12:35 +0800
Subject: [PATCH] 备品出借选择配套明细
---
force-app/main/default/pages/RentalFixtureSetDetilSelect.page | 77 +++++++++++++++++++++-----------------
force-app/main/default/staticresources/RentalFixtureSetDetilSelectCss.css | 11 ++++-
2 files changed, 52 insertions(+), 36 deletions(-)
diff --git a/force-app/main/default/pages/RentalFixtureSetDetilSelect.page b/force-app/main/default/pages/RentalFixtureSetDetilSelect.page
index 3a79f75..9d0e3ab 100644
--- a/force-app/main/default/pages/RentalFixtureSetDetilSelect.page
+++ b/force-app/main/default/pages/RentalFixtureSetDetilSelect.page
@@ -7,7 +7,11 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
-
+<!-- 20230511 ljh lightning start -->
+<style type="text/css">
+ table.list td input[type="text"]{width:55%;}
+</style>
+<!-- 20230511 ljh lightning end -->
<script type="text/javascript">
var heightAjustment = 120;
var widthAjustment = 30;
@@ -25,41 +29,46 @@
</apex:actionFunction>
<apex:outputPanel id="pageallPanel">
<apex:pageBlock id="searchBlock" tabStyle="Report">
- <apex:pageBlockButtons location="bottom">
- <!--20230425 zq lightning涓嬩慨鏀规牱寮� <apex:commandButton style="float:left;" action="{!save}" value="纰哄畾" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" />
- <apex:commandButton style="float:right;" value="杩斿洖涓婁竴绾�" action="{!goBack}"/>
- -->
-
- <apex:commandButton action="{!save}" value="纰哄畾" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" />
- <apex:commandButton style="float:right;margin: 0 10px;" value="杩斿洖涓婁竴绾�" action="{!goBack}"/>
+ <!-- 20230522 ljh lightning start -->
+ <!-- <apex:pageBlockButtons location="bottom">
+ <apex:commandButton style="float:left;" action="{!save}" value="纰哄畾" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" />
+ <apex:commandButton style="float:right;" value="杩斿洖涓婁竴绾�" action="{!goBack}"/>
<apex:commandButton style="float:right;" value="杩斿洖鐢宠鍗�" action="{!cancel}"/>
- </apex:pageBlockButtons>
+ </apex:pageBlockButtons>
+ <div style="clear:both;"></div> -->
+ <!-- 20230522 ljh lightning end -->
+ <table>
+ <tr>
+ <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Name.label}</td>
+ <td colspan="3"><apex:outputText value="{!parentObj.Name}" style="width:100px"/></td>
+ </tr>
+ <tr>
+ <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Fixture_Set_Idx__c.label}</td>
+ <td colspan="3"><apex:outputText value="{!parentObj.Fixture_Set_Idx__c}" style="width:100px"/></td>
+ </tr>
+ <tr>
+ <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Loaner_name_F__c.label}</td>
+ <td colspan="3"><apex:outputText value="{!parentObj.Loaner_name_F__c}" style="width:100px"/></td>
+ </tr>
+<!-- <tr>
+ <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Loaner_code__c.label}</td>
+ <td colspan="3"><apex:outputText value="{!parentObj.Loaner_code__c}" style="width:100px"/></td>
+ </tr> -->
+ <!-- <tr>
+ <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Rental_Num__c.label}</td>
+ <td colspan="3"><apex:outputText value="{!parentObj.Rental_Num__c}" style="width:100px"/></td>
+ </tr> -->
+<!--TODO 鍚屼竴闄勫睘鍝侊細銉� -->
+
+ </table>
+ <!-- 20230522 ljh lightning start -->
+ <div style="width:50%;float:right;">
+ <apex:commandButton style="float:left;" action="{!save}" value="纰哄畾" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" />
+ <apex:commandButton style="float:right;" value="杩斿洖涓婁竴绾�" action="{!goBack}"/>
+ <apex:commandButton style="float:right;" value="杩斿洖鐢宠鍗�" action="{!cancel}"/>
<div style="clear:both;"></div>
-
- <table>
- <tr>
- <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Name.label}</td>
- <td colspan="3"><apex:outputText value="{!parentObj.Name}" style="width:100px"/></td>
- </tr>
- <tr>
- <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Fixture_Set_Idx__c.label}</td>
- <td colspan="3"><apex:outputText value="{!parentObj.Fixture_Set_Idx__c}" style="width:100px"/></td>
- </tr>
- <tr>
- <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Loaner_name_F__c.label}</td>
- <td colspan="3"><apex:outputText value="{!parentObj.Loaner_name_F__c}" style="width:100px"/></td>
- </tr>
- <!-- <tr>
- <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Loaner_code__c.label}</td>
- <td colspan="3"><apex:outputText value="{!parentObj.Loaner_code__c}" style="width:100px"/></td>
- </tr> -->
- <!-- <tr>
- <td colspan="2">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Rental_Num__c.label}</td>
- <td colspan="3"><apex:outputText value="{!parentObj.Rental_Num__c}" style="width:100px"/></td>
- </tr> -->
- <!--TODO 鍚屼竴闄勫睘鍝侊細銉� -->
-
- </table>
+ </div>
+ <!-- 20230522 ljh lightning end -->
</apex:pageBlock>
<c:RelationListPagingCmp id="cmpid" pgController="{!this}" hasCheckbox="false" noSort="true"/>
</apex:outputPanel>
diff --git a/force-app/main/default/staticresources/RentalFixtureSetDetilSelectCss.css b/force-app/main/default/staticresources/RentalFixtureSetDetilSelectCss.css
index ec0a9bc..db8e787 100644
--- a/force-app/main/default/staticresources/RentalFixtureSetDetilSelectCss.css
+++ b/force-app/main/default/staticresources/RentalFixtureSetDetilSelectCss.css
@@ -5,7 +5,14 @@
table.list .col_Is_Optional__c {width:59px;}
table.list .col_Quantity__c {width:49px;}
table.list .col_Is_OneToOne__c {width:49px;}
-table.list .col_Rental_Num__c {width:98px;}
+/* 20230517 ljh lightning start */
+/* table.list .col_Rental_Num__c {width:98px;} */
+table.list .col_Rental_Num__c {width:150px;}
+/* 20230517 ljh lightning end */
table.list .col_Rental_Num__c input {width:55%;}
table.list .col_Fixture_Set_Detail__r_Fixture_Model_No_F__c {width:280px;}
-table.list .col_Fixture_Set_Detail__r_Name_CHN__c {width:230px;}
\ No newline at end of file
+table.list .col_Fixture_Set_Detail__r_Name_CHN__c {width:230px;}
+
+/* 20230517 ljh lightning start */
+table.list .col_IndexFromUniqueKey_Text__c {width:70px;}
+/* 20230517 ljh lightning end */
\ No newline at end of file
--
Gitblit v1.9.1