From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/EquipmentSetShippmentReceived3.page | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived3.page b/force-app/main/default/pages/EquipmentSetShippmentReceived3.page
index 9ef04ae..887c19c 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived3.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived3.page
@@ -1,4 +1,4 @@
-<apex:page Controller="EquipmentSetShippmentReceived3Controller" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="澶囧搧鍑哄簱鍏ュ簱">
+<apex:page Controller="EquipmentSetShippmentReceived3Controller" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="澶囧搧鍑哄簱鍏ュ簱" lightningStylesheets="true">
<head>
<meta name="format-detection" content="telephone=no"/>
</head>
@@ -71,9 +71,9 @@
}
function fixDeliveryType() {
- j$(escapeVfId('allPage:allForm:DeliveryType')).children().each(function() {
- if (this.value == '鍥炲瘎') j$(this).remove();
- })
+ j$(escapeVfId('allPage:allForm:DeliveryType')).children().each(function() {
+ if (this.value == '鍥炲瘎') j$(this).remove();
+ })
}
function resetDetailDivMargintop() {
@@ -189,7 +189,7 @@
<p>鎵弿涓�</p>
<p>Code:<input type="text" id="qrcode"/></p>
<video playsinline="true" id="preview" style="width: 100%;z-index: 11;transform: scaleX(-1);margin-top: 10px;"></video>
- 鎵爜灞ュ巻锛�
+ 鎵爜灞ュ巻锛�
<ul id="scanedqr" style="list-style-type: none; text-align: center;padding: 0;width: 100%; height: 100px; overflow: auto">
</ul>
</div>
@@ -319,7 +319,7 @@
<br/>
<apex:variable var="SetName" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}" />
<apex:variable var="applychange" value="{!1}" />
- <input type="hidden" value="{!esdInfo.rec.Rental_Apply__r.Pre_inspection_ng_num__c}" data-ngnum="{!esdInfo.rec.Rental_Apply__c}"/>
+ <!-- 20230220 ljh uat 涓存椂娉ㄩ噴 <input type="hidden" value="{!esdInfo.rec.Rental_Apply__r.Pre_inspection_ng_num__c}" data-ngnum="{!esdInfo.rec.Rental_Apply__c}"/> -->
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!IF(SetName2=esdInfo.rec.Rental_Apply_Equipment_Set__r.Id, false, true)}">
@@ -329,7 +329,7 @@
<apex:variable var="applychange" value="{!0}" />
<apex:outputPanel layout="none" rendered="{!IF(esdInfo.rec.Rental_Apply_Equipment_Set__r.Inspection_not_finish__c > 0, false, true)}">
<apex:inputCheckbox value="{!esdInfo.isChecked}"/><input type="hidden" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/><input type="hidden" value="{!esdInfo.rec.Rental_Apply__c}"/>
- </apex:outputPanel>
+ </apex:outputPanel>
<h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Name}锛歿!esdInfo.rec.Rental_Apply_Equipment_Set__r.Fixture_Set__r.Name}</h2>
<apex:variable var="SetName2" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Id}" />
</apex:outputPanel>
@@ -337,10 +337,10 @@
<apex:outputPanel layout="none" rendered="{!IF(indexloop == 1, true, false)}">
<h2 style="padding: 5px;" class="detailtab">{!esdInfo.rec.Rental_Apply_Equipment_Set__r.Rental_Apply__r.Name}</h2>
<br/>
- <input type="hidden" value="{!esdInfo.rec.Rental_Apply__r.Pre_inspection_ng_num__c}" data-ngnum="{!esdInfo.rec.Rental_Apply__c}"/>
+ <!-- 20230220 ljh uat 涓存椂娉ㄩ噴 <input type="hidden" value="{!esdInfo.rec.Rental_Apply__r.Pre_inspection_ng_num__c}" data-ngnum="{!esdInfo.rec.Rental_Apply__c}"/> -->
<apex:outputPanel layout="none" rendered="{!IF(esdInfo.rec.Rental_Apply_Equipment_Set__r.Inspection_not_finish__c > 0, false, true)}">
<apex:inputCheckbox value="{!esdInfo.isChecked}"/><input type="hidden" value="{!esdInfo.rec.Rental_Apply_Equipment_Set__c}"/><input type="hidden" value="{!esdInfo.rec.Rental_Apply__c}"/>
- </apex:outputPanel>
+ </apex:outputPanel>
<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>
</apex:outputPanel>
<div class="rtop">
@@ -496,7 +496,7 @@
j$("#scanedqr").children().remove();
}
j$(document).ready(function(){
- j$( '#qrcode' ).unbind();
+ j$( '#qrcode' ).unbind();
j$( '#qrcode' ).keypress( function ( e ) {
if ( e.which == 13 ) {
filljsQR(j$( '#qrcode' ).val());
--
Gitblit v1.9.1