From be102ae06e8f986bd9d1a544cd2752e5fa94231a Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期二, 11 七月 2023 14:23:51 +0800
Subject: [PATCH] LEX Community Deploy0711
---
force-app/main/default/pages/TransferShippmentReceived3.page | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/force-app/main/default/pages/TransferShippmentReceived3.page b/force-app/main/default/pages/TransferShippmentReceived3.page
index 513365f..a1e0d94 100644
--- a/force-app/main/default/pages/TransferShippmentReceived3.page
+++ b/force-app/main/default/pages/TransferShippmentReceived3.page
@@ -183,11 +183,16 @@
list-style: none;
border-top: 1px solid #ddd;
}
+ /* 20230423 ljh lightning 鍒囨崲 start */
+ .lookupInput input{
+ width: 140px;
+ }
+ /* 20230423 ljh lightning 鍒囨崲 end */
</style>
<div id="myModal" class="modal">
- <!-- Modal content -->
- <div class="modal-content">
+ <!-- Modal content -->
+ <div class="modal-content">
<span class="close" onclick="stopScan()">×</span>
<p>鎵弿涓�</p>
<p>Code:<input type="text" id="qrcode"/></p>
@@ -195,7 +200,7 @@
鎵爜灞ュ巻锛�
<ul id="scanedqr" style="list-style-type: none; text-align: center;padding: 0;width: 100%; height: 100px; overflow: auto">
</ul>
- </div>
+ </div>
</div>
<apex:form id="allForm">
@@ -322,8 +327,11 @@
<apex:outputPanel layout="none" rendered="{!IF(SetName=esdInfo.rec.TransferApply__r.Name, false, true)}">
<hr/>
- <h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.TransferApply__r.Name}</h2>
- <br/>
+ <!-- 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>
+ <!-- <br/> -->
+ <!-- 20230423 ljh lightning 鍗囩骇 end -->
<apex:variable var="SetName" value="{!esdInfo.rec.TransferApply__r.Name}" />
<apex:variable var="applychange" value="{!1}" />
<input type="hidden" value="{!esdInfo.rec.TransferApply__r.Pre_inspection_ng_num__c}" data-ngnum="{!esdInfo.rec.TransferApply__c}"/>
@@ -346,15 +354,18 @@
<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>
- <br/> -->
+ <!-- <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>
+ <!-- <br/> -->
<!-- 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}"/>
</apex:outputPanel>
- <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3>
+ <!-- 20230423 ljh lightning 鍗囩骇 start -->
+ <!-- <h3 style="padding: 5px;" class="detailtab">{!esdInfo.fsName}</h3> -->
+ <span style="padding: 5px;font-weight: bold;" class="detailtab">{!esdInfo.fsName}</span>
+ <!-- 20230423 ljh lightning 鍗囩骇 end -->
</apex:outputPanel>
<div class="menu">
<h2><div class="m_title"> <apex:outputField value="{!esdInfo.rec.Fixture_Name_F__c}" />
@@ -454,7 +465,7 @@
}
let scanner = new Instascan.Scanner({ video: document.getElementById('preview'), scanPeriod: 5 ,mirror: false});
scanner.addListener('scan', function (content) {
- filljsQR(content);
+ filljsQR(content);
});
function qrsacn(stype) {
@@ -464,17 +475,17 @@
} else {
j$(".modal").show();
Instascan.Camera.getCameras().then(function (cameras) {
- if (cameras.length > 0) {
+ if (cameras.length > 0) {
if (ver >= 13) {
scanner.start(cameras[1]);
} else {
scanner.start(cameras[0]);
}
- } else {
+ } else {
console.error('No cameras found.');
- }
+ }
}).catch(function (e) {
- console.error(e);
+ console.error(e);
});
}
}
--
Gitblit v1.9.1