From 1b214a96d371ce90578fb7d6c14eecfcba5f87f0 Mon Sep 17 00:00:00 2001
From: 涂煌豪 <tuhuanghao@prec-tech.com>
Date: 星期一, 11 四月 2022 18:52:32 +0800
Subject: [PATCH] Sfdc2PoContactBatch修改
---
force-app/main/default/pages/ConsumEquipmentSetShipment.page | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/force-app/main/default/pages/ConsumEquipmentSetShipment.page b/force-app/main/default/pages/ConsumEquipmentSetShipment.page
index 3d47fe9..af4d90c 100644
--- a/force-app/main/default/pages/ConsumEquipmentSetShipment.page
+++ b/force-app/main/default/pages/ConsumEquipmentSetShipment.page
@@ -36,12 +36,12 @@
height: 100px;
width: 30px;
}
-/* add by rentx 2021-10-21 start 璁剧疆灞曠ず妗�
+/* add by rentx 2021-10-21 start 璁剧疆灞曠ず妗� */
.col_EquipmentManagementCode__c {display: none;}
.col_Scroll{display: none;}
.dataRow.col_Scroll{display: none;}
.col_ManagementCode__c{display: none;}
- */
+
.modal
{
display:none;
@@ -142,8 +142,9 @@
<apex:commandButton onclick="qrsacn(0);return false;" value="鎵竴鎵�楁潗" rerender="allForm"/>
<apex:commandButton onclick="qrsacn(1);return false;" value="鎵竴鎵墿娴佸崟" rerender="allForm"/>
<apex:commandButton onclick="blockme();" action="{!send}" value="鍙戣揣" rerender="message" oncomplete="unblockUI();checkMessage();checEventFrame()"/>
- <!-- add wangweipeng 2021/01/10 start -->
- <apex:commandButton onclick="window.open('/apex/ConsumTrialPDF?id={!parentId}');" value="璇曠敤琛�" rerender="allForm"/>
+ <!-- add wangweipeng 2021/01/10 /apex/ConsumTrialPDF?id={!parentId} ConsumEquipmentSetShipmentPDF start -->
+ <apex:commandButton onclick="window.open('ConsumTrialPDF?id={!parentId}');" value="璇曠敤琛�" rerender="allForm"/>
+ <!--<a href="openSafri/apex/ConsumTrialPDF?id={!parentId}">璇曠敤琛�</a> -->
<!-- add wangweipeng 2021/01/10 end -->
<!-- add by rentx 2021-10-21 start 鏂板鐮佹灙鎵弿 -->
<apex:commandButton onclick="document.getElementById('maqCode').focus();return false" id="maqCodeBtn" value="鐮佹灙鎵弿锛�" style="padding: 6px;font-size: 110%;margin-right: 1px;"/>
@@ -181,7 +182,8 @@
<td >
<apex:outputLabel for="slipNo" value="鍙戣揣-杩愯緭鍗曞彿锛�" />
<apex:inputField id="slipNo" value="{!slip.Name}"/>
- <apex:commandButton action="{!searchSlip}" value="妫�绱�" style="padding: 6px;font-size: 110%;" rerender="allForm" oncomplete="checEventFrame()"/>
+ <!-- <apex:commandButton action="{!searchSlip}" value="妫�绱�" style="padding: 6px;font-size: 110%;" rerender="allForm" oncomplete="checEventFrame()"/> -->
+ <apex:commandButton action="{!searchSlip}" value="妫�绱�" style="padding: 6px;font-size: 110%;" rerender="searchBlock" oncomplete="checEventFrame()"/>
</td>
<td width="10px"></td>
<td >
@@ -243,6 +245,7 @@
j$("#tableData input[type=text]").on('change', function() {
let rownum = j$(this)[0].id.match(/oppTable\:(\d*)/)[1];
+ alert('====rownum=='+rownum);
j$('input[name$="oppTable_L:'+rownum+':rowCheck"]').prop('checked', true).trigger("change");
})
@@ -254,8 +257,8 @@
}
}
//20220215 瀛楁闆嗕腑鐨勮緭鍏ユ鍙樻垚鍙锛屼笉鑳界洿鎺ュ彉鎴恠pan锛屽惁鍒欏悗鍙板彇涓嶅埌鍊�
- j$("#tableData input[type=text]").attr("readonly",true);
- j$("#tableData input[type=text]").attr("disabled","disabled");
+ //j$("#tableData input[type=text]").attr("readonly",true); 鍏堥殣钘忔帀
+ //j$("#tableData input[type=text]").attr("disabled","disabled");
</script>
</apex:outputPanel>
</apex:outputPanel>
@@ -320,6 +323,9 @@
return false;
}
//鍒ゆ柇杩欎釜灏忕爜code 鏄惁绗﹀悎瑕佹眰 1:闀垮害鏄惁姝ｇ‘ 2:鏄惁閲嶅杈撳叆 3:杈撳叆鐨勬槸鍚︿负3浣嶆暟瀛�
+ // var regNeg = /^[1-9]+[0-9]*]*$/; // 璐熸暣鏁�
+ //z<0||!(/^\d+$/.test(z))
+ // && nowCode>=0 && (/^\d+$/.test(nowCode))
if(nowCode != null && nowCode.length == 3 && !isNaN(nowCode)){
//鑾峰彇鎵弿杩囩殑灏忕爜
var tableId = document.getElementById("detailTb");
@@ -480,7 +486,7 @@
var code = paobj[0].children[9].children[0].value; //.innerText;
var hecode = paobj[0].children[10].children[0].value; //.innerText;
- alert('xiaoma'+code);
+ //alert('xiaoma'+code);
if (code != null && code.length > 0) {
//鍚戝脊鍑烘閲屾坊鍔犳槑缁嗚
var arr = code.split(',');
@@ -513,7 +519,7 @@
//j$(".modal").hide();
j$("#myModal1").hide();
scanType = null;
-
+ j$("#maqCode").focus();
if(numflag == 0 ){
//鐢ㄦ埛鐐瑰嚮淇濆瓨 1.璁剧疆鏁伴噺鍒板彂璐т欢鏁颁笂 2.璁剧疆灏忕爜鍒版槑缁嗙殑澶囧搧绠＄悊鐮佷笂
if(numObj != null){
@@ -669,11 +675,12 @@
checkObj.prop('checked', false);
}
var maqCode = j$( '#maqCode' ).val();
- alert('==='+j$( '#maqCode' ).val());
- if (maqCode !='' && maqCode !=undefined){
+ //alert('==='+j$( '#maqCode' ).val());
+ //if (maqCode !='' && maqCode !=undefined){
j$("#maqCode").val("");
j$("#maqCode").focus();
- }
+ setTimeout(function(){j$("#maqCode").focus();},300);
+ //}
}
// <!-- add by qiuyj 2021-11-30 start pc绔壂鐮佹敮鎸�-->
j$(document).ready(function(){
@@ -687,6 +694,8 @@
return false;
}
});
+ setTimeout(function(){j$("#maqCode").focus();},300);
+
});
// add by qiuyj 2021-11-30 end pc绔壂鐮佹敮鎸�
// add by rentx 2021-10-19 end 鑰楁潗杩芥函 -鐮佹灙鎵爜涔嬪悗灞曠ず寮瑰嚭妗�
@@ -777,8 +786,10 @@
try{
if (scanType == 1) {
j$("input[name$='slipNo']").val(content);
+ scanType = null;
}else if(scanType == 2){//add by youc 2021-12-01 寮瑰嚭妗嗕腑ipad鎵弿灏忕爜
checkipadXiaoMa(content);
+ scanType = null;
} else {
var tracingCode = content.substr(-8);//鎴彇鍚�8浣�
@@ -996,6 +1007,7 @@
j$("#qrcode").focus();
//add by qiuyj 2021-11-30 end pc绔壂鐮佹敮鎸�-->
//alert('鎵弿鏉″舰鐮佽浣跨敤App');
+
}
}
--
Gitblit v1.9.1