From 6f6a5c7c8f3acc6ce0cc1ee83ed8ac63af9372af Mon Sep 17 00:00:00 2001
From: LiJinHuan <lijinhuan@prec-tech.com>
Date: 星期日, 30 七月 2023 21:45:49 +0800
Subject: [PATCH] 调拨备品中心操作页面优化
---
force-app/main/default/pages/TransferShippmentReceived3.page | 8 +
force-app/main/default/pages/TransferShippmentReceived6.page | 58 +++++++--
force-app/main/default/classes/EquipmentSetShippmentReceived4Controller.cls | 13 +
force-app/main/default/pages/TransferShippmentReceived4.page | 173 ++++++++++++++++++++--------
force-app/main/default/pages/TransferShippmentReceived5.page | 106 ++++++++++++-----
5 files changed, 254 insertions(+), 104 deletions(-)
diff --git a/force-app/main/default/classes/EquipmentSetShippmentReceived4Controller.cls b/force-app/main/default/classes/EquipmentSetShippmentReceived4Controller.cls
index 0cbdcdd..529327b 100644
--- a/force-app/main/default/classes/EquipmentSetShippmentReceived4Controller.cls
+++ b/force-app/main/default/classes/EquipmentSetShippmentReceived4Controller.cls
@@ -549,11 +549,14 @@
}
searchSlip();
- if (!showTab2) {
- done_flg = true;
- } else {
- done_flg = false;
- }
+ // 20230722 ljh
+ // if (!showTab2) {
+ // done_flg = true;
+ // } else {
+ // done_flg = false;
+ // }
+ done_flg = true;
+ // 20230722 ljh
} catch (Exception ex) {
system.debug('=====' + ex.getMessage());
String msg = ex.getMessage();
diff --git a/force-app/main/default/pages/TransferShippmentReceived3.page b/force-app/main/default/pages/TransferShippmentReceived3.page
index be79f41..f837b5e 100644
--- a/force-app/main/default/pages/TransferShippmentReceived3.page
+++ b/force-app/main/default/pages/TransferShippmentReceived3.page
@@ -209,6 +209,9 @@
.errorMsg{
width: 140px;
}
+ .mytable tr{
+ height: 35px;
+ }
/*20230625 ljh */
</style>
<div id="myModal" class="modal">
@@ -281,7 +284,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 +377,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> -->
diff --git a/force-app/main/default/pages/TransferShippmentReceived4.page b/force-app/main/default/pages/TransferShippmentReceived4.page
index 381e4ef..b738892 100644
--- a/force-app/main/default/pages/TransferShippmentReceived4.page
+++ b/force-app/main/default/pages/TransferShippmentReceived4.page
@@ -333,20 +333,22 @@
border:1px solid #D1D1D1;
}
.menu div.m_title{
- width: 308px;
+ /* width: 308px; */ /*20230722 ljh*/
text-align: left;
margin: 0;
background:#95aee5;
border-radius:8px 8px 0 0;
/*height: 42px;*/
+ padding-left: 0.75rem;/*20230721 ljh */
}
.menu div.m_titleg{
- width: 308px;
+ /* width: 308px; */
text-align: left;
margin: 0;
background:#DCDCDC;
border-radius:8px 8px 0 0;
/*height: 42px;*/
+ padding-left: 0.75rem;/*20230721 ljh */
}
.dateFormat {
display: none;
@@ -365,7 +367,7 @@
position: relative;
/* 20230424 ljh lightning 鍗囩骇 start */
/* width: 20%; */
- width: 30%;
+ width: 50%;
/* 20230424 ljh lightning 鍗囩骇 end */
float: left;
margin: 0;
@@ -389,7 +391,7 @@
}
div#main {
- width: 320px;
+ /* width: 320px; */
}
hr {
@@ -397,7 +399,9 @@
color: #fff;
background-color: #fff;
height: 1px;
- width: 90%;
+ /* 20230722 ljh */
+ /* width: 90%; */
+ width: 98%;
}
.close {
color: #aaaaaa;
@@ -475,10 +479,10 @@
<apex:outputPanel id="message">
<apex:pageMessages />
</apex:outputPanel>
- <div style="text-align: right;margin-top: 10px;">
- <apex:commandButton styleClass="commandbutton" onclick="savejs();return false;" value="淇濆瓨"/>
- </div>
- <apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/>
+ <!-- <div style="text-align: right;margin-top: 10px;">
+ <apex:commandButton styleClass="commandbutton" onclick="savejs();return false;" value="淇濆瓨"/>
+ </div>
+ <apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/>
<table style="border-collapse: collapse; font-size:13px;">
<colgroup>
<col width="150" />
@@ -497,7 +501,31 @@
<apex:commandButton styleClass="commandbutton" onclick="qrsacn(2)" value="鎵竴鎵鍝�" rerender="dummy"/>
<input type="hidden" id="QRType" value="1"/>
<apex:commandButton styleClass="commandbutton" onclick="checkAllDetail2();return false" value="鍏ㄩ儴OK" rerender="dummy"/>
- </div>
+ </div> -->
+
+ <apex:pageBlock >
+ <table style="border-collapse: collapse; font-size:13px;">
+ <colgroup>
+ <col width="20%" />
+ <col width="80%" />
+ </colgroup>
+ <tr>
+ <!-- 鐘舵�佸垏鎹tn -->
+ <th style="font-size:20px;text-align: center;width:280px;height: 50px;" >
+ <ul id="Step_tab" style="margin:0;">
+ <li class="selected"><span class="tabsize">娆犲搧纭</span></li>
+ </ul>
+ </th>
+ <th width="900px;" style="padding-left:50px;" class="myBtn">
+ <apex:commandButton styleClass="commandbutton" onclick="qrsacn(2)" value="鎵竴鎵鍝�" rerender="dummy"/>
+ <input type="hidden" id="QRType" value="1"/>
+ <apex:commandButton styleClass="commandbutton" onclick="checkAllDetail2();return false" value="鍏ㄩ儴OK" rerender="dummy"/>
+ <apex:commandButton styleClass="commandbutton" onclick="savejs();return false;" value="淇濆瓨"/>
+ <apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/>
+ </th>
+ </tr>
+ </table>
+ </apex:pageBlock>
</div>
<apex:outputPanel id="detail">
<div id="detailDiv" class="detail">
@@ -529,85 +557,124 @@
</h2>
</div>
</apex:outputPanel>
- <ul data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" style="font-size:14px;">
+ <!-- 20230721 ljh -->
+ <ul data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" style="font-size:14px;padding: 1px 0.75rem;">
<apex:inputField value="{!esdInfo.rec.Loaner_accsessary__c}" style="display:none"/>
<!-- 20201209 ljh add -->
<apex:outputPanel layout="none" rendered="{!IF(AND(esdInfo.rec.ArrivalResult__c != null,esdInfo.rec.ArrivalResult__c !=''), true, false)}">
- <span> {!$ObjectType.TransferApplyDetail__c.fields.ArrivalResult__c.label} 锛� </span>
- <apex:outputField value="{!esdInfo.rec.ArrivalResult__c}" style="margin:3px;width:75px" />
- <br/>
+ <li>
+ <span>{!$ObjectType.TransferApplyDetail__c.fields.ArrivalResult__c.label} 锛� </span>
+ <apex:outputField value="{!esdInfo.rec.ArrivalResult__c}" style="margin:3px;" />
+ </li>
</apex:outputPanel>
<!-- 20201209 ljh add -->
<!-- 20210426 ljh add 1832 start-->
<apex:outputPanel layout="none" rendered="{!IF(AND(esdInfo.rec.Return_DeliverySlip__c != null,esdInfo.rec.ArrivalResult__c == 'NG',esdInfo.rec.Arrival_NG_Comment__c !=''), true, false)}">
- <span> {!$ObjectType.TransferApplyDetail__c.fields.Arrival_NG_Comment__c.label} 锛� </span>
- <apex:outputField value="{!esdInfo.rec.Arrival_NG_Comment__c}" style="margin:3px;width:75px" />
- <br/>
+ <li>
+ <span>{!$ObjectType.TransferApplyDetail__c.fields.Arrival_NG_Comment__c.label} 锛� </span>
+ <apex:outputField value="{!esdInfo.rec.Arrival_NG_Comment__c}" style="margin:3px;" />
+ </li>
</apex:outputPanel>
<!-- 20210426 ljh add 1832 end-->
+ <!-- === -->
<apex:outputPanel layout="none" rendered="{!IF(OR(esdInfo.rec.Check_lost_Item__c='OK',esdInfo.rec.Check_lost_Item__c=''), true, false)}">
- <span> {!$ObjectType.TransferApplyDetail__c.fields.Check_lost_Item__c.label} 锛� </span>
- <apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}"><apex:inputField id="checkLost" value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;width:75px" onchange="changeCheckLost(this)"/></apex:outputPanel>
- <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable))}"><apex:outputField value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;width:75px" /></apex:outputPanel>
+ <li>
+ <span>{!$ObjectType.TransferApplyDetail__c.fields.Check_lost_Item__c.label} 11锛� </span>
+ <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>
+ </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 )}">
- <span> {!$ObjectType.TransferApplyDetail__c.fields.Check_lost_Item__c.label} 锛� </span>
- <apex:outputField id="checkLost3" value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;width:75px"/><br/>
- <span> {!$ObjectType.TransferApplyDetail__c.fields.Check_lost_Item_Final__c.label} 锛� </span>
- <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '娑堣��')}"><apex:inputField id="checkLost2" value="{!esdInfo.rec.Check_lost_Item_Final__c}" style="margin:3px;width:75px" onchange="changeCheckLost(this)"/></apex:outputPanel>
- <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '娑堣��')}"><apex:outputField id="checkLost4" value="{!esdInfo.rec.Check_lost_Item_Final__c}" style="margin:3px;width:75px" /></apex:outputPanel>
+ <li>
+ <span>{!$ObjectType.TransferApplyDetail__c.fields.Check_lost_Item__c.label} 锛� </span>
+ <apex:outputField id="checkLost3" value="{!esdInfo.rec.Check_lost_Item__c}" style="margin:3px;"/>
+ </li>
</apex:outputPanel>
+ <li>
+ <span>{!$ObjectType.TransferApplyDetail__c.fields.Lost_item_Memo__c.label}锛� </span>
+ <apex:outputPanel layout="none" rendered="{!esdInfo.editable}">
+ <apex:inputField id="lostMemo" value="{!esdInfo.rec.Lost_item_Memo__c}" style="margin:3px;"/>
+ </apex:outputPanel>
+ <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || (esdInfo.rec.Check_lost_Item__c != null && esdInfo.rec.Check_lost_Item__c != 'OK'))}">
+ <apex:outputField value="{!esdInfo.rec.Lost_item_Memo__c}" style="margin:3px;"/>
+ </apex:outputPanel>
+ </li>
+ <!-- 鏈�鍒濇渶缁堝鍑虹幇 -->
+ <apex:outputPanel layout="none" rendered="{!IF(OR(esdInfo.rec.Check_lost_Item__c='OK',esdInfo.rec.Check_lost_Item__c=''), false, true )}">
+ <li>
+ <span>{!$ObjectType.TransferApplyDetail__c.fields.Check_lost_Item_Final__c.label} 锛� </span>
+ <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '娑堣��')}"><apex:inputField id="checkLost2" value="{!esdInfo.rec.Check_lost_Item_Final__c}" style="margin:3px;" onchange="changeCheckLost(this)"/></apex:outputPanel>
+ <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '娑堣��')}"><apex:outputField id="checkLost4" value="{!esdInfo.rec.Check_lost_Item_Final__c}" style="margin:3px;" /></apex:outputPanel>
+ </li>
+ </apex:outputPanel>
+ <apex:outputPanel layout="none" rendered="{!esdInfo.rec.Check_lost_Item__c != null && esdInfo.rec.Check_lost_Item__c != 'OK' }">
+ <li>
+ <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 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>
+ </li>
+ </apex:outputPanel>
+ <!-- === -->
<apex:outputPanel layout="none" rendered="{!IF(esdInfo.slipId=null, true, false)}">
<input type="hidden" name="noSlip" value="1"/>
</apex:outputPanel>
- <br/>
- <span> {!$ObjectType.TransferApplyDetail__c.fields.NoItemReturn__c.label}锛� </span>
- <apex:outputField value="{!esdInfo.rec.NoItemReturn__c}" style="margin:3px;width:75px;"/>
- <br/>
- <span> {!$ObjectType.TransferApplyDetail__c.fields.Lost_item_Memo__c.label}锛� </span>
- <apex:outputPanel layout="none" rendered="{!esdInfo.editable}">
- <apex:inputField id="lostMemo" value="{!esdInfo.rec.Lost_item_Memo__c}" style="margin:3px;width:75px;"/>
- </apex:outputPanel>
- <apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || (esdInfo.rec.Check_lost_Item__c != null && esdInfo.rec.Check_lost_Item__c != 'OK'))}">
- <apex:outputField value="{!esdInfo.rec.Lost_item_Memo__c}" style="margin:3px;width:75px;"/>
- </apex:outputPanel>
- <apex:outputPanel layout="none" rendered="{!esdInfo.rec.Check_lost_Item__c != null && esdInfo.rec.Check_lost_Item__c != 'OK' }">
- <br/>
- <span> {!$ObjectType.TransferApplyDetail__c.fields.Lost_item_Memo_Final__c.label}锛� </span>
+ <li>
+ <span>{!$ObjectType.TransferApplyDetail__c.fields.NoItemReturn__c.label}锛� </span>
+ <apex:outputField value="{!esdInfo.rec.NoItemReturn__c}" style="margin:3px;"/>
+ </li>
+
+ <!-- <apex:outputPanel layout="none" rendered="{!esdInfo.rec.Check_lost_Item__c != null && esdInfo.rec.Check_lost_Item__c != 'OK' }">
+ <li>
+ <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;width:75px;"/>
+ <apex:inputField id="lostMemo2" value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="margin:3px;"/>
</apex:outputPanel>
<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;width:75px;"/>
+ <apex:outputField value="{!esdInfo.rec.Lost_item_Memo_Final__c}" style="margin:3px;"/>
</apex:outputPanel>
- </apex:outputPanel>
- <br/>
+ </li>
+ </apex:outputPanel> -->
+
<apex:outputPanel layout="none" rendered="{!$ObjectType.TransferApplyDetail__c.fields.Lost_item_giveup__c.accessible}">
<!-- 20230424 ljh lightning 鍗囩骇 start -->
<!-- {!$ObjectType.TransferApplyDetail__c.fields.Lost_item_giveup__c.label} 锛� <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && NOT(esdInfo.rec.Lost_item_giveup__c) && esdInfo.rec.Check_lost_Item_Final__c != '娑堣��')}"><apex:inputField id="checkboxGiveUp" value="{!esdInfo.rec.Lost_item_giveup__c}"/></apex:outputPanel> -->
- <span> {!$ObjectType.TransferApplyDetail__c.fields.Lost_item_giveup__c.label} 锛�</span> <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && NOT(esdInfo.rec.Lost_item_giveup__c) && esdInfo.rec.Check_lost_Item_Final__c != '娑堣��')}"><apex:inputField id="checkboxGiveUp" value="{!esdInfo.rec.Lost_item_giveup__c}"/></apex:outputPanel>
+ <li>
+ <span>{!$ObjectType.TransferApplyDetail__c.fields.Lost_item_giveup__c.label} 锛�</span> <apex:outputPanel layout="none" rendered="{!(esdInfo.editable && NOT(esdInfo.rec.Lost_item_giveup__c) && esdInfo.rec.Check_lost_Item_Final__c != '娑堣��')}"><apex:inputField id="checkboxGiveUp" value="{!esdInfo.rec.Lost_item_giveup__c}"/></apex:outputPanel>
<!-- 20230424 ljh lightning 鍗囩骇 end -->
<apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Lost_item_giveup__c || esdInfo.rec.Check_lost_Item_Final__c == '娑堣��')}"><apex:outputField value="{!esdInfo.rec.Lost_item_giveup__c}"/></apex:outputPanel>
- <br/>
+ </li>
</apex:outputPanel>
- <span> {!$ObjectType.TransferApplyDetail__c.fields.CDS_complete__c.label} 锛� </span>
+ <li>
+ <span>{!$ObjectType.TransferApplyDetail__c.fields.CDS_complete__c.label} 锛� </span>
<apex:outputPanel layout="none" rendered="{!IF(esdInfo.slipId=null, false, true)}">
<apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '娑堣��')}"><apex:inputField id="checkboxCDS" value="{!esdInfo.rec.CDS_complete__c}" onchange="changeCheckCds(this);"/></apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '娑堣��')}"><apex:outputField value="{!esdInfo.rec.CDS_complete__c}"/></apex:outputPanel>
</apex:outputPanel>
+ </li>
<apex:outputPanel layout="none" rendered="{!IF(esdInfo.slipId=null, false, esdInfo.rec.Main_OneToOne__c)}">
- <br/>
- <span> {!$ObjectType.TransferApplyDetail__c.fields.CDSChargement__c.label} 锛� </span>
+ <li>
+ <span>{!$ObjectType.TransferApplyDetail__c.fields.CDSChargement__c.label} 锛� </span>
<apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '娑堣��')}"><apex:inputField id="CDSChargement" value="{!esdInfo.rec.CDSChargement__c}"/></apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable) || esdInfo.rec.Check_lost_Item_Final__c == '娑堣��')}"><apex:outputField value="{!esdInfo.rec.CDSChargement__c}"/></apex:outputPanel>
- <br/>
- <span> {!$ObjectType.TransferApplyDetail__c.fields.CDSType__c.label} 锛� </span>
+ </li>
+ <li>
+ <span>{!$ObjectType.TransferApplyDetail__c.fields.CDSType__c.label} 锛� </span>
<apex:outputPanel layout="none" rendered="{!(esdInfo.editable && esdInfo.rec.Check_lost_Item_Final__c != '娑堣��')}"><apex:inputField id="CDSType" value="{!esdInfo.rec.CDSType__c}"/></apex:outputPanel>
<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>
- <br/>
- <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>
+ <span>{!$ObjectType.TransferApplyDetail__c.fields.SerialNumber_F__c.label}锛� </span>
+ <span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;"/></span>
+ </li>
</ul>
</div>
</apex:outputPanel>
diff --git a/force-app/main/default/pages/TransferShippmentReceived5.page b/force-app/main/default/pages/TransferShippmentReceived5.page
index 482e693..a134bfc 100644
--- a/force-app/main/default/pages/TransferShippmentReceived5.page
+++ b/force-app/main/default/pages/TransferShippmentReceived5.page
@@ -114,11 +114,12 @@
</script>
<style type="text/css">
.menu div.m_title{
- width: 308px;
+ /* width: 308px; */ /*20230722 ljh*/
text-align: left;
margin: 0;
background:#DCDCDC;
border-radius:8px 8px 0 0;
+ padding-left: 0.75rem;/*20230721 ljh */
}
.dateFormat {
display: none;
@@ -137,7 +138,7 @@
position: relative;
/* 20230424 ljh lightning 鍗囩骇 start */
/* width: 24%; */
- width: 30%;
+ width: 50%;
/* 20230424 ljh lightning 鍗囩骇 end */
float: left;
margin: 0;
@@ -161,7 +162,7 @@
}
div#main {
- width: 320px;
+ /* width: 320px; */
}
hr {
@@ -169,7 +170,9 @@
color: #fff;
background-color: #fff;
height: 1px;
- width: 90%;
+ /*20230722 ljh */
+ /* width: 90%; */
+ width: 98%;
}
.close {
color: #aaaaaa;
@@ -218,7 +221,8 @@
<apex:outputPanel id="message">
<apex:pageMessages />
</apex:outputPanel>
- <div style="text-align: right;margin-top: 10px;">
+ <!-- 20230722 ljh -->
+ <!-- <div style="text-align: right;margin-top: 10px;">
<apex:commandButton styleClass="commandbutton" onclick="savejs();" value="淇濆瓨" rerender="dummy" disabled="{!saveBtnDisabled}"/>
</div>
<apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/>
@@ -228,7 +232,7 @@
<col width="170" />
</colgroup>
<tr>
- <!-- 鐘舵�佸垏鎹tn -->
+ 鐘舵�佸垏鎹tn
<th colspan="2" style="font-size:20px;text-align: center;width:380px;">
<ul id="Step_tab">
<li onclick="javascript:Shippment1();" class="selected"><span class="tabsize">鍏ュ簱鍓嶆娴�</span></li>
@@ -240,7 +244,31 @@
<div style="text-align: right">
<apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="鎵竴鎵�" rerender="dummy" rendered="{!IF(Step_status='鍏ュ簱鍓嶆娴�', true, false)}"/>
<apex:commandButton styleClass="commandbutton" onclick="filljs1();" value="鍏ㄩ儴OK" rerender="dummy" rendered="{!IF(Step_status='鍏ュ簱鍓嶆娴�', true, false)}"/>
- </div>
+ </div> -->
+ <apex:pageBlock >
+ <table style="border-collapse: collapse; font-size:13px;">
+ <colgroup>
+ <col width="20%" />
+ <col width="80%" />
+ </colgroup>
+ <tr>
+ <!-- 鐘舵�佸垏鎹tn -->
+ <th style="font-size:20px;text-align: center;width:280px;height: 50px;" >
+ <ul id="Step_tab" style="margin:0;">
+ <ul id="Step_tab">
+ <li onclick="javascript:Shippment1();" class="selected"><span class="tabsize">鍏ュ簱鍓嶆娴�</span></li>
+ <li onclick="javascript:Shippment2();"><span class="tabsize">涓婃灦</span></li>
+ </ul>
+ </ul>
+ </th>
+ <th width="900px;" style="padding-left:50px;" class="myBtn">
+ <apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="鎵竴鎵�" rerender="dummy" rendered="{!IF(Step_status='鍏ュ簱鍓嶆娴�', true, false)}"/>
+ <apex:commandButton styleClass="commandbutton" onclick="filljs1();" value="鍏ㄩ儴OK" rerender="dummy" rendered="{!IF(Step_status='鍏ュ簱鍓嶆娴�', true, false)}"/>
+ <apex:commandButton styleClass="commandbutton" onclick="savejs();" value="淇濆瓨" rerender="dummy" disabled="{!saveBtnDisabled}"/>
+ </th>
+ </tr>
+ </table>
+ </apex:pageBlock>
</div>
<apex:outputPanel id="detail">
@@ -255,58 +283,68 @@
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.TransferApplySummary__c, false, true)}">
<hr/>
- <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3>
+ <h3 style="padding: 5px 0.75rem;" class="detailtab">{!esdInfo.fsName}</h3>
<apex:variable var="SetName" value="{!esdInfo.rec.TransferApplySummary__c}" />
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!IF(indexloop == 1, true, false)}">
- <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3>
+ <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>
- <ul>
+ <div class="m_title"><h2><apex:outputField value="{!esdInfo.rec.AssetName__c}" /> </h2></div>
+ <!-- 20230722 ljh -->
+ <ul style="padding: 1px 0.75rem;" >
<!-- <apex:outputPanel layout="none" rendered="{!IF(Step_status='鍏ュ簱鍓嶆娴�', true, false)}"> -->
<li>
<span>{!$ObjectType.TransferApplyDetail__c.fields.Check_lost_Item_F__c.label}锛� </span><span>
- <apex:outputField value="{!esdInfo.rec.Check_lost_Item_F__c}" style="margin:3px;width:75px;"/></span>
+ <!-- 20230722 ljh width:75px;-->
+ <apex:outputField value="{!esdInfo.rec.Check_lost_Item_F__c}" style="margin:3px;"/></span>
</li>
<li>
<span>{!$ObjectType.TransferApplyDetail__c.fields.Lost_item_giveup__c.label}锛� </span><span>
- <apex:outputField value="{!esdInfo.rec.Lost_item_giveup__c}" style="margin:3px;width:75px;"/></span>
+ <!-- 20230722 ljh width:75px;-->
+ <apex:outputField value="{!esdInfo.rec.Lost_item_giveup__c}" style="margin:3px;"/></span>
</li>
<apex:outputPanel layout="none" rendered="{!esdInfo.rec.Inspection_result_after_ng__c='缁翠慨'}">
<li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" >
<span>妫�娴嬬粨鏋滐細 </span><span>
- <apex:outputField value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;width:75px;" />
+ <!-- 20230722 ljh width:75px;-->
+ <apex:outputField value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;" />
</span>
</li>
<li>
<span>妫�娴婲G鍖哄垎锛� </span><span>
- <apex:outputField value="{!esdInfo.rec.Inspection_result_after_ng__c}" style="margin:3px;width:75px;"/></span>
+ <!-- 20230722 ljh width:75px;-->
+ <apex:outputField value="{!esdInfo.rec.Inspection_result_after_ng__c}" style="margin:3px;"/></span>
</li>
<li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" >
<span>鏈�缁堟娴嬬粨鏋滐細 </span>
<apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
- <apex:inputField id="inspectionResult2" value="{!esdInfo.rec.Inspection_result_after_Final__c}" style="margin:3px;width:75px;" onchange="changeResultNg('{!indexloop}', 2);" />
+ <!-- 20230722 ljh width:75px;-->
+ <apex:inputField id="inspectionResult2" value="{!esdInfo.rec.Inspection_result_after_Final__c}" style="margin:3px;" onchange="changeResultNg('{!indexloop}', 2);" />
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
- <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after_Final__c}" style="margin:3px;width:75px;" /></span>
+ <!-- 20230722 ljh width:75px;-->
+ <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after_Final__c}" style="margin:3px;" /></span>
</apex:outputPanel>
</li>
<li>
<span>鏈�缁圢G鍖哄垎锛� </span>
<apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}"><span>
- <apex:inputField id="inspectionResultNg2" value="{!esdInfo.rec.Inspection_result_after_NG_Final__c}" style="margin:3px;width:75px;" onchange="changeResultNg('{!indexloop}', 2);" /></span>
+ <!-- 20230722 ljh width:75px;-->
+ <apex:inputField id="inspectionResultNg2" value="{!esdInfo.rec.Inspection_result_after_NG_Final__c}" style="margin:3px;;" onchange="changeResultNg('{!indexloop}', 2);" /></span>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
- <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after_NG_Final__c}" style="margin:3px;width:75px;" /></span>
+ <!-- 20230722 ljh width:75px;-->
+ <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after_NG_Final__c}" style="margin:3px;" /></span>
</apex:outputPanel>
</li>
<li>
<span>{!$ObjectType.TransferApplyDetail__c.fields.Inspection_NG_abord_reason__c.label}锛�</span>
<apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}"><span>
- <apex:inputField id="inspectionResultNg4" value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;" />
- </span>
+ <!-- <apex:inputField id="inspectionResultNg4" value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;" /> -->
+ <apex:inputField id="inspectionResultNg4" value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;" />
+ </span>
<script>
disabledShowNg4();
function disabledShowNg4() {
@@ -318,7 +356,9 @@
</script>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
- <span><apex:outputField value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;" /></span>
+ <!-- 20230722 ljh -->
+ <!-- <span><apex:outputField value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;" /></span> -->
+ <span><apex:outputField value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;" /></span>
</apex:outputPanel>
</li>
</apex:outputPanel>
@@ -326,25 +366,29 @@
<li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}" >
<span>妫�娴嬬粨鏋滐細 </span>
<apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
- <apex:inputField id="inspectionResult" value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;width:75px;" onchange="changeResultNg('{!indexloop}', 1)" />
+ <!-- 20230722 ljh width:75px;-->
+ <apex:inputField id="inspectionResult" value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;" onchange="changeResultNg('{!indexloop}', 1)" />
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
- <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;width:75px;" /></span>
+ <!-- 20230722 ljh width:75px;-->
+ <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after__c}" style="margin:3px;" /></span>
</apex:outputPanel>
</li>
<li>
<span>妫�娴婲G鍖哄垎锛� </span>
<apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}"><span>
- <apex:inputField id="inspectionResultNg" value="{!esdInfo.rec.Inspection_result_after_ng__c}" style="margin:3px;width:75px;" onchange="changeResultNg('{!indexloop}', 1)" /></span>
+ <!-- 20230722 ljh width:75px;-->
+ <apex:inputField id="inspectionResultNg" value="{!esdInfo.rec.Inspection_result_after_ng__c}" style="margin:3px;" onchange="changeResultNg('{!indexloop}', 1)" /></span>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
- <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after_ng__c}" style="margin:3px;width:75px;" /></span>
+ <!-- 20230722 ljh width:75px;-->
+ <span><apex:outputField value="{!esdInfo.rec.Inspection_result_after_ng__c}" style="margin:3px;" /></span>
</apex:outputPanel>
</li>
<li>
<span>{!$ObjectType.TransferApplyDetail__c.fields.Inspection_NG_abord_reason__c.label}锛�</span>
<apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}"><span>
- <apex:inputField id="inspectionResultNg3" value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;"/>
+ <apex:inputField id="inspectionResultNg3" value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;"/>
</span>
<script>
disabledShowNg3();
@@ -357,22 +401,22 @@
</script>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
- <span><apex:outputField value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;width:90%;float:left;" /></span>
+ <span><apex:outputField value="{!esdInfo.rec.Inspection_NG_abord_reason__c}" style="margin:3px;" /></span>
</apex:outputPanel>
</li>
</apex:outputPanel>
<li>
<span>{!$ObjectType.TransferApplyDetail__c.fields.Inspection_Comment__c.label}锛� </span>
<apex:outputPanel layout="none" rendered="{!(esdInfo.editable)}">
- <span><apex:inputField value="{!esdInfo.rec.Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/></span>
+ <span><apex:inputField value="{!esdInfo.rec.Inspection_Comment__c}" style="margin:3px;"/></span>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!(NOT(esdInfo.editable))}">
- <span><apex:outputField value="{!esdInfo.rec.Inspection_Comment__c}" style="margin:3px;width:90%;float:left;"/></span>
+ <span><apex:outputField value="{!esdInfo.rec.Inspection_Comment__c}" style="margin:3px;"/></span>
</apex:outputPanel>
</li>
<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>
+ <span><apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;"/></span>
</li>
<script>
diff --git a/force-app/main/default/pages/TransferShippmentReceived6.page b/force-app/main/default/pages/TransferShippmentReceived6.page
index f6133c1..1c304a6 100644
--- a/force-app/main/default/pages/TransferShippmentReceived6.page
+++ b/force-app/main/default/pages/TransferShippmentReceived6.page
@@ -122,11 +122,12 @@
</script>
<style type="text/css">
.menu div.m_title{
- width: 308px;
+ /* width: 308px; *//*20230723 ljh*/
text-align: left;
margin: 0;
background:#DCDCDC;
border-radius:8px 8px 0 0;
+ padding-left: 0.75rem;/*20230721 ljh */
}
.menu blockquote{
margin: 0;
@@ -155,7 +156,7 @@
position: relative;
/* 20230424 ljh lightning 鍗囩骇 start */
/* width: 20%; */
- width: 30%;
+ width: 50%;
/* 20230424 ljh lightning 鍗囩骇 end */
float: left;
margin: 0;
@@ -179,14 +180,16 @@
}
div#main {
- width: 320px;
+ /* width: 320px; *//*20230723 ljh*/
}
hr {
border-top: 2px dotted #f00;
color: #fff;
background-color: #fff;
height: 1px;
- width: 90%;
+ /*20230722 ljh */
+ /* width: 90%; */
+ width: 98%;
}
.close {
color: #aaaaaa;
@@ -234,7 +237,7 @@
<apex:outputPanel id="message">
<apex:pageMessages />
</apex:outputPanel>
- <div style="text-align: right;margin-top: 10px;">
+ <!-- <div style="text-align: right;margin-top: 10px;">
<apex:commandButton styleClass="commandbutton" onclick="savejs();" value="淇濆瓨" rerender="dummy" disabled="{!saveBtnDisabled}"/>
</div>
<apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/>
@@ -244,7 +247,7 @@
<col width="170" />
</colgroup>
<tr>
- <!-- 鐘舵�佸垏鎹tn -->
+ 鐘舵�佸垏鎹tn
<th colspan="2" style="font-size:20px;text-align: center;width:380px;">
<ul id="Step_tab">
<li class="selected"><span class="tabsize">涓婃灦</span></li>
@@ -256,7 +259,30 @@
<div style="text-align: right">
<apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="鎵竴鎵�" rerender="dummy" rendered="{!IF(Step_status='涓婃灦', true, false)}"/>
<apex:commandButton styleClass="commandbutton" onclick="filljs1();" value="鍏ㄩ儴OK" rerender="dummy" rendered="{!IF(Step_status='涓婃灦', true, false)}"/>
- </div>
+ </div> -->
+ <apex:pageBlock >
+ <table style="border-collapse: collapse; font-size:13px;">
+ <colgroup>
+ <col width="20%" />
+ <col width="80%" />
+ </colgroup>
+ <tr>
+ <!-- 鐘舵�佸垏鎹tn -->
+ <th style="font-size:20px;text-align: center;width:280px;height: 50px;" >
+ <ul id="Step_tab" style="margin:0;">
+ <li class="selected"><span class="tabsize">涓婃灦</span></li>
+ </ul>
+ </th>
+ <th width="900px;" style="padding-left:50px;" class="myBtn">
+ <apex:commandButton styleClass="commandbutton" onclick="qrsacn()" value="鎵竴鎵�" rerender="dummy" rendered="{!IF(Step_status='涓婃灦', true, false)}"/>
+ <apex:commandButton styleClass="commandbutton" onclick="filljs1();" value="鍏ㄩ儴OK" rerender="dummy" rendered="{!IF(Step_status='涓婃灦', true, false)}"/>
+ <apex:commandButton styleClass="commandbutton" onclick="savejs();" value="淇濆瓨" rerender="dummy" disabled="{!saveBtnDisabled}"/>
+ <apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/>
+ </th>
+ </tr>
+ </table>
+ <div style="font-size: 14px;">缂哄皯涓�瀵逛竴鍥炲簱:<apex:inputCheckbox value="{!forceSave}" /></div>
+ </apex:pageBlock>
</div>
<apex:outputPanel id="detail">
@@ -291,14 +317,16 @@
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.TransferApplySummary__c, false, true)}">
<hr/>
- <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3>
- <apex:commandButton styleClass="commandbutton" onclick="qrsacn2('{!esdInfo.rec.TransferApplySummary__c}')" value="鎵竴鎵檮灞炲搧" rerender="dummy" rendered="{!esdInfo.rec.Main_OneToOne__c}"/>
+ <!-- <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3> -->
+ <span style="padding: 5px 0.75rem;font-weight: bold;" class="detailtab">{!esdInfo.fsName}</span>
+ <apex:commandButton styleClass="commandbutton" onclick="qrsacn2('{!esdInfo.rec.TransferApplySummary__c}')" value="鎵竴鎵檮灞炲搧" rerender="dummy" rendered="{!esdInfo.rec.Main_OneToOne__c}" style="margin-bottom: 5px;"/>
<apex:variable var="SetName" value="{!esdInfo.rec.TransferApplySummary__c}" />
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!IF(indexloop == 1, true, false)}">
- <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3>
- <apex:commandButton styleClass="commandbutton" onclick="qrsacn2('{!esdInfo.rec.TransferApplySummary__c}')" value="鎵竴鎵檮灞炲搧" rerender="dummy" rendered="{!esdInfo.rec.Main_OneToOne__c}"/>
+ <!-- <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3> -->
+ <span style="padding: 5px 0.75rem;font-weight: bold;" class="detailtab">{!esdInfo.fsName}</span>
+ <apex:commandButton styleClass="commandbutton" onclick="qrsacn2('{!esdInfo.rec.TransferApplySummary__c}')" value="鎵竴鎵檮灞炲搧" rerender="dummy" rendered="{!esdInfo.rec.Main_OneToOne__c}" style="margin-bottom: 5px;"/>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!IF(esdInfo.errorInfo=null, false, true)}">
<div>
@@ -308,7 +336,8 @@
<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>
</div></h2>
- <ul>
+ <!-- 20230722 ljh -->
+ <ul style="padding: 1px 0.75rem;" >
<li>
<span>妫�娴嬬粨鏋滐細 </span><span>
<apex:outputField value="{!esdInfo.rec.Inspection_result_after_F__c}" style="margin:3px;width:75px;"/></span>
@@ -320,7 +349,10 @@
<li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}">
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Arrival_in_wh__c.label}锛� </span>
<apex:outputPanel layout="none" rendered="{!esdInfo.editable}">
- <apex:inputField id="arrivalin" value="{!esdInfo.rec.Arrival_in_wh__c}" style="margin:3px;width:75px;" />
+ <!-- 20230424 ljh lightning 鍗囩骇 start -->
+ <!-- <apex:inputField id="arrivalin" value="{!esdInfo.rec.Arrival_in_wh__c}" style="margin:3px;width:75px;" /> -->
+ <apex:inputField id="arrivalin" value="{!esdInfo.rec.Arrival_in_wh__c}" style="margin:3px;" />
+ <!-- 20230424 ljh lightning 鍗囩骇 end -->
<apex:outputPanel layout="none" rendered="{!esdInfo.rec.OneToOneAccessory__c}">
<input type="hidden" name="onetoone" value="{!esdInfo.rec.TransferApplySummary__c}"/>
</apex:outputPanel>
--
Gitblit v1.9.1