From c93907a931ee119592587eface8d730f80d9ef18 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@prec-tech.com>
Date: 星期三, 19 七月 2023 13:43:08 +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 | 209 ++++++++++++++++++++++++++++-----------------------
1 files changed, 115 insertions(+), 94 deletions(-)
diff --git a/force-app/main/default/pages/TransferShippmentReceived3.page b/force-app/main/default/pages/TransferShippmentReceived3.page
index a1e0d94..be79f41 100644
--- a/force-app/main/default/pages/TransferShippmentReceived3.page
+++ b/force-app/main/default/pages/TransferShippmentReceived3.page
@@ -60,10 +60,16 @@
j$('input[type="checkbox"]').prop("checked",true);
}
function ShippmentAddJs() {
- j$(escapeVfId('allPage:allForm:SlipNo')).prop("disabled", true);
- j$(escapeVfId('allPage:allForm:DeliveryType')).prop("disabled", true);
- j$(escapeVfId('allPage:allForm:DistributorMethod')).prop("disabled", true);
- j$(escapeVfId('allPage:allForm:DeliveryCompany')).prop("disabled", true);
+ // 20230620 ljh start
+ // j$(escapeVfId('allPage:allForm:SlipNo')).prop("disabled", true);
+ // j$(escapeVfId('allPage:allForm:DeliveryType')).prop("disabled", true);
+ // j$(escapeVfId('allPage:allForm:DistributorMethod')).prop("disabled", true);
+ // j$(escapeVfId('allPage:allForm:DeliveryCompany')).prop("disabled", true);
+ j$(escapeVfId('allPage:allForm:newHeader:SlipNo')).prop("disabled", true);
+ j$(escapeVfId('allPage:allForm:newHeader:DeliveryType')).prop("disabled", true);
+ j$(escapeVfId('allPage:allForm:newHeader:DistributorMethod')).prop("disabled", true);
+ j$(escapeVfId('allPage:allForm:newHeader:DeliveryCompany')).prop("disabled", true);
+ // 20230620 ljh end
ShippmentAdd();
}
function checkMessage() {
@@ -73,7 +79,10 @@
}
function fixDeliveryType() {
- j$(escapeVfId('allPage:allForm:DeliveryType')).children().each(function() {
+ // 20230620 ljh start
+ // j$(escapeVfId('allPage:allForm:DeliveryType')).children().each(function() {
+ j$(escapeVfId('allPage:allForm:newHeader:DeliveryType')).children().each(function() {
+ // 20230620 ljh end
if (this.value == '鍥炲瘎') j$(this).remove();
})
}
@@ -97,11 +106,12 @@
display: none
}
.menu div.m_title{
- width: 308px;
+ /* width: 308px; *//* 20230718 ljh */
text-align: left;
margin: 0;
background:#95aee5;
border-radius:8px 8px 0 0;
+ padding-left: 0.75rem;/*20230628 ljh*/
}
.menu div.m_titleg{
width: 308px;
@@ -131,13 +141,17 @@
position: relative;
/* 20230423 ljh lightning 鍗囩骇 start */
/* width: 20%; */
- width: 30%;
+ width: 50%;
/* 20230423 ljh lightning 鍗囩骇 end */
float: left;
margin: 0;
padding: 0;
text-align: center;
cursor: pointer;
+ /*20230616 ljh*/
+ height:30px;
+ line-height: 30px;
+ /*20230616 ljh*/
}
#Step_tab li span {
margin: 0;
@@ -155,7 +169,7 @@
}
div#main {
- width: 320px;
+ /* width: 320px; */
}
hr {
@@ -163,7 +177,10 @@
color: #fff;
background-color: #fff;
height: 1px;
- width: 90%;
+ /*20230620 ljh*/
+ /*width: 90%;*/
+ width: 98%;
+ /*20230620 ljh*/
}
.close {
color: #aaaaaa;
@@ -188,6 +205,11 @@
width: 140px;
}
/* 20230423 ljh lightning 鍒囨崲 end */
+ /*20230625 ljh */
+ .errorMsg{
+ width: 140px;
+ }
+ /*20230625 ljh */
</style>
<div id="myModal" class="modal">
@@ -228,85 +250,77 @@
<apex:outputPanel id="message">
<apex:pageMessages />
</apex:outputPanel>
- <apex:outputPanel layout="none" rendered="{!IF(Step_status='鏄庣粏', true, false)}">
- <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;"/>
- </apex:outputPanel>
- <!-- <apex:outputText value="锛堝嚭搴撴寚绀哄悗鍙栨秷锛�" style="color:red;" rendered="{!IF(SR_status='Received' && es.cancel_after_loaner_arranged__c, true, false)}"/> -->
- <table style="border-collapse: collapse; font-size:13px;">
- <colgroup>
- <col width="150" />
- <col width="170" />
- </colgroup>
- <tr>
- <!-- 鐘舵�佸垏鎹tn -->
- <th colspan="2" style="font-size:20px;text-align: center;width:380px;">
- <ul id="Step_tab">
- <!-- <apex:outputPanel layout="none" rendered="{!IF(Step_status='杩愯緭鍗�', true, false)}">
- <li onclick="javascript:Shippment();return false" class="selected"><span>杩愯緭鍗�</span></li>
- <li onclick="javascript:ShippmentDetail();return false"><span>鏄庣粏</span></li>
- <li onclick="javascript:ShippmentAdd();return false"><span>杩藉姞</span></li>
- </apex:outputPanel> -->
+ <apex:pageBlock id="newHeader">
+ <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;">
+ <apex:outputPanel layout="none" rendered="{!IF(Step_status='鏄庣粏', true, false)}">
+ <li onclick="javascript:ShippmentAddJs();return false"><span class="tabsize">杩藉姞</span></li>
+ <li class="selected"><span>鏄庣粏</span></li>
+ </apex:outputPanel>
+ <apex:outputPanel layout="none" rendered="{!IF(Step_status='杩藉姞', true, false)}">
+ <li class="selected"><span>杩藉姞</span></li>
+ <li onclick="javascript:ShippmentDetail();return false"><span class="tabsize">鏄庣粏</span></li>
+ </apex:outputPanel>
+ </ul>
+ </th>
+ <th width="900px;" style="padding-left:50px;" class="myBtn">
+ <apex:commandButton styleClass="commandbutton" onclick="qrsacn(0)" value="鎵竴鎵敵璇蜂功" rerender="dummy" rendered="{!IF(Step_status='杩藉姞', true, false)}"/>
+ <apex:commandButton styleClass="commandbutton" onclick="checkAllDetail();return false" value="鍏ㄩ��" rerender="dummy" rendered="{!IF(Step_status='杩藉姞', true, false)}"/>
+ <apex:commandButton styleClass="commandbutton" onclick="addToDetail();return false" value="杩藉姞" rerender="dummy" rendered="{!IF(Step_status='杩藉姞', true, false)}"/>
<apex:outputPanel layout="none" rendered="{!IF(Step_status='鏄庣粏', true, false)}">
- <li onclick="javascript:ShippmentAddJs();return false"><span class="tabsize">杩藉姞</span></li>
- <li class="selected"><span>鏄庣粏</span></li>
+ <apex:commandButton styleClass="commandbutton" onclick="savejs();" value="淇濆瓨" rerender="dummy" disabled="{!saveBtnDisabled}"/>
+ <apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/>
</apex:outputPanel>
- <apex:outputPanel layout="none" rendered="{!IF(Step_status='杩藉姞', true, false)}">
- <li class="selected"><span>杩藉姞</span></li>
- <li onclick="javascript:ShippmentDetail();return false"><span class="tabsize">鏄庣粏</span></li>
- </apex:outputPanel>
- </ul>
- </th>
- </tr>
- <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>
+ </th>
</tr>
- <tr>
- <td style="text-align: right;" class="deliveryslip">鍙戣揣-杩愯緭鍗曞彿 锛� </td>
- <td align="left">
- <!-- 20230423 ljh lightning 鍗囩骇 start -->
- <!-- <apex:inputField value="{!slip.Name}" style="width:120px;float:left" id="SlipNo"/> -->
- <apex:inputField value="{!slip.Name}" style="width:100px;float:left" id="SlipNo"/>
- <apex:commandButton styleClass="commandbutton" onclick="blockme();searchSlip();return false;" style="float:left" value="妫�绱�" rerender="dummy"/>
- <!-- <apex:commandButton styleClass="commandbutton" onclick="qrsacn(1)" value="鎵繍杈撳崟鍙�" rerender="dummy"/> -->
- <apex:commandButton styleClass="commandbutton" onclick="qrsacn(1)" value="鎵繍杈撳崟鍙�" rerender="dummy" style="margin-left:0;"/>
- <!-- 20230423 ljh lightning 鍗囩骇 end -->
- </td>
- </tr>
- <tr>
- <td style="text-align: right" class="deliveryslip">鍙戣揣-{!$ObjectType.FixtureDeliverySlip__c.fields.DeliveryType__c.label} 锛� </td>
- <td align="left"><apex:inputField value="{!slip.DeliveryType__c}" style="width:145px;" id="DeliveryType"/></td>
- </tr>
- <tr>
- <td style="text-align: right" class="deliveryslip">鍙戣揣-{!$ObjectType.FixtureDeliverySlip__c.fields.Distributor_method__c.label} 锛� </td>
- <td align="left"><apex:inputField value="{!slip.Distributor_method__c}" style="width:145px;" id="DistributorMethod"/></td>
- </tr>
- <tr>
- <td style="text-align: right" class="deliveryslip">鍙戣揣-{!$ObjectType.FixtureDeliverySlip__c.fields.DeliveryCompany__c.label} 锛� </td>
- <td align="left"><apex:inputField value="{!slip.DeliveryCompany__c}" style="width:145px;" id="DeliveryCompany"/></td>
- </tr>
- <tr>
- <td style="text-align: right" class="deliveryslip">鍙戣揣-{!$ObjectType.FixtureDeliverySlip__c.fields.Wh_Staff__c.label} 銆� </td>
- <td align="left"><apex:inputField styleClass="hideDropdown" value="{!slip.Wh_Staff__c}" style="width:130px;" /></td>
- </tr>
- <tr>
- <td style="text-align: right" class="deliveryslip">鍙戣揣-{!$ObjectType.FixtureDeliverySlip__c.fields.Combine_Pack__c.label} 銆� </td>
- <td align="left"><apex:inputField styleClass="hideDropdown" value="{!slip.Combine_Pack__c}" style="width:130px;" /></td>
- </tr>
- <!-- <tr>
- <td colspan="2"><apex:inputField value="{!slip.Wh_Staff__c}" style="width:130px;" /></td>
- </tr> -->
- </apex:outputPanel>
- </table>
-
- <div style="text-align: right">
- <apex:commandButton styleClass="commandbutton" onclick="qrsacn(0)" value="鎵竴鎵敵璇蜂功" rerender="dummy" rendered="{!IF(Step_status='杩藉姞', true, false)}"/>
- <apex:commandButton styleClass="commandbutton" onclick="checkAllDetail();return false" value="鍏ㄩ��" rerender="dummy" rendered="{!IF(Step_status='杩藉姞', true, false)}"/>
- <apex:commandButton styleClass="commandbutton" onclick="addToDetail();return false" value="杩藉姞" rerender="dummy" rendered="{!IF(Step_status='杩藉姞', true, false)}"/>
- </div>
+ </table>
+ <table style="border-collapse: collapse; font-size:13px;" width="80%">
+ <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>
+ </tr>
+ <tr>
+ <td style="text-align: right;" class="deliveryslip">鍙戣揣-杩愯緭鍗曞彿 锛� </td>
+ <td align="left">
+ <!-- 20230423 ljh lightning 鍗囩骇 start -->
+ <apex:inputField value="{!slip.Name}" style="width:145px;padding: 0;float:left" id="SlipNo"/>
+ <!-- <apex:inputField value="{!slip.Name}" style="width:120px;float:left" id="SlipNo"/> -->
+ <apex:commandButton styleClass="commandbutton" onclick="blockme();searchSlip();return false;" style="float:left;" value="妫�绱�" rerender="dummy"/>
+ <!-- <apex:commandButton styleClass="commandbutton" onclick="qrsacn(1)" value="鎵繍杈撳崟鍙�" rerender="dummy"/> -->
+ <apex:commandButton styleClass="commandbutton" onclick="qrsacn(1)" value="鎵繍杈撳崟鍙�" rerender="dummy" style="margin-left:5px;"/>
+ <!-- 20230423 ljh lightning 鍗囩骇 end -->
+ </td>
+
+ <td style="text-align: right" class="deliveryslip">鍙戣揣-{!$ObjectType.FixtureDeliverySlip__c.fields.DeliveryType__c.label} 锛� </td>
+ <td align="left"><apex:inputField value="{!slip.DeliveryType__c}" style="width:145px;height: 30px;padding: 0;" id="DeliveryType"/></td>
+ </tr>
+ <tr>
+ <td style="text-align: right" class="deliveryslip">鍙戣揣-{!$ObjectType.FixtureDeliverySlip__c.fields.Distributor_method__c.label} 锛� </td>
+ <td align="left"><apex:inputField value="{!slip.Distributor_method__c}" style="width:145px;height: 30px;padding: 0;" id="DistributorMethod"/></td>
+
+ <td style="text-align: right" class="deliveryslip">鍙戣揣-{!$ObjectType.FixtureDeliverySlip__c.fields.DeliveryCompany__c.label} 锛� </td>
+ <td align="left"><apex:inputField value="{!slip.DeliveryCompany__c}" style="width:145px;height: 30px;padding: 0;" id="DeliveryCompany"/></td>
+ </tr>
+ <tr>
+ <td style="text-align: right" class="deliveryslip">鍙戣揣-{!$ObjectType.FixtureDeliverySlip__c.fields.Wh_Staff__c.label} 銆� </td>
+ <td align="left"><apex:inputField styleClass="hideDropdown" value="{!slip.Wh_Staff__c}" style="width:130px;height: 30px;" /></td>
+
+ <td style="text-align: right" class="deliveryslip">鍙戣揣-{!$ObjectType.FixtureDeliverySlip__c.fields.Combine_Pack__c.label} 銆� </td>
+ <td align="left"><apex:inputField styleClass="hideDropdown" value="{!slip.Combine_Pack__c}" style="width:145px;" /></td>
+ </tr>
+ <!-- <tr>
+ <td colspan="2"><apex:inputField value="{!slip.Wh_Staff__c}" style="width:130px;" /></td>
+ </tr> -->
+ </apex:outputPanel>
+ </table>
+ </apex:pageBlock>
</div>
<apex:outputPanel id="detail">
<div id="detailDiv" class="detail">
@@ -322,14 +336,14 @@
<apex:variable var="SetName" value="{!IF(SetName='', esdInfo.rec.TransferApply__r.Name, SetName)}" />
<apex:variable var="SetName2" value="{!IF(SetName2='', esdInfo.rec.TransferApplySummary__c, SetName2)}" />
<apex:outputPanel layout="none" rendered="{!IF(SetName2=esdInfo.rec.TransferApplySummary__c && indexloop != 1, true, false)}">
- <br/>
+ <br/>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.TransferApply__r.Name, false, true)}">
<hr/>
<!-- 20230423 ljh lightning 鍗囩骇 start -->
<!-- <h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.TransferApply__r.Name}</h2> -->
- <div style="padding: 5px;font-weight: bold;" class="detailtab">{!esdInfo.rec.TransferApply__r.Name}</div>
+ <div style="padding: 5px 0.75rem;font-weight: bold;" class="detailtab">{!esdInfo.rec.TransferApply__r.Name}</div>
<!-- <br/> -->
<!-- 20230423 ljh lightning 鍗囩骇 end -->
<apex:variable var="SetName" value="{!esdInfo.rec.TransferApply__r.Name}" />
@@ -347,7 +361,7 @@
</apex:outputPanel>
<!-- 20230423 ljh lightning 鍗囩骇 start -->
<!-- <h2 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h2> -->
- <span style="padding: 5px;font-weight: bold;" class="detailtab">{!esdInfo.fsName}</span>
+ <span style="padding: 5px 0.75rem;font-weight: bold;" class="detailtab">{!esdInfo.fsName}</span>
<!-- 20230423 ljh lightning 鍗囩骇 end -->
<apex:variable var="SetName2" value="{!esdInfo.rec.TransferApplySummary__c}" />
</apex:outputPanel>
@@ -355,7 +369,7 @@
<apex:outputPanel layout="none" rendered="{!IF(indexloop == 1, true, false)}">
<!-- 20230423 ljh lightning 鍗囩骇 start -->
<!-- <h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.TransferApply__r.Name}</h2> -->
- <div style="padding: 5px;font-weight: bold;" class="detailtab">{!esdInfo.rec.TransferApply__r.Name}</div>
+ <div style="padding: 5px 0.75rem;font-weight: bold;" class="detailtab">{!esdInfo.rec.TransferApply__r.Name}</div>
<!-- <br/> -->
<!-- 20230423 ljh lightning 鍗囩骇 end -->
<input type="hidden" value="{!esdInfo.rec.TransferApply__r.Pre_inspection_ng_num__c}" data-ngnum="{!esdInfo.rec.TransferApply__c}"/>
@@ -371,7 +385,8 @@
<h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />
</div></h2>
<!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
- <ul>
+ <!-- 20230718 ljh -->
+ <ul style="padding: 1px 0.75rem;">
<li>
<!-- 20210721 ljh 1719 start -->
<!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result__c.label}锛� </span> -->
@@ -402,16 +417,21 @@
<apex:variable var="indexloop" value="{!indexloop+1}"/>
<apex:variable var="SetName" value="{!IF(SetName='', esdInfo.rec.TransferApplySummary__c, SetName)}" />
<apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.TransferApplySummary__c && indexloop != 1, true, false)}">
- <br/>
+ <!-- 20230718 ljh -->
+ <!-- <br/> -->
</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:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}"><apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="鍒犻櫎" rerender="dummy"/></apex:outputPanel><input type="hidden" value="{!esdInfo.rec.TransferApplySummary__c}"/>
+ <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3>
+ <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}"><apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="鍒犻櫎" rerender="dummy"/></apex:outputPanel><input type="hidden" value="{!esdInfo.rec.TransferApplySummary__c}"/>
<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:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}"><apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="鍒犻櫎" rerender="dummy"/></apex:outputPanel><input type="hidden" value="{!esdInfo.rec.TransferApplySummary__c}"/>
+ <!-- 20230718 ljh -->
+ <!-- <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3> -->
+ <span style="padding: 5px 0.75rem;font-weight: bold;" class="detailtab">{!esdInfo.fsName}</span>
+ <apex:outputPanel layout="none" rendered="{!NOT(esdInfo.hasSended)}"><apex:commandButton styleClass="commandbutton" onclick="deleteDetailJs(this)" style="float:right;margin-top: -2px;" value="鍒犻櫎" rerender="dummy"/></apex:outputPanel><input type="hidden" value="{!esdInfo.rec.TransferApplySummary__c}"/>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!esdInfo.hasSended}">
</apex:outputPanel>
@@ -427,7 +447,8 @@
</h2>
</apex:outputPanel>
<!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
- <ul>
+ <!-- 20230718 ljh -->
+ <ul style="padding: 1px 0.75rem;">
<li>
<!-- 20210721 ljh 1719 start -->
<!-- <span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__c.fields.Inspection_result__c.label}锛� </span> -->
--
Gitblit v1.9.1