From 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期三, 23 八月 2023 14:54:59 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/pages/TransferShippmentReceived3.page | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/pages/TransferShippmentReceived3.page b/force-app/main/default/pages/TransferShippmentReceived3.page
index be79f41..33a4d82 100644
--- a/force-app/main/default/pages/TransferShippmentReceived3.page
+++ b/force-app/main/default/pages/TransferShippmentReceived3.page
@@ -109,7 +109,8 @@
/* width: 308px; *//* 20230718 ljh */
text-align: left;
margin: 0;
- background:#95aee5;
+ background:#DCDCDC;
+ /* background:#95aee5; */
border-radius:8px 8px 0 0;
padding-left: 0.75rem;/*20230628 ljh*/
}
@@ -209,6 +210,9 @@
.errorMsg{
width: 140px;
}
+ .mytable tr{
+ height: 35px;
+ }
/*20230625 ljh */
</style>
<div id="myModal" class="modal">
@@ -281,7 +285,7 @@
</th>
</tr>
</table>
- <table style="border-collapse: collapse; font-size:13px;" width="80%">
+ <table style="border-collapse: collapse; font-size:13px;" width="80%" class="mytable">
<apex:outputPanel layout="none" rendered="{!IF(Step_status='鏄庣粏', true, false)}" id="slipPanel">
<tr>
<td colspan="2"><apex:outputPanel layout="none" rendered="{!IF(slip.Id=null, true, false)}"><span style="margin-left:30px;font-weight: bold;font-size: 15px;">鏂板缓</span></apex:outputPanel><apex:outputPanel layout="none" rendered="{!IF(slip.Id=null, false, true)}"><span style="margin-left:30px;font-weight: bold;">缂栬緫锛歔{!slip.DeliveryCompany_SlipNo__c}]</span></apex:outputPanel></td>
@@ -374,7 +378,8 @@
<!-- 20230423 ljh lightning 鍗囩骇 end -->
<input type="hidden" value="{!esdInfo.rec.TransferApply__r.Pre_inspection_ng_num__c}" data-ngnum="{!esdInfo.rec.TransferApply__c}"/>
<apex:outputPanel layout="none" rendered="{!esdInfo.inspectionFinished}">
- <apex:inputCheckbox value="{!esdInfo.isChecked}"/><input type="hidden" value="{!esdInfo.rec.TransferApplySummary__c}"/><input type="hidden" value="{!esdInfo.rec.TransferApply__c}"/>
+ <!-- 20230721 ljh -->
+ <apex:inputCheckbox value="{!esdInfo.isChecked}" style="margin:0 0 0 0.75rem;"/><input type="hidden" value="{!esdInfo.rec.TransferApplySummary__c}"/><input type="hidden" value="{!esdInfo.rec.TransferApply__c}"/>
</apex:outputPanel>
<!-- 20230423 ljh lightning 鍗囩骇 start -->
<!-- <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3> -->
@@ -383,6 +388,9 @@
</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>
<!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
<!-- 20230718 ljh -->
@@ -400,10 +408,12 @@
<li><span>涓婃鍥炴敹鍚庢娴嬫椂闂达細 </span>
<span><apex:outputField rendered="{!IF(esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__c==null, false, true)}" value="{!esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span>
</li>
- <li>
+ <!-- 2023-08-02 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
+ <!-- <li>
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__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 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
</ul>
</div>
</apex:outputPanel>
@@ -443,7 +453,11 @@
</h2>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}">
- <h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" /> </div>
+ <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>
</apex:outputPanel>
<!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
@@ -462,10 +476,12 @@
<li><span>涓婃鍥炴敹鍚庢娴嬫椂闂达細 </span>
<span><apex:outputField rendered="{!IF(esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__c==null, false, true)}" value="{!esdInfo.rec.Asset__r.Pre_Reserve_TAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span>
</li>
- <li>
+ <!-- 2023-08-02 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
+ <!-- <li>
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__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 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
</ul>
</div>
</apex:outputPanel>
--
Gitblit v1.9.1