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/InventoryResultRecordCopy.page | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/force-app/main/default/pages/InventoryResultRecordCopy.page b/force-app/main/default/pages/InventoryResultRecordCopy.page
index 9512749..de37d3f 100644
--- a/force-app/main/default/pages/InventoryResultRecordCopy.page
+++ b/force-app/main/default/pages/InventoryResultRecordCopy.page
@@ -6,8 +6,8 @@
<apex:includeScript value="{!URLFOR($Resource.instascan)}"/>
<apex:stylesheet value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.css')}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.js')}"/>
-<apex:includeScript value="/soap/ajax/46.0/connection.js"/>
-<apex:includeScript value="/soap/ajax/46.0/apex.js"/>
+<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
+<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
<style>
.overlay {
position: absolute;
@@ -256,7 +256,9 @@
// 妫�绱㈡寜閽�
function searchBtnJs() {
blockme();
- searchBtnFunc();
+ alert('娌＄敤鍒扮殑鍔熻兘锛屼笉瑕佺偣浜嗭紝鍝堝搱鍝�');
+ unblockUI();
+ // searchBtnFunc();
}
function hasChangeFunc() {
hasChange = true;
@@ -336,7 +338,8 @@
</apex:selectList>
<br/>
<br/>
- <apex:commandButton action="{!save}" value="纭畾" reRender="allForm" onclick="blockme()" oncomplete="unblockUI();j$('#myModal3').hide();changeFullScreen(true);if(j$(escapeVfId('allPage:allForm:doneFlg')).val()=='true') alert('淇濆瓨瀹屼簡')"/>
+ <!-- action="{!save}" -->
+ <apex:commandButton value="纭畾" reRender="allForm" onclick="blockme()" oncomplete="unblockUI();j$('#myModal3').hide();changeFullScreen(true);if(j$(escapeVfId('allPage:allForm:doneFlg')).val()=='true') alert('淇濆瓨瀹屼簡')"/>
<apex:commandButton style="margin-left: 60px;" value="鍙栨秷" onclick="j$('#myModal3').hide();return false;"/>
</div>
@@ -344,7 +347,9 @@
<apex:actionFunction name="startInventory" action="{!startInventory}" rerender="allForm" onComplete="unblockUI()" />
<!-- update by rentx 20210827 start 鑰楁潗鐩樼偣鏂规 -->
<!-- <apex:actionFunction name="searchBtnFunc" action="{!searchBtn}" rerender="allForm" onComplete="unblockUI();changeFullScreen(true);" /> -->
- <apex:actionFunction name="searchBtnFunc" action="{!searchBtn}" rerender="allForm" onComplete="unblockUI();changeFullScreen(true);addHistory();" />
+ <!-- 20220228 ljh 113鐩樼偣start -->
+ <!-- <apex:actionFunction name="searchBtnFunc" action="{!searchBtn}" rerender="allForm" onComplete="unblockUI();changeFullScreen(true);addHistory();" /> -->
+ <!-- 20220228 ljh 113鐩樼偣end -->
<!-- update by rentx 20210827 end 鑰楁潗鐩樼偣鏂规 -->
<!-- <apex:actionFunction name="checkQRCode" action="{!checkQRCode}" rerender="qrType,qrError,qrId,repeat_panel" onComplete="checkQRDone()" >
<apex:param name="qrcode" value="" />
--
Gitblit v1.9.1