From b37242ad5f2a81065eba0b176b38de4dd93ac8d6 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@prec-tech.com>
Date: 星期一, 10 七月 2023 15:48:46 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/pages/RentalFixtureSetDetilSelect.page | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/pages/RentalFixtureSetDetilSelect.page b/force-app/main/default/pages/RentalFixtureSetDetilSelect.page
index 85c4a1f..059c3b5 100644
--- a/force-app/main/default/pages/RentalFixtureSetDetilSelect.page
+++ b/force-app/main/default/pages/RentalFixtureSetDetilSelect.page
@@ -40,16 +40,16 @@
<!-- 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>
+ <td style="text-align:right;">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Name.label}锛�</td>
+ <td style="text-align:left;"><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>
+ <td style="text-align:right;">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Fixture_Set_Idx__c.label}锛�</td>
+ <td style="text-align:left;"><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>
+ <td style="text-align:right;">{!$ObjectType.Rental_Apply_Equipment_Set__c.fields.Loaner_name_F__c.label}锛�</td>
+ <td style="text-align:left;"><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>
--
Gitblit v1.9.1