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/TransferShippmentReceived3.page | 24 +++++++++---
force-app/main/default/pages/TransferShippmentReceived6.page | 10 ++++-
force-app/main/default/pages/ReceivingNoteQRScan.page | 2
force-app/main/default/pages/TransferShippmentReceived2.page | 9 +++-
force-app/main/default/pages/TransferShippmentReceived4.page | 22 +++++++----
force-app/main/default/pages/TransferShippmentReceived5.page | 12 ++++-
force-app/main/default/pages/TransferShippmentReceived1.page | 10 ++++-
7 files changed, 65 insertions(+), 24 deletions(-)
diff --git a/force-app/main/default/pages/ReceivingNoteQRScan.page b/force-app/main/default/pages/ReceivingNoteQRScan.page
index 7c674ef..fa89c52 100644
--- a/force-app/main/default/pages/ReceivingNoteQRScan.page
+++ b/force-app/main/default/pages/ReceivingNoteQRScan.page
@@ -1,5 +1,5 @@
<!--浠縒ebToEquipmentSetShippmentReceived.page-->
-<apex:page showHeader="true" sidebar="true" id="allPage" title="web to app">
+<apex:page showHeader="true" sidebar="true" id="allPage" title="web to app" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
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>
diff --git a/force-app/main/default/pages/TransferShippmentReceived2.page b/force-app/main/default/pages/TransferShippmentReceived2.page
index f1c3b2d..8b6bcdb 100644
--- a/force-app/main/default/pages/TransferShippmentReceived2.page
+++ b/force-app/main/default/pages/TransferShippmentReceived2.page
@@ -304,6 +304,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 -->
@@ -378,10 +381,12 @@
<span>{!$ObjectType.TransferApplyDetail__c.fields.Pre_After_Inspection_elapsed_days__c.label}锛� </span>
<span><apex:outputField value="{!esdInfo.rec.Pre_After_Inspection_elapsed_days__c}" style="margin:3px;width:75px;"/></span>
</li>
- <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 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
<!-- </div> -->
</apex:outputPanel>
</ul>
diff --git a/force-app/main/default/pages/TransferShippmentReceived3.page b/force-app/main/default/pages/TransferShippmentReceived3.page
index f837b5e..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*/
}
@@ -387,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 -->
@@ -404,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>
@@ -447,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瑕併倠锛� -->
@@ -466,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>
diff --git a/force-app/main/default/pages/TransferShippmentReceived4.page b/force-app/main/default/pages/TransferShippmentReceived4.page
index b738892..5511a4d 100644
--- a/force-app/main/default/pages/TransferShippmentReceived4.page
+++ b/force-app/main/default/pages/TransferShippmentReceived4.page
@@ -336,7 +336,8 @@
/* width: 308px; */ /*20230722 ljh*/
text-align: left;
margin: 0;
- background:#95aee5;
+ background:#DCDCDC;
+ /* background:#95aee5; */
border-radius:8px 8px 0 0;
/*height: 42px;*/
padding-left: 0.75rem;/*20230721 ljh */
@@ -554,6 +555,9 @@
<div class="m_title">
<h2>
<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;"/>)</span>
+ <!-- 2023-08-02 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
</h2>
</div>
</apex:outputPanel>
@@ -579,13 +583,13 @@
<!-- === -->
<apex:outputPanel layout="none" rendered="{!IF(OR(esdInfo.rec.Check_lost_Item__c='OK',esdInfo.rec.Check_lost_Item__c=''), true, false)}">
<li>
- <span>{!$ObjectType.TransferApplyDetail__c.fields.Check_lost_Item__c.label} 11锛� </span>
+ <span>{!$ObjectType.TransferApplyDetail__c.fields.Check_lost_Item__c.label} 锛�
<apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
<span><apex:inputField id="checkLost" value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;" onchange="changeCheckLost(this)"/> </span>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable))}">
<span><apex:outputField value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;" /></span>
- </apex:outputPanel>
+ </apex:outputPanel></span>
</li>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!IF(OR(esdInfo.rec.Check_lost_Item__c='OK',esdInfo.rec.Check_lost_Item__c=''), false, true )}">
@@ -627,8 +631,8 @@
<input type="hidden" name="noSlip" value="1"/>
</apex:outputPanel>
<li>
- <span>{!$ObjectType.TransferApplyDetail__c.fields.NoItemReturn__c.label}锛� </span>
- <apex:outputField value="{!esdInfo.rec.NoItemReturn__c}" style="margin:3px;"/>
+ <span>{!$ObjectType.TransferApplyDetail__c.fields.NoItemReturn__c.label}锛�
+ <apex:outputField value="{!esdInfo.rec.NoItemReturn__c}" style="margin:3px;"/></span>
</li>
<!-- <apex:outputPanel layout="none" rendered="{!esdInfo.rec.Check_lost_Item__c != null && esdInfo.rec.Check_lost_Item__c != 'OK' }">
@@ -636,7 +640,7 @@
<span>{!$ObjectType.TransferApplyDetail__c.fields.Lost_item_Memo_Final__c.label}锛� </span>
<apex:outputPanel layout="none" rendered="{!esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '娑堣��'}">
<apex:inputField id="lostMemo2" value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="margin:3px;"/>
- </apex:outputPanel>
+ </apex:outputPanel>s
<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '娑堣��'}">
<apex:outputField value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="margin:3px;"/>
</apex:outputPanel>
@@ -671,10 +675,12 @@
<apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '娑堣��')}"><apex:outputField value="{!esdInfo.rec.CDSType__c}"/></apex:outputPanel>
</li>
</apex:outputPanel>
- <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;"/></span>
- </li>
+ </li> -->
+ <!-- 2023-08-02 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
</ul>
</div>
</apex:outputPanel>
diff --git a/force-app/main/default/pages/TransferShippmentReceived5.page b/force-app/main/default/pages/TransferShippmentReceived5.page
index a134bfc..65805fc 100644
--- a/force-app/main/default/pages/TransferShippmentReceived5.page
+++ b/force-app/main/default/pages/TransferShippmentReceived5.page
@@ -291,7 +291,11 @@
<h3 style="padding: 5px 0.75rem;" class="detailtab">{!esdInfo.fsName}</h3>
</apex:outputPanel>
<div class="menu">
- <div class="m_title"><h2><apex:outputField value="{!esdInfo.rec.AssetName__c}" /> </h2></div>
+ <div class="m_title"><h2><apex:outputField value="{!esdInfo.rec.AssetName__c}" />
+ <!-- 2023-08-02 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
+ <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;"/>)</span>
+ <!-- 2023-08-02 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
+ </h2></div>
<!-- 20230722 ljh -->
<ul style="padding: 1px 0.75rem;" >
<!-- <apex:outputPanel layout="none" rendered="{!IF(Step_status='鍏ュ簱鍓嶆娴�', true, false)}"> -->
@@ -414,10 +418,12 @@
<span><apex:outputField value="{!esdInfo.rec.Inspection_Comment__c}" style="margin:3px;"/></span>
</apex:outputPanel>
</li>
- <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;"/></span>
- </li>
+ </li> -->
+ <!-- 2023-08-02 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� -->
<script>
function changeResultNg(index, kubun) {
diff --git a/force-app/main/default/pages/TransferShippmentReceived6.page b/force-app/main/default/pages/TransferShippmentReceived6.page
index 1c304a6..cdafdfc 100644
--- a/force-app/main/default/pages/TransferShippmentReceived6.page
+++ b/force-app/main/default/pages/TransferShippmentReceived6.page
@@ -335,6 +335,10 @@
</apex:outputPanel>
<div class="menu">
<h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.AssetName__c}" /> <apex:outputPanel layout="none" rendered="{!esdInfo.rec.OneToOneAccessory__c}">(涓�瀵逛竴闄勫睘鍝�)</apex:outputPanel>
+ <!-- 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>
<!-- 20230722 ljh -->
<ul style="padding: 1px 0.75rem;" >
@@ -380,10 +384,12 @@
<span><apex:outputField value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;width:75px;"/></span>
</apex:outputPanel>
</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