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/InventoryReport.page | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/force-app/main/default/pages/InventoryReport.page b/force-app/main/default/pages/InventoryReport.page
index 327adb1..1eaa4cd 100644
--- a/force-app/main/default/pages/InventoryReport.page
+++ b/force-app/main/default/pages/InventoryReport.page
@@ -1,4 +1,4 @@
-<apex:page extensions="InventoryReportController" standardController="Inventory_Header__c" showHeader="false" sidebar="false" id="allPage" action="{!init}" tabStyle="CheckAllOlympusAsset__tab" applyHtmlTag="false">
+<apex:page extensions="InventoryReportController" standardController="Inventory_Header__c" showHeader="false" sidebar="false" id="allPage" action="{!init}" tabStyle="CheckAllOlympusAsset__tab" applyHtmlTag="false" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
@@ -116,12 +116,16 @@
padding: 5px;
}
.tdStyle-left {
- width: 16%;
+ /*20220419 ljh HWAG-CAV5WX update */
+ /*width: 16%;*/
+ width: 11%;
padding: 5px;
text-align: left;
}
.tdStyle-right {
- width: 16%;
+ /*20220419 ljh HWAG-CAV5WX update */
+ /*width: 16%;*/
+ width: 22%;
padding: 5px;
text-align: right;
}
@@ -392,15 +396,15 @@
</table>
<table class="inventoryReportTable" width="100%">
<tr>
- <td class="tdStyle-right">缁忕悊锛堝鎵癸級锛�</td>
+ <td class="tdStyle-right">CL6 缁忕悊绾э紙瀹℃壒锛夛細</td>
<td class="tdStyle-left">
<apex:outputText id="ivconfirmJingli" value="{!ihObj.Jingli_Equipment__r.Name}" />
</td>
- <td class="tdStyle-right">閮ㄩ暱锛堝鎵癸級锛�</td>
+ <td class="tdStyle-right">CL5 鎬荤洃绾э紙瀹℃壒锛夛細</td>
<td class="tdStyle-left">
<apex:outputText id="ivconfirmBuzhang" value="{!ihObj.Buzhang_Equipment__r.Name}" />
</td>
- <td class="tdStyle-right">鎬荤洃锛堝鎵癸級锛�</td>
+ <td class="tdStyle-right">CL4 楂樼骇鎬荤洃锛堝鎵癸級锛�</td>
<td class="tdStyle-left">
<apex:outputText id="ivconfirmZongjian" value="{!ihObj.Zongjian_Equipment__r.Name}" />
</td>
--
Gitblit v1.9.1