From ddb0231ef7c5cf2bad9d3f1afc2f733674ad38a5 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期四, 24 八月 2023 14:50:51 +0800
Subject: [PATCH] 再修理按钮
---
force-app/main/default/pages/TransferShippmentReceived1.page | 81 ++++++++++++++++++++++++++++++++++------
1 files changed, 68 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/pages/TransferShippmentReceived1.page b/force-app/main/default/pages/TransferShippmentReceived1.page
index 8318173..30f73f1 100644
--- a/force-app/main/default/pages/TransferShippmentReceived1.page
+++ b/force-app/main/default/pages/TransferShippmentReceived1.page
@@ -86,11 +86,12 @@
</script>
<style type="text/css">
.menu div.m_title{
- width: 308px;
+ /* width: 308px; *//* 20230718 ljh */
text-align: left;
margin: 0;
background:#DCDCDC;
border-radius:8px 8px 0 0;
+ padding-left: 0.75rem;/*20230628 ljh*/
}
.menu {
border-radius:8px;
@@ -113,13 +114,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;
@@ -137,7 +142,7 @@
}
div#main {
- width: 320px;
+ /* width: 320px; */
}
hr {
@@ -145,7 +150,10 @@
color: #fff;
background-color: #fff;
height: 1px;
- width: 90%;
+ /*20230620 ljh*/
+ /*width: 90%;*/
+ width: 98%;
+ /*20230620 ljh*/
}
.close {
color: #aaaaaa;
@@ -165,6 +173,11 @@
list-style: none;
border-top: 1px solid #ddd;
}
+ /*20230625 ljh */
+ .errorMsg{
+ width: 140px;
+ }
+ /*20230625 ljh */
</style>
<div id="myModal" class="modal">
@@ -191,7 +204,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" rendered="{!IF(open_type='web', true, false)}" disabled="{!saveBtnDisabled}"/>
</div>
<apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/>
@@ -201,7 +214,7 @@
<col width="170" />
</colgroup>
<tr>
- <!-- 鐘舵�佸垏鎹tn -->
+ 鐘舵�佸垏鎹tn
<th colspan="2" style="font-size:20px;text-align: center;width:380px;">
<ul id="Step_tab">
<apex:outputPanel layout="none" rendered="{!IF(SR_status='Shippment', true, false)}">
@@ -218,10 +231,37 @@
<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(this);" 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;">
+ <apex:outputPanel layout="none" rendered="{!IF(SR_status='Shippment', true, false)}">
+ <apex:outputPanel layout="none" rendered="{!IF(Step_status='涓嬫灦', true, false)}">
+ <li class="selected" ><span class="tabsize">涓嬫灦</span></li>
+ <li onclick="javascript:Shippment2();"><span class="tabsize">鍑哄簱妫�娴�</span></li>
+ </apex:outputPanel>
+ </apex:outputPanel>
+ </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(this);" value="鍏ㄩ儴OK" rerender="dummy" rendered="{!IF(Step_status='涓嬫灦', true, false)}"/>
+ <!-- 20230616 ljh start-->
+ <apex:commandButton styleClass="commandbutton" onclick="savejs();" value="淇濆瓨" rerender="dummy" rendered="{!IF(open_type='web', true, false)}" disabled="{!saveBtnDisabled}"/>
+ <!-- 20230616 ljh end-->
+ </th>
+ </tr>
+ </table>
+ </apex:pageBlock>
</div>
<apex:outputPanel id="detail">
-
<div id="detailDiv" class="detail">
<apex:variable var="indexloop" value="{!0}" />
<apex:variable var="SetName" value="" />
@@ -229,20 +269,26 @@
<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/>
+ <!-- <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>
+ <!-- 20230718 ljh -->
+ <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>
+ <!-- 20230718 ljh -->
+ <h3 style="padding: 5px 0.75rem;" class="detailtab">{!esdInfo.fsName}</h3>
</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="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
+ <ul style="padding: 1px 0.75rem;{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
<apex:outputPanel layout="none" rendered="{!IF(Step_status='涓嬫灦', true, false)}">
<li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}">
<span>{!$ObjectType.TransferApplyDetail__c.fields.StockDown__c.label}锛� </span>
@@ -270,6 +316,13 @@
<span>{!$ObjectType.Asset.fields.WH_location__c.label}锛� </span>
<span><apex:outputField value="{!esdInfo.rec.Asset__r.WH_location__c}" style="margin:3px;width:75px;"/></span>
</li>
+ <!-- 20230718 ljh 鎹㈠埌涓嬫灦纭涓嬮潰-->
+ <!-- 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> -->
+ <!-- 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>
@@ -278,10 +331,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>
<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> -->
</apex:outputPanel>
</ul>
</div>
--
Gitblit v1.9.1