From e15f4679a2b71a186aa9e87cd49b4ab9c249cc63 Mon Sep 17 00:00:00 2001
From: 张宇恒 <bxyun0@163.com>
Date: 星期二, 08 八月 2023 18:20:47 +0800
Subject: [PATCH] 新品收货样式、颜色、显示margin
---
force-app/main/default/pages/EquipmentSetShippmentReceived4.page | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived4.page b/force-app/main/default/pages/EquipmentSetShippmentReceived4.page
index 6b0d3a3..79129ed 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived4.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived4.page
@@ -469,7 +469,8 @@
/*width: 308px;*//*20230620 ljh */
text-align: left;
margin: 0;
- background:#95aee5;
+ background:#DCDCDC;
+ /* background:#95aee5; */
/*height: 42px;*/
padding-left: 0.75rem;/*20230721 ljh */
}
@@ -529,7 +530,8 @@
/*20230620 ljh end*/
div.rtop, div.rbottom {display:block; background: transparent; font-size:1px;}
div.rtopg div {background:#DCDCDC;}
- div.rtop div {background:#95aee5;}
+ div.rtop div {background:#DCDCDC;}
+ /* div.rtop div {background:#95aee5;} */
div.r1, div.r2, div.r3, div.r4 {display:block; overflow:hidden;}
div.r1, div.r2, div.r3 {height:1px;}
div.r2, div.r3, div.r4 {border-left:1px solid silver; border-right:1px solid silver;}
@@ -806,6 +808,9 @@
<apex:outputPanel layout="none" rendered="{!esdInfo.rec.Return_DeliverySlip__c == null && esdInfo.rec.Lost_item_giveup__c == false && esdInfo.rec.Check_lost_Item_F__c != '娑堣��'}">
<input disabled="disabled" type="checkbox" data-resid="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}" name="raesdCheck" value="{!esdInfo.rec.Id}" data-lost="{!esdInfo.rec.Check_lost_Item_Final__c == '娆犲搧' || esdInfo.rec.Check_lost_Item__c == '娆犲搧'}" style="float: right;"/>
</apex:outputPanel>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+ <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)</span>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
</div></h2>
<!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
<!-- 20230721 ljh -->
@@ -818,10 +823,12 @@
<span><apex:outputField value="{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Received_ng_detail__c}" style="margin:3px;width:150px" /></span>
</li>
</apex:outputPanel>
- <li>
+ <!-- 2023-08-01 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-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
<li>
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.NoItemReturn__c.label}锛� </span>
<!-- 20230621 ljh start-->
@@ -886,11 +893,23 @@
<div class="menu">
<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}">
<h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />
- <!-- <apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="鍒犻櫎" rerender="dummy"/><input type="hidden" value="{!esdInfo.rec.Id}"/> --></div>
+ <!-- <apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="鍒犻櫎" rerender="dummy"/><input type="hidden" value="{!esdInfo.rec.Id}"/> -->
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+ <span>
+ (<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)
+ </span>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+ </div>
</h2>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!esdInfo.hasSended}">
- <h2><div class="m_titleg"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" /> <!-- <apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="鍒犻櫎" rerender="dummy"/><input type="hidden" value="{!esdInfo.rec.Id}"/>宸插洖鏀� --></div>
+ <h2><div class="m_titleg"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" /> <!-- <apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="鍒犻櫎" rerender="dummy"/><input type="hidden" value="{!esdInfo.rec.Id}"/>宸插洖鏀� -->
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+ <span>
+ (<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)
+ </span>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
+ </div>
</h2>
</apex:outputPanel>
<!-- 20230620 ljh 娆犲搧 -------------- -->
@@ -1031,12 +1050,14 @@
</apex:outputPanel>
</li>
</apex:outputPanel>
- <li>
+ <!-- 2023-08-01 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-01 zyh 鏈鸿韩缂栫爜鎹綅缃� -->
</ul>
</div>
<!-- <div class="rbottom">
--
Gitblit v1.9.1