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/ConsumEquipmentSetShipment.page | 71 +++++++++++++++++++++++++++--------
1 files changed, 55 insertions(+), 16 deletions(-)
diff --git a/force-app/main/default/pages/ConsumEquipmentSetShipment.page b/force-app/main/default/pages/ConsumEquipmentSetShipment.page
index 3d47fe9..d539547 100644
--- a/force-app/main/default/pages/ConsumEquipmentSetShipment.page
+++ b/force-app/main/default/pages/ConsumEquipmentSetShipment.page
@@ -1,4 +1,4 @@
-<apex:page Controller="ConsumEquipmentSetShipmentController" showHeader="false" sidebar="false" id="allPage" action="{!init}" >
+<apex:page Controller="ConsumEquipmentSetShipmentController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true" >
<head>
<meta name="format-detection" content="telephone=no"/>
<meta name="viewport" content="width=device-width,initial-scale=1"/>
@@ -7,8 +7,8 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
-<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)}"/>
<apex:stylesheet value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.css')}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery_confirm, 'jquery-confirm.min.js')}"/>
<style type="text/css">
@@ -36,12 +36,13 @@
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;}
- */
+.col_boxbarcodeforReceipt__c{display: none;}
+
.modal
{
display:none;
@@ -142,8 +143,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 +183,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 +246,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 +258,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 +324,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");
@@ -416,6 +423,8 @@
document.getElementById("bianma").innerHTML = bianma;
//缁欐槑缁嗚璧嬬鐞嗙紪鐮�
//paobj[0].children[10].children[0].value = bianma;
+
+ j$("#havCode").val(maqCode);
c = bianma;
}else if(content250 !='' && content250 !=undefined && content250.substring(content250.length - 8,content250.length - 5) == '250'){
//璁剧疆绠＄悊缂栫爜
@@ -424,8 +433,9 @@
document.getElementById("bianma").innerHTML = bianma;
//缁欐槑缁嗚璧嬬鐞嗙紪鐮�
//paobj[0].children[10].children[0].value = bianma;
- c = bianma;
+ j$("#havCode").val(content250);
+ c = bianma;
}
//鍒ゆ柇褰撳墠鎵弿鏄惁鎹㈢洅浜�
if(c != null && c != '' && c != undefined){
@@ -480,7 +490,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 +523,7 @@
//j$(".modal").hide();
j$("#myModal1").hide();
scanType = null;
-
+ j$("#maqCode").focus();
if(numflag == 0 ){
//鐢ㄦ埛鐐瑰嚮淇濆瓨 1.璁剧疆鏁伴噺鍒板彂璐т欢鏁颁笂 2.璁剧疆灏忕爜鍒版槑缁嗙殑澶囧搧绠＄悊鐮佷笂
if(numObj != null){
@@ -545,14 +555,17 @@
if(rowObj != null){
//鑾峰彇褰撳墠鎵殑鐩�
var newHe = document.getElementById("bianma").innerHTML;
+ var newHe1 = document.getElementById("havCode").value;
//鍙栧緱鎵�鏈夊皬鐮� 鏀惧埌澶囧搧绠＄悊鐮佷笂
//娉ㄦ剰锛氭湁涓ょ鎯呭喌锛屽鏋滄娆℃壂鐨勫皬绫崇殑鐩掓槸宸茬粡鎵繃鐨勶紝閭ｄ箞鐩存帴鍔犲氨琛岋紝濡傛灉姝ゆ鐨勭洅娌℃湁鎵繃锛岃�屽師鏉ヤ篃鏈夊凡缁忔壂杩囩殑鐩掞紝閭ｄ箞灏遍渶瑕佺壒娈婂鐞�
var tableId = document.getElementById("detailTb");
var str = '';
var str1 = '';
+ var str2 = '';
var numstr = 0;
var he = rowObj[0].children[10].children[0].value;
var xiaoma = rowObj[0].children[9].children[0].value;
+ var he1 = rowObj[0].children[11].children[0].value;
if(tableId.rows.length > 0){//鍒ゆ柇姝ゆ鎵殑鐩掓槸鍚︽湁灏忕爜
//棣栧厛鍒ゆ柇褰撳墠鏄庣粏鍘熸潵鏄惁宸茬粡鎵繃鐮�
//濡傛灉娌℃壂杩� 閭ｄ箞鍦ㄥ師鏉ョ殑 澶囧搧绠＄悊鐮併�佺鐞嗙紪鐮佸拰鍙戣揣浠舵暟鐨勫�间笂閮介渶瑕佸姞涓婃娆℃壂鐨勫皬鐮�
@@ -560,8 +573,11 @@
if(he != null && he != '' && he != undefined && xiaoma != null && xiaoma != '' && xiaoma != undefined){
var linshistr = '';//涓存椂灏忕爜鍊�
var linshistr1 = '';//涓存椂鐩掔殑鍊�
+ var linshistr2 = '';
+
var oldheArray = he.split(',');//鑾峰彇鍘熸潵鐨勬墍鏈夌洅
var oldxiaomaArray = xiaoma.split(',');//鑾峰彇鍘熸潵鐨勬墍鏈夊皬鐮�
+ var oldhe1Array = he1.split(',');
//寰幆鍘熸潵鏄庣粏鐨勭洅
for(var i = 0;i < oldheArray.length;i++){
if(oldheArray[i] != null && oldheArray[i] != '' && oldheArray[i] != undefined){
@@ -580,15 +596,18 @@
//濡傛灉鍘熸潵鐨勭洅涓嶇瓑浜庡綋鍓嶆搷浣滅殑鐩掞紝閭ｄ箞涓嶉渶瑕佸仛鍙樺寲锛屽�兼妸鐜板湪寰幆鐨勭洅鏀惧埌涓存椂鍙橀噺閲岄潰
linshistr += oldxiaomaArray[i] + ',';
linshistr1 += oldheArray[i] + ',';
+ linshistr2 += oldhe1Array[i] + ',';
}
if(oldHe == '3'){
linshistr += oldxiaomaArray[i] + ',';
linshistr1 += oldheArray[i] + ',';
+ linshistr2 += oldhe1Array[i] + ',';
}
}
}
str = linshistr;
str1 = linshistr1;
+ str2 = linshistr2;
//鐢变簬浠ヤ笂鐨勬搷浣滃彧鑳芥壘鍒板師鏉ョ殑鐩掑拰灏忕爜鏄惁鍒犻櫎锛岄偅涔堜竴涓嬬殑鎿嶄綔灏辨槸鎶婃渶鏂版搷浣滅殑鐩掑拰灏忕爜杩藉姞鍒板瓧绗︿覆鐨勬渶鍚庨潰
//寰幆寮瑰嚭妗嗙殑灏忕爜
for(var j=1;j<tableId.rows.length;j++) {
@@ -608,11 +627,15 @@
//杩藉姞鏂扮殑鐩掑拰灏忕爜
str += tableId.rows[j].cells[1].innerHTML + ',';
str1 += newHe + ',';
+ str2 += newHe1 + ',';
}
}
if(str != '' && str1 != null){
str = str.substring(0,str.length-1);
str1 = str1.substring(0,str1.length-1);
+ }
+ if(str2 != '' ){
+ str2 = str2.substring(0,str2.length-1);
}
numstr = str == '' ? null : str.split(',').length;
@@ -621,10 +644,14 @@
for(var i=1;i<tableId.rows.length;i++) {
str += tableId.rows[i].cells[1].innerHTML + ',';
str1 += document.getElementById("bianma").innerHTML + ',';//鐩�
+ str2 += document.getElementById("havCode").value + ',';
}
if(str != '' && str1 != null){
str = str.substring(0,str.length-1);
str1 = str1.substring(0,str1.length-1);
+ }
+ if(str2 != '' ){
+ str2 = str2.substring(0,str2.length-1);
}
numstr = j$("#detailTb").find("tr").length-1;//鍙戣揣浠舵暟
@@ -635,16 +662,21 @@
if(he != null && he != '' && he != undefined && xiaoma != null && xiaoma != '' && xiaoma != undefined){
var oldheArray = he.split(',');
var oldxiaomaArray = xiaoma.split(',');
+ var oldhe1Array = he1.split(',');
for(var i = 0;i < oldheArray.length;i++){
if(oldheArray[i] != newHe){
str += oldxiaomaArray[i] + ',';
str1 += oldheArray[i] + ',';
+ str2 += oldhe1Array[i] + ',';
}
}
if(str != '' && str1 != null){
str = str.substring(0,str.length-1);
str1 = str1.substring(0,str1.length-1);
+ }
+ if(str2 != '' ){
+ str2 = str2.substring(0,str2.length-1);
}
numstr = str == '' ? null : str.split(',').length;//鍙戣揣浠舵暟
@@ -661,6 +693,7 @@
rowObj[0].children[9].children[0].value = str; //澶囧搧绠＄悊鐮�
rowObj[0].children[10].children[0].value = str1;//绠＄悊缂栫爜
numObj[0].innerText = numstr;//鍙戣揣浠舵暟
+ rowObj[0].children[11].children[0].value =str2;
}
//update wangweipeng 2022/02/21 end
}
@@ -669,11 +702,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 +721,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 +813,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 +1034,7 @@
j$("#qrcode").focus();
//add by qiuyj 2021-11-30 end pc绔壂鐮佹敮鎸�-->
//alert('鎵弿鏉″舰鐮佽浣跨敤App');
+
}
}
--
Gitblit v1.9.1