From 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期三, 23 八月 2023 14:54:59 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/pages/EquipmentSetShippmentReceived1.page | 141 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 109 insertions(+), 32 deletions(-)
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived1.page b/force-app/main/default/pages/EquipmentSetShippmentReceived1.page
index fee876b..594653a 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived1.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived1.page
@@ -52,8 +52,12 @@
j$(ele).prop("disabled", false);
}
function filljsQR(qrcode) {
+ console.log('qrcode:'+qrcode);
blockme();
- var cbox = j$("[data-qr='"+qrcode+"']").children("input[type='checkbox']");
+ // 20230616 ljh start
+ // var cbox = j$("[data-qr='"+qrcode+"']").children("input[type='checkbox']");
+ var cbox = j$("[data-qr='"+qrcode+"']").children().children("input[type='checkbox']");
+ // 20230616 ljh end
if (cbox.size() > 1) {
alert("鏁伴噺绠＄悊闄勫睘鍝佽鎵嬪姩鎵撳嬀锛�");
}else {
@@ -66,6 +70,7 @@
function checkMessage() {
if (j$(escapeVfId('allPage:allForm:done_flg')).val() == 'true') {
alert("淇濆瓨瀹屼簡");
+ window.location.reload(false);
}
}
@@ -84,11 +89,15 @@
</script>
<style type="text/css">
.menu div.m_title{
- width: 308px;
+ /*width: 308px;*//*20230616 ljh*/
text-align: left;
margin: 0;
+ /*20230623 ljh start*/
background:#DCDCDC;
+ /* background:#95aee5; */
+ /*20230623 ljh end*/
/*height: 42px;*/
+ padding-left: 0.75rem;/*20230628 ljh*/
}
.dateFormat {
display: none;
@@ -105,7 +114,8 @@
#Step_tab li {
position: relative;
/* 2023-04-23 zyh lightning鍗囩骇 start */
- width: 30%;
+ /*width: 30%;*/
+ width: 50%;/*20230616 ljh*/
/* width: 20%; */
/* 2023-04-23 zyh lightning鍗囩骇 end */
float: left;
@@ -113,6 +123,10 @@
padding: 0;
text-align: center;
cursor: pointer;
+ /*20230616 ljh*/
+ height:30px;
+ line-height: 30px;
+ /*20230616 ljh*/
}
#Step_tab li span {
margin: 0;
@@ -128,13 +142,18 @@
#Step_tab li.selected span {
color: #fff;
}
-
- div#main {
+ /*20230615 ljh*/
+ /*div#main {
width: 320px;
- }
+ }*/
div.rtop, div.rbottom {display:block; background: transparent; font-size:1px;}
- div.rtop div {background:#DCDCDC;}
+ div.rtop div {
+ /*20230623 ljh start*/
+ background:#DCDCDC;
+ /* background:#95aee5; */
+ /*20230623 ljh end*/
+ }
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;}
@@ -147,7 +166,10 @@
color: #fff;
background-color: #fff;
height: 1px;
- width: 90%;
+ /*20230620 ljh*/
+ /*width: 90%;*/
+ width: 98%;
+ /*20230620 ljh*/
}
.close {
color: #aaaaaa;
@@ -184,7 +206,7 @@
</div>
<apex:form id="allForm">
- <apex:actionFunction name="save" action="{!save}" rerender="detail,message,done_flg" onComplete="unblockUI();checkMessage();resetDetailDivMargintop();" />
+ <apex:actionFunction name="save" action="{!save}" rerender="detail,message,done_flg" onComplete="unblockUI();checkMessage();" />
<apex:actionFunction name="Shippment1" action="{!Shippment1}" />
<apex:actionFunction name="Shippment2" action="{!Shippment2}" />
<apex:inputHidden value="{!done_flg}" id="done_flg"/>
@@ -193,18 +215,20 @@
<apex:outputPanel id="message">
<apex:pageMessages />
</apex:outputPanel>
- <div style="text-align: right;margin-top: 10px;">
+ <!-- 20230616 ljh start-->
+ <!-- <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;"/>
+ </div> -->
+ <!-- <apex:outputText id="saveBtnDisabled" value="{!saveBtnDisabled}" style="display: none;"/> -->
+ <!-- 20230616 ljh end-->
<!-- <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;">
+ <!-- <table style="border-collapse: collapse; font-size:13px;">
<colgroup>
<col width="150" />
<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)}">
@@ -217,14 +241,41 @@
</ul>
</th>
</tr>
- </table>
- <div style="text-align: right">
+ </table> -->
+ <!-- <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="" />
@@ -232,16 +283,17 @@
<apex:variable var="indexloop" value="{!indexloop+1}"/>
<apex:variable var="SetName" value="{!IF(SetName='', esdInfo.rec['Rental_Apply_Equipment_Set__r'].Id, SetName)}" />
<apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec['Rental_Apply_Equipment_Set__r'].Id && indexloop != 1, true, false)}">
- <br/>
+ <!-- <br/> -->
+ <!-- 20230623 ljh -->
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec['Rental_Apply_Equipment_Set__r'].Id, false, true)}">
<hr/>
- <h3 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}锛歿!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h3>
+ <h3 style="padding: 5px 0.75rem;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}锛歿!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h3>
<apex:variable var="SetName" value="{!esdInfo.rec['Rental_Apply_Equipment_Set__r'].Id}" />
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!IF(indexloop == 1, true, false)}">
- <h3 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}锛歿!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h3>
+ <h3 style="padding: 5px 0.75rem;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}锛歿!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h3>
</apex:outputPanel>
<div class="rtop">
<div class="r1"></div>
@@ -251,9 +303,12 @@
</div>
<div class="menu">
<h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� start -->
+ <span>(<apex:outputField value="{!esdInfo.rec.SerialNumber_F__c}" style="margin:3px;width:75px;"/>)</span>
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� end -->
</div></h2>
<!-- TODO 鍥炲簱銇疭et鍗樹綅銇с�佹槑绱颁竴銇や竴銇ゃ伄quickCheck瑕併倝銇亜銇屻�丼et銇畄uickCheck瑕併倠锛� -->
- <ul style="{!IF(esdInfo.quickCheck, 'background:#BBFF66;', '')}">
+ <ul style="padding: 1px 0.75rem; {!IF(esdInfo.quickCheck, 'background:#A3DE59;', '')}">
<apex:outputPanel layout="none" rendered="{!IF(Step_status='涓嬫灦', true, false)}">
<!-- <div style="position: relative; padding-left: 50px; background:{!IF(esdInfo.quickCheck, '#BBFF66', '')}"> -->
<li data-qr="{!esdInfo.rec.Fixture_QRCode_F__c}">
@@ -262,13 +317,15 @@
<span>涓嬫灦锛� </span>
<!-- 202107721 ljh 1719 end -->
<apex:outputPanel layout="none" rendered="{!esdInfo.editable}">
- <!-- 2023-04-23 zyh lightning鍗囩骇 start -->
- <apex:inputField id="inspectionResult" value="{!esdInfo.rec.StockDown__c}" style="margin:3px;" />
+ <!-- 20230616 ljh -->
<!-- <apex:inputField id="inspectionResult" value="{!esdInfo.rec.StockDown__c}" style="margin:3px;width:75px;" /> -->
- <!-- 2023-04-23 zyh lightning鍗囩骇 end -->
+ <span><apex:inputField id="inspectionResult" value="{!esdInfo.rec.StockDown__c}" style="margin:3px;" /></span>
+ <!-- 20230616 ljh -->
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
- <span><apex:outputField id="inspectionResult1" value="{!esdInfo.rec.StockDown__c}" style="margin:3px;width:75px;" /></span>
+ <span style="height: 35px;line-height: 35px;">
+ <!-- 20230620 ljh style="height: 35px;line-height: 35px;" -->
+ <apex:outputField id="inspectionResult1" value="{!esdInfo.rec.StockDown__c}" style="margin:3px;width:75px;" /></span>
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!esdInfo.rec.FSD_OneToOneAccessory_Cnt__c > 0 && esdInfo.rec.Is_Body__c}">
<input type="hidden" name="onetoone_main" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/>
@@ -282,6 +339,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>
+ <!-- 20230721 ljh 鏈鸿韩缂栫爜鎹綅缃� -->
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� start -->
+ <!-- <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> -->
+ <!-- 2023-08-01 zyh 鏈鸿韩缂栧彿鎹㈠湴鏂� end -->
<li>
<span>涓婃鍥炴敹鍚庢娴嬫椂闂达細 </span>
<span><apex:outputField value="{!esdInfo.rec.Asset__r.Pre_Reserve_RAES_Detail__r.After_Inspection_time__c}" style="margin:3px;width:75px;"/></span>
@@ -290,10 +354,11 @@
<span>{!$ObjectType.Rental_Apply_Equipment_Set_Detail__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>
+ <!-- 20230721 ljh 鏈鸿韩缂栫爜鎹綅缃� -->
+ <!-- <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> -->
<!-- </div> -->
</apex:outputPanel>
</ul>
@@ -310,17 +375,29 @@
</apex:outputPanel>
</div>
<script type="text/javascript">
+ // var standalone = window.navigator.standalone,
+ // userAgent = window.navigator.userAgent.toLowerCase(),
+ // safari = /safari/.test( userAgent ),
+ // ios = /iphone|ipod|ipad/.test( userAgent ),
+ // ver = (navigator.userAgent).match(/OS (\d)?\d_\d(_\d)?/i)[0].split('_')[0].replace("OS ","");
+
+ // let scanner = new Instascan.Scanner({ video: document.getElementById('preview'), refractoryPeriod: 5000,scanPeriod: 5 ,mirror: false});
+ // scanner.addListener('scan', function (content) {
+ // filljsQR(content);
+ // });
var standalone = window.navigator.standalone,
userAgent = window.navigator.userAgent.toLowerCase(),
safari = /safari/.test( userAgent ),
ios = /iphone|ipod|ipad/.test( userAgent ),
- ver = (navigator.userAgent).match(/OS (\d)?\d_\d(_\d)?/i)[0].split('_')[0].replace("OS ","");
-
- let scanner = new Instascan.Scanner({ video: document.getElementById('preview'), refractoryPeriod: 5000,scanPeriod: 5 ,mirror: false});
+ ver = '';
+ if (ios) {
+ ver = (navigator.userAgent).match(/OS (\d)?\d_\d(_\d)?/i)[0].split('_')[0].replace("OS ","");
+ }
+ let scanner = new Instascan.Scanner({ video: document.getElementById('preview'), scanPeriod: 5 ,mirror: false});
scanner.addListener('scan', function (content) {
filljsQR(content);
});
-
+
function qrsacn() {
if (!standalone && !safari && ios) {
window.location.href="sfqr://scan";
--
Gitblit v1.9.1