From 8608db1542a909c147574767fd22dc1fedf2ddc9 Mon Sep 17 00:00:00 2001
From: 张宇恒 <bxyun0@163.com>
Date: 星期二, 08 八月 2023 18:09:15 +0800
Subject: [PATCH] 换颜色,机身编码换地方
---
force-app/main/default/pages/TransferShippmentReceived1.page | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/pages/TransferShippmentReceived1.page b/force-app/main/default/pages/TransferShippmentReceived1.page
index 7c90307..30f73f1 100644
--- a/force-app/main/default/pages/TransferShippmentReceived1.page
+++ b/force-app/main/default/pages/TransferShippmentReceived1.page
@@ -283,6 +283,10 @@
</apex:outputPanel>
<div class="menu">
<h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />
+ <!-- 2023-08-02 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+ <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)</span>
+ <!-- 2023-08-02 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+
</div></h2>
<ul style="padding: 1px 0.75rem;{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
<apex:outputPanel layout="none" rendered="{!IF(Step_status='涓嬫灦', true, false)}">
@@ -313,10 +317,12 @@
<span><apex:outputField value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;width:75px;"/></span>
</li>
<!-- 20230718 ljh 鎹㈠埌涓嬫灦纭涓嬮潰-->
- <li>
+ <!-- 2023-08-02 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+ <!-- <li>
<span>{!$ObjectType.TransferApplyDetail__c.fields.SerialNumber_F__c.label}锛� </span>
<span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/></span>
- </li>
+ </li> -->
+ <!-- 2023-08-02 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
<li>
<span>涓婃鍥炴敹鍚庢娴嬫椂闂达細 </span>
<span><apex:outputField value="{!esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span>
--
Gitblit v1.9.1