From d3e4451e36fbe25da4427bccd4e6b41aefd473c8 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 14:53:16 +0800
Subject: [PATCH] newclass0626formate
---
force-app/main/default/pages/ConsumEquipmentSetReceived.page | 454 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 319 insertions(+), 135 deletions(-)
diff --git a/force-app/main/default/pages/ConsumEquipmentSetReceived.page b/force-app/main/default/pages/ConsumEquipmentSetReceived.page
index 2e50e57..4f8a3d1 100644
--- a/force-app/main/default/pages/ConsumEquipmentSetReceived.page
+++ b/force-app/main/default/pages/ConsumEquipmentSetReceived.page
@@ -1,4 +1,4 @@
-<apex:page Controller="ConsumEquipmentSetReceivedController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
+<apex:page Controller="ConsumEquipmentSetReceivedController" 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>
@@ -40,7 +40,7 @@
height: 100px;
width: 30px;
}
-/*add start by youc 2021-12-07 鑰楁潗杩芥函 -鏀惰揣 绠＄悊缂栫爜 澶囧搧绠＄悊鐮佽缃垚鍙
+/*add start by youc 2021-12-07 鑰楁潗杩芥函 -鏀惰揣 绠＄悊缂栫爜 澶囧搧绠＄悊鐮佽缃垚鍙
.col_ManagementCode__c input{
border:none;
pointer-events: none;
@@ -49,10 +49,14 @@
border:none;
pointer-events: none;
}
-*/
+ */
.col_barcodeforReceipt__c{
display: none;
}
+.col_boxbarcodeforReceipt__c{
+ display: none;
+}
+.col_EquipmentManagementCode_OldData__c {display: none;}
.col_Scroll{display: none;}
.dataRow.col_Scroll{display: none;}
.modal
@@ -67,6 +71,7 @@
overflow: auto; /* Enable scroll if needed */
background-color: rgb(0,0,0); /* Fallback color */
background-color: rgba(0,0,0,0.4); /* Black w/ opacity */
+ /* margin-top: 20px*/
}
/* Modal Content/Box */
.modal-content
@@ -90,6 +95,8 @@
<!-- Modal content -->
<div class="modal-content">
<input type="hidden" id="havCode" value="" />
+ <input type="hidden" id="SMCode" value="" />
+ <input type="hidden" id="boxCode" value="" />
<!-- <span class="close" onclick="stopScan()">×</span> -->
<button onclick="stopScan(0)" >淇濆瓨</button>
<button onclick="stopScan(1)" >鍙栨秷</button>
@@ -101,7 +108,7 @@
<tr> <td align="right">绠＄悊缂栫爜</td> <td><span id="bianma"/></td> </tr> -->
<tr class="headerRow" height="30px">
<td class="headerRow booleanColumn" onclick="document.getElementById('xiaomaCode').focus();return false" align="left">
- 鐮佹灙鎵弿琚嬪瓙浜岀淮鐮�: <input id="xiaomaCode" onkeypress="return checkXiaoMa(event)" autofocus="autofocus" />
+ 鐮佹灙鎵弿琚嬪瓙鏉″舰鐮�: <input id="xiaomaCode" onkeypress="return checkXiaoMa(event)" autofocus="autofocus" />
</td>
<!-- <td class="headerRow booleanColumn"> <input id="xiaomaCode" onkeypress="return checkXiaoMa(event)" autofocus="autofocus" /> </td> -->
<!-- <td class="headerRow booleanColumn" colspan="8"/> -->
@@ -240,7 +247,7 @@
var numObj; //鍙戣揣浠舵暟鐨� obj
var rowObj; //鏄庣粏琛岀殑obj
//2.涓哄脊鍑烘閲岀殑淇℃伅璧嬪�� 骞朵笖灞曠ず寮瑰嚭妗�
- function showTb(paobj,rightObj) {
+ function showTb(paobj,rightObj,condamama,content250) {
numObj = rightObj;
rowObj = paobj;
//鍒犻櫎缂撳瓨
@@ -253,15 +260,21 @@
i=i-1;
}
}
+ j$("#SMCode").val(condamama);//鍚庝簲浣�
+ j$("#boxCode").val(content250);//鐩掑瓙鐮�
//鏄惁闇�瑕佸睍绀哄凡瀛樺湪淇℃伅,--- 灞曠ず鐨勮瘽鏄笉鏄繕闇�瑕佹妸鎵撳嬀鐨勫睍绀哄嚭鏉� 鐢ㄦ埛娌℃壂鎻忓皬鐮佷篃灞曠ず鍚�(涓嶆樉绀�) 杩樻槸璇村睍绀洪�夎繃鐨勶紙淇濆瓨杩囩殑涔熶笉鍐嶅脊绐楅噷鏄剧ず锛�
//椤甸潰涓婃墦浜嗗嬀 鍏充簡妗嗗悗鍙堢偣寮�杩欎釜妗�
var codea = '';
- j$(".col_Barcode_F__c span").each(function (index) {
+ //j$(".col_Barcode_F__c span").each(function (index) {
+ j$(".col_boxbarcodeforReceipt__c span").each(function (index) {
var a = rowObj[0].children[3].innerText; //鎵�鍦ㄥ湴鍖�(鏈儴) 鐜板湪
var b = rowObj[0].children[11].innerText; //鏉＄爜
+
+
//鍚屼竴涓湰閮ㄥ苟涓旀槸鍚屼竴涓繚鏈夎澶�
//j$(this).text() 褰撳墠鏉＄爜
- if (j$(this).text() && b.indexOf(j$(this).text()) == 0 && j$(this).parent().parent()[0].children[3].innerText == a) {
+ //if (j$(this).text() && b.indexOf(j$(this).text()) == 0 && j$(this).parent().parent()[0].children[3].innerText == a) {
+ if(j$(this).text() && content250.indexOf(j$(this).text()) == 0){
var ddd = j$(this).parent().parent()[0].children[7].children[0].disabled;//绉昏嚦鎶ュ簾鍖轰欢鏁� 鍒ゆ柇鏄惁鏄彲缂栬緫鐘舵�� 濡傛灉鏄彲缂栬緫鐘舵�侊紝璇存槑杩樻病鏈変繚瀛橈紝杩涜鏀惰揣鍛�
if (ddd == false) {
//鍒ゆ柇鏄惁鎵撲簡鍕�
@@ -282,8 +295,8 @@
}else{//濡傛灉鏄彧璇荤姸鎬侊紝璇存槑鏄郴缁熷凡缁忓瓨鍦ㄧ殑鏁版嵁浜�
var xiaomamma =j$(this).parent().parent()[0].children[13].innerText;
//var xiaomamma =j$(this).parent().parent()[0].children[13].children[0].value;
-
- codea += xiaomamma + ',';
+ var damamma =j$(this).parent().parent()[0].children[12].innerText;
+ codea += damamma+xiaomamma + ',';
console.log('灏忕爜=='+codea);
j$("#havCode").val(codea);
}
@@ -312,14 +325,20 @@
//numflag= 1 鍏抽棴杈撳叆妗�,娓呯┖鐮佹灙杈撳叆鐨勫��,鍏夋爣鑷姩瀹氫綅鍒扮爜鏋緭鍏�
//j$(".modal").hide();
j$("#myModal1").hide();
- //鍙栧緱澶х爜鐨勫��
- var dama = j$( '#maqCode' ).val();
+ //鍙栧緱鐩掑瓙鏉″舰鐮�
+ var boxdama = j$( '#boxCode' ).val();
j$("#maqCode").val("");
j$("#maqCode").focus();
+ j$("#havCode").val(""); //姣忔鍏抽棴寮圭獥閮芥竻绌轰竴涓�
+ j$("#SMCode").val("");
+
+ scanType = null;
if(numflag == 0 ){
var typeMap = new Map();
//鐢ㄦ埛鐐瑰嚮淇濆瓨 璁剧疆涓変釜绫诲瀷鍒板搴旂殑鏄庣粏涓�
+ //鏂逛究浣跨敤鍊掑彊锛�
+ var arrXiaoma = new Array();
if(rowObj != null){
//鍙栧緱寮瑰嚭妗嗙殑鍊�
var tableId = document.getElementById("detailTb");
@@ -336,6 +355,7 @@
else if (gq) {typeflag = '2';}
else if (sj) {typeflag = '3';}
typeMap.set(xiaoma,typeflag)
+ arrXiaoma.push(xiaoma);
}
}
@@ -343,15 +363,20 @@
//alert('==typeMap=='+typeMap);
//1.鍙栧緱褰撳墠灞曠ず鐨勪俊鎭� --涓轰簡闃叉鍐欒繃澶氱殑浠ｇ爜 鎴戜滑鐩存帴鍙栧睍绀哄垪琛ㄧ殑绗竴琛屽嵆鍙� 鎷垮埌barcode鍜屾墍鍦ㄥ湴鍖烘湰閮�
var a = rowObj[0].children[3].innerText; //鎵�鍦ㄥ湴鍖�(鏈儴) 鐜板湪
- var b = rowObj[0].children[11].innerText;
+ var b = rowObj[0].children[11].innerText; //鏉″舰鐮�
+ var c = rowObj[0].children[12].innerText; //澶х爜
//2.鏍规嵁杩欎袱涓�煎彇寰楀睍绀哄垪琛ㄧ殑鏄庣粏琛�
//2.1 鍙栧緱barcode鐩稿悓鐨勬暟鎹-- 鍚屼竴涓繚鏈夎澶�
let sameAss = [];
- j$(".col_Barcode_F__c span").each(function (index) {
+ //鐢ㄤ簬瀛樻斁 灏忕爜锛氬灏戣锛屼究浜庤幏鍙�
+ var xiamaRowMap = new Map();
+ //j$(".col_Barcode_F__c span").each(function (index) {
+ j$(".col_boxbarcodeforReceipt__c span").each(function (index) {
// j$(this).text() && b.indexOf(j$(this).text()) == 0 璇存槑鏄悓涓�涓澶�
// j$(this).parent().parent()[0].children[3].innerText == a 璇存槑鏄悓涓�涓鍝佸瓨鏀惧湴
- if (j$(this).text() && b.indexOf(j$(this).text()) == 0 && j$(this).parent().parent()[0].children[3].innerText == a) {
-
+ //if (j$(this).text() && b.indexOf(j$(this).text()) == 0 && j$(this).parent().parent()[0].children[3].innerText == a && j$(this).parent().parent()[0].children[12].innerText == c) {
+ console.log(j$(this).parent().parent()[0].children[3].innerText+'=='+j$(this).parent().parent()[0].children[12].innerText);
+ if(j$(this).text() && boxdama.indexOf(j$(this).text()) == 0){
//璁剧疆鍊�
var xiaomamma =j$(this).parent().parent()[0].children[13].innerText;
//var xiaomamma =j$(this).parent().parent()[0].children[13].children[0].value;
@@ -361,28 +386,53 @@
j$(this).parent().parent()[0].children[8].children[0].value = '';
j$(this).parent().parent()[0].children[9].children[0].value = '';
sameAss.push(this.id.match(/oppTable\:(\d*)/)[1]);
+ xiamaRowMap.set(xiaomamma,this.id.match(/oppTable\:(\d*)/)[1]);
}else if(typeMap.has(xiaomamma) && typeMap.get(xiaomamma) == '2' ){
j$(this).parent().parent()[0].children[8].children[0].value = '1';
j$(this).parent().parent()[0].children[7].children[0].value = '';
j$(this).parent().parent()[0].children[9].children[0].value = '';
sameAss.push(this.id.match(/oppTable\:(\d*)/)[1]);
+ xiamaRowMap.set(xiaomamma,this.id.match(/oppTable\:(\d*)/)[1]);
}else if(typeMap.has(xiaomamma) && typeMap.get(xiaomamma) == '3' ){
j$(this).parent().parent()[0].children[9].children[0].value = '1';
j$(this).parent().parent()[0].children[7].children[0].value = '';
j$(this).parent().parent()[0].children[8].children[0].value = '';
sameAss.push(this.id.match(/oppTable\:(\d*)/)[1]);
- }else if(typeMap.get(xiaomamma) == null){
+ xiamaRowMap.set(xiaomamma,this.id.match(/oppTable\:(\d*)/)[1]);
+ }else if(typeMap.get(xiaomamma) == null && j$("input[name$='oppTable_L:"+ this.id.match(/oppTable\:(\d*)/)[1] +":rowCheck']").prop('disabled') == false){
//寮瑰嚭妗嗗垹闄ゅ悗锛屾竻绌哄搴斿皬鐮佺殑涓変釜妗嗛噷鐨勬暟鎹� thh 2022-02-15 start
- j$(this).parent().parent()[0].children[9].children[0].value = '';
j$(this).parent().parent()[0].children[7].children[0].value = '';
j$(this).parent().parent()[0].children[8].children[0].value = '';
+ j$(this).parent().parent()[0].children[9].children[0].value = '';
+ j$("input[name$='oppTable_L:"+ this.id.match(/oppTable\:(\d*)/)[1] +":rowCheck']").prop('checked',false);
//寮瑰嚭妗嗗垹闄ゅ悗锛屾竻绌哄搴斿皬鐮佺殑涓変釜妗嗛噷鐨勬暟鎹� thh 2022-02-15 end
}
}
})
+ //update by wangweipeng 2022/02/24 start
//2.2 鍙栧緱鏄庣粏琛� 閫変腑骞舵彁鍓�
if (sameAss.length > 0) {
- sameAss.forEach(function (rn) {
+ //鍊掑彊锛岀敤浜庡拰寮圭獥妗嗛噷闈㈢殑椤哄簭涓�鏍�
+ for(var i = arrXiaoma.length-1;i >= 0;i--){
+ //鏌ョ湅map閲岄潰鏄惁鍖呭惈灏忕爜
+ if(xiamaRowMap.containsKey(arrXiaoma[i])){
+ //缃《宸︿晶澶嶉�夋
+ var leftobj = j$("input[name$='oppTable_L:"+xiamaRowMap.get(arrXiaoma[i])+":rowCheck']:not(:disabled)");
+ //alert(rn+'=leftobj='+leftobj);
+ moveToTop(leftobj);
+ leftobj.prop('checked', true).trigger("change");
+ //缃《鍙充晶鏄庣粏琛�
+ j$(".col_Yi_Zhi_Bao_Fei_Jia__c").each(function () {
+ if (j$(this).children()[0] && j$(this).children()[0].id.indexOf('oppTable:'+xiamaRowMap.get(arrXiaoma[i])+':') !== -1) {
+ // j$(this).find("input").attr('autofocus', 'autofocus');
+ var rightobj = j$(this).find("input:not(:disabled)");
+ //alert(rn+'=rightobj='+rightobj);
+ moveToTop(rightobj);
+ }
+ });
+ }
+ }
+ /*sameAss.forEach(function (rn) {
//缃《宸︿晶澶嶉�夋
var leftobj = j$("input[name$='oppTable_L:"+rn+":rowCheck']:not(:disabled)");
//alert(rn+'=leftobj='+leftobj);
@@ -397,9 +447,12 @@
moveToTop(rightobj);
}
})
- })
- }
+ })*/
+ }
+ //update by wangweipeng 2022/02/24 end
}
+ j$("#boxCode").val("");
+ setTimeout(function(){j$("#maqCode").focus();},300);
}
//4.鎵皬鐮佷箣鍚庡鐮佺殑鏍￠獙
@@ -469,6 +522,43 @@
j$( '#xiaomaCode' ).val("");
return;
}
+ //鎵归噺璧嬪�肩殑涓�涓搷浣�
+ if (nowCode == 'allMoveToBaoFei') {
+ if(tableId.rows.length > 0){
+ for(var i=1;i<tableId.rows.length;i++) {
+ tableId.children[0].children[i].children[7].children[0].checked = true;
+ tableId.children[0].children[i].children[8].children[0].checked = false;
+ tableId.children[0].children[i].children[9].children[0].checked = false;
+ }
+ }
+
+ j$( '#xiaomaCode' ).val("");
+ return;
+ }
+ if (nowCode == 'allMoveToGuoqi') {
+ if(tableId.rows.length > 0){
+ for(var i=1;i<tableId.rows.length;i++) {
+ tableId.children[0].children[i].children[7].children[0].checked = false;
+ tableId.children[0].children[i].children[8].children[0].checked = true;
+ tableId.children[0].children[i].children[9].children[0].checked = false;
+ }
+ }
+
+ j$( '#xiaomaCode' ).val("");
+ return;
+ }
+ if (nowCode == 'allShangJia') {
+ if(tableId.rows.length > 0){
+ for(var i=1;i<tableId.rows.length;i++) {
+ tableId.children[0].children[i].children[7].children[0].checked = false;
+ tableId.children[0].children[i].children[8].children[0].checked = false;
+ tableId.children[0].children[i].children[9].children[0].checked = true;
+ }
+ }
+
+ j$( '#xiaomaCode' ).val("");
+ return;
+ }
// if (nowCode.length != 3) {
// alert("琚嬪瓙浜岀淮鐮佷笌鍙戣揣鏃朵笉鍖归厤!");
// j$( '#xiaomaCode' ).val("");
@@ -479,26 +569,34 @@
// debugger;
var havCode = document.getElementById("havCode").value;
//瀛樺湪浜庡凡缁忔壂鎻忚繃鐨勭爜 缁欏嚭鎻愮ず
- if (havCode.indexOf(nowCode) != -1) {
- alert('璇ユ槑缁嗗凡淇濆瓨杩�,璇烽噸鏂板皾璇�');
+ var SMCode = document.getElementById("SMCode").value;
+ var YZCode =SMCode+nowCode;
+ //if (havCode.indexOf(nowCode) != -1) {
+ if (havCode.indexOf(YZCode) != -1) {
+ alert('璇ユ槑缁嗗凡淇濆瓨杩�,涓嶈兘鍐嶈繘琛屼慨鏀�');
j$( '#xiaomaCode' ).val("");
return;
}
//aa 鎷垮埌璇ヤ繚鏈夎澶囧搴旂殑鎵�鏈夊皬鐮� 鍒ゆ柇鏄惁瀛樺湪
- var aa = rowObj[0].children[15].children[1].value;
+ var aa = rowObj[0].children[17].children[1].value;
//alert(aa);
if (aa != null && aa.length > 0) {
-
//鍚戝脊鍑烘閲屾坊鍔犳槑缁嗚
- if (aa.indexOf(nowCode) == -1) {
+ //if (aa.indexOf(nowCode) == -1) {
+ if (aa.indexOf(YZCode) == -1) {
//alert('this.flag==='+this.flag);
if (this.flag == 'delConsumables') {
- alert('蹇呴』鍏堟壂鎻忚鍙栨秷鐨勫皬鐮�');
+ alert('宸茶繘鍏ュ垹闄ゅ皬鐮佹搷浣滐紝璇锋壂鎻忔纭殑灏忕爜');
j$( '#xiaomaCode' ).val("");
this.flag = '';
return;
- }
- alert('琚嬪瓙浜岀淮鐮佷笌鍙戣揣鏃朵笉鍖归厤!');
+ } else if(nowCode != null && nowCode.length == 3 && !isNaN(nowCode)){
+ }else{
+ alert('褰撳墠灏忕爜涓嶆纭�');
+ j$( '#xiaomaCode' ).val("");
+ return;
+ }
+ alert('鎵弿鐨勫皬鐮佸湪鍙戣揣鏄庣粏涓笉瀛樺湪鎴栨湭瀵勫洖锛岃閲嶆柊鎵弿!');
j$( '#xiaomaCode' ).val("");
return;
}else{
@@ -506,7 +604,7 @@
// var tableId = document.getElementById("detailTb");
if(tableId.rows.length > 0){
for(var i=1;i<tableId.rows.length;i++) {
- //alert(nowCode+'=498='+tableId.rows[i].cells[6].innerHTML);
+ console.log(nowCode+'=498='+tableId.rows[i].cells[6].innerHTML);
if(nowCode == tableId.rows[i].cells[6].innerHTML){
if (this.flag == 'delConsumables') {
//鍒犻櫎杩欎竴琛�
@@ -516,15 +614,31 @@
return;
}else{
//灏忕爜宸插瓨鍦� 婊炲悗 鍏堝垹鍚庡姞 鐩稿綋浜庤鎵繖涓皬鐮佺殑閭ｄ笁涓被鍨�
+ var bf1 = tableId.children[0].children[i].children[7].children[0].checked;
+ var gq1 = tableId.children[0].children[i].children[8].children[0].checked;
+ var sj1 = tableId.children[0].children[i].children[9].children[0].checked;
+ console.log(bf1+'=1='+gq1+'=='+sj1);
tableId.rows[i].remove();
j$( '#xiaomaCode' ).val("");
// return;
- alert('宸蹭负鎮ㄦ粸鍚�!');
- break;
+ alert('灏忕爜宸叉壂鎻忥紝鏃犻渶鍐嶆鎵弿锛�');
+ // console.log(bf1+'=2='+gq1+'=='+sj1);
+ if (bf1) {
+ addRow(nowCode,'1');
+ }else if (gq1) {
+ addRow(nowCode,'2');
+ }else if (sj1) {
+ addRow(nowCode,'3');
+ }else{
+ addRow(nowCode,'');
+ }
+ //break;
+ return;
}
}
}
}
+ console.log('鏂扮爜鐩存帴娣诲姞');
addRow(nowCode,'');
}
}
@@ -618,7 +732,7 @@
var tableId = document.getElementById("detailTb");
if (ipadnowCode.length != 3) {
if (tableId.children[0].children[tableId.rows.length-1].children[7].children[0] == undefined) {
- alert1('璇峰厛鎵皬鐮�')
+ alert('璇峰厛鎵皬鐮�')
console.log('2=='+ipadnowCode+ipadflag);
return false;
}
@@ -640,28 +754,62 @@
tableId.children[0].children[tableId.rows.length-1].children[8].children[0].checked = false;
tableId.children[0].children[tableId.rows.length-1].children[9].children[0].checked = true;
return false
+ } else if (ipadnowCode == 'allMoveToBaoFei') {//鎵归噺璧嬪�肩殑涓�涓搷浣�
+ if(tableId.rows.length > 0){
+ for(var i=1;i<tableId.rows.length;i++) {
+ tableId.children[0].children[i].children[7].children[0].checked = true;
+ tableId.children[0].children[i].children[8].children[0].checked = false;
+ tableId.children[0].children[i].children[9].children[0].checked = false;
+ }
+ }
+ return false
+ }else if (ipadnowCode == 'allMoveToGuoqi') {
+ if(tableId.rows.length > 0){
+ for(var i=1;i<tableId.rows.length;i++) {
+ tableId.children[0].children[i].children[7].children[0].checked = false;
+ tableId.children[0].children[i].children[8].children[0].checked = true;
+ tableId.children[0].children[i].children[9].children[0].checked = false;
+ }
+ }
+ return false
+ }else if (ipadnowCode == 'allShangJia') {
+ if(tableId.rows.length > 0){
+ for(var i=1;i<tableId.rows.length;i++) {
+ tableId.children[0].children[i].children[7].children[0].checked = false;
+ tableId.children[0].children[i].children[8].children[0].checked = false;
+ tableId.children[0].children[i].children[9].children[0].checked = true;
+ }
+ }
+ return false
}
var havCode = document.getElementById("havCode").value;
//瀛樺湪浜庡凡缁忔壂鎻忚繃鐨勭爜 缁欏嚭鎻愮ず
- if (havCode.indexOf(ipadnowCode) != -1) {
- alert1('璇ユ槑缁嗗凡淇濆瓨杩�,璇烽噸鏂板皾璇�')
+ var SMCode = document.getElementById("SMCode").value;
+ var YZCode =SMCode+ipadnowCode;
+ //if (havCode.indexOf(ipadnowCode) != -1) {
+ if (havCode.indexOf(YZCode) != -1) {
+ alert('璇ユ槑缁嗗凡淇濆瓨杩�,涓嶈兘鍐嶈繘琛屼慨鏀�')
return false;
}
//aa 鎷垮埌璇ヤ繚鏈夎澶囧搴旂殑鎵�鏈夊皬鐮� 鍒ゆ柇鏄惁瀛樺湪
- var aa = rowObj[0].children[15].children[1].value;
+ var aa = rowObj[0].children[17].children[1].value;
if (aa != null && aa.length > 0) {
-
//鍚戝脊鍑烘閲屾坊鍔犳槑缁嗚
- if (aa.indexOf(ipadnowCode) == -1) {
+ //if (aa.indexOf(ipadnowCode) == -1) {
+ if (aa.indexOf(YZCode) == -1) {
console.log('3=='+ipadnowCode+'==='+ipadflag);
if (ipadflag == 'delConsumables') {
- alert1('蹇呴』鍏堟壂鎻忚鍙栨秷鐨勫皬鐮�')
+ alert('宸茶繘鍏ュ垹闄ゅ皬鐮佹搷浣滐紝璇锋壂鎻忔纭殑灏忕爜')
ipadflag = '';
return false;
+ }else if(ipadnowCode != null && ipadnowCode.length == 3 && !isNaN(ipadnowCode)){
+ }else{
+ alert('褰撳墠灏忕爜涓嶆纭�');
+ return;
}
- alert1('琚嬪瓙浜岀淮鐮佷笌鍙戣揣鏃朵笉鍖归厤!')
+ alert('鎵弿鐨勫皬鐮佸湪鍙戣揣鏄庣粏涓笉瀛樺湪鎴栨湭瀵勫洖锛岃閲嶆柊鎵弿!')
return;
}else{
//鍒ゆ柇鏄惁宸茬粡鎵弿杩�
@@ -681,6 +829,10 @@
break;
}else{
//灏忕爜宸插瓨鍦� 婊炲悗 鍏堝垹鍚庡姞 鐩稿綋浜庤鎵繖涓皬鐮佺殑閭ｄ笁涓被鍨�
+ var bf1 = tableId.children[0].children[i].children[7].children[0].checked;
+ var gq1 = tableId.children[0].children[i].children[8].children[0].checked;
+ var sj1 = tableId.children[0].children[i].children[9].children[0].checked;
+ console.log(bf1+'=1='+gq1+'=='+sj1);
tableId.rows[i].remove();
// return;
//alert('qqq')
@@ -689,10 +841,21 @@
// });
// j$
//alert(1)
- alert1('宸蹭负鎮ㄦ粸鍚�!');
+ alert('灏忕爜宸叉壂鎻忥紝鏃犻渶鍐嶆鎵弿锛�');
//宸蹭负鎮ㄦ粸鍚�!
- //break;
- }
+ //break;涔嬪墠灏辨槸娉ㄩ噴鐨�
+ console.log(bf1+'=2='+gq1+'=='+sj1);
+ if (bf1) {
+ addRow(ipadnowCode,'1');
+ }else if (gq1) {
+ addRow(ipadnowCode,'2');
+ }else if (sj1) {
+ addRow(ipadnowCode,'3');
+ }else{
+ addRow(ipadnowCode,'');
+ }
+ return;
+ }
}
}
//
@@ -725,6 +888,7 @@
}else if(scanType == 2){//add by youc 2022-01-11 寮瑰嚭妗嗕腑ipad鎵弿灏忕爜
checkipadXiaoMa(content);
} else {
+ var content250 = content;//涓轰簡鑾峰彇ipad绔壂鐮佺殑鍊�
var tracingCode = content.substr(-8);
if (tracingCode.indexOf('250') == 0) {
content = content.slice(0, -8);
@@ -735,6 +899,7 @@
// j$(".col_Barcode_F__c span").each(function(index) {
j$(".col_barcodeforReceipt__c span").each(function(index) {
//update by youc 2021-12-07 end
+
if (j$(this).text() && (content.indexOf(j$(this).text())) == 0) {
rownum.push(this.id.match(/oppTable\:(\d*)/)[1]);
return;
@@ -773,23 +938,40 @@
}
})
var maqiang = j$( '#maqCode' ).val();
- if (rownum.length == 0)
- {
-
-
+ var allboxbarcode ='';
+ j$(".col_boxbarcodeforReceipt__c span").each(function(index) {
+ if (j$(this).text() && (allboxbarcode.indexOf(j$(this).text())) == -1){
+ allboxbarcode +=j$(this).text()+',';
+ }
+ })
+ console.log('鎵�鏈夌殑澶х爜'+allboxbarcode);
+ if (content250 !='' && content250 !=undefined && content250.substring(content250.length - 8,content250.length - 5) != '250') {
+ alert('璇峰厛鎵洅!');
+ if(maqiang !='' && maqiang !=undefined){
+ j$("#maqCode").val("");
+ j$("#maqCode").focus();
+ }
+ return;
+ //add by youc 2021-11-30 end
+ }else if (rownum.length == 0) {
+ //add by youc 2021-12-07 start 鍒犻櫎杈撳叆妗嗗唴瀹� 骞跺厜鏍囪嚜鍔ㄥ畾浣嶅埌杈撳叆妗�
//alert('maqiang'+maqiang)
if(maqiang !='' && maqiang !=undefined){
j$("#maqCode").val("");
j$("#maqCode").focus();
alert('鎵弿鐨勮�楁潗涓嶅瓨鍦�!')
}else{
- alert1('鎵弿鐨勮�楁潗涓嶅瓨鍦�!')
- }
-
- //add by youc 2021-12-07 start 鍒犻櫎杈撳叆妗嗗唴瀹� 骞跺厜鏍囪嚜鍔ㄥ畾浣嶅埌杈撳叆妗�
-
+ alert('鎵弿鐨勮�楁潗涓嶅瓨鍦�!')
+ }
//add by youc 2021-12-07 end 鍒犻櫎杈撳叆妗嗗唴瀹� 骞跺厜鏍囪嚜鍔ㄥ畾浣嶅埌杈撳叆妗�
return false;
+ } else if(allboxbarcode.indexOf(content250) == -1){
+ alert('鎵弿鐨勭洅涓庡彂璐ф椂涓嶄竴鑷存垨鏈瘎鍥烇紝璇烽噸鏂版壂鎻�');
+ if(maqiang !='' && maqiang !=undefined){
+ j$("#maqCode").val("");
+ j$("#maqCode").focus();
+ }
+ return false;
} else if (rownum.length > 1) {
let optStr = "";
rownum.forEach(function (rn) {
@@ -831,7 +1013,8 @@
// rightObj.focus();
//add by youc 2021-12-07 start 灞曠ず寮瑰嚭妗�
var paobj = j$(this).parent();
- showTb(paobj,rightObj);
+ var condamama = content250.substr(-5);
+ showTb(paobj,rightobj,condamama,content250);
//add by youc 2021-12-07 end 灞曠ず寮瑰嚭妗�
return;
}
@@ -862,10 +1045,11 @@
// j$(this).find("input").attr('autofocus', 'autofocus');
var rightobj = j$(this).find("input:not(:disabled)");
//moveToTop(rightobj);
- rightobj.focus();
+ //rightobj.focus();
//灞曠ず寮瑰嚭妗� add by youc 2021-12-07 start
- var paobj = j$(this).parent()
- showTb(paobj,rightobj);
+ var paobj = j$(this).parent();
+ var condamama = content250.substr(-5);
+ showTb(paobj,rightobj,condamama,content250);
//灞曠ず寮瑰嚭妗� add by youc 2021-12-07 end
return;
}
@@ -924,83 +1108,83 @@
}
}
- function alert1(data) {
- var MainDiv = document.createElement("div"),
- p = document.createElement("p"),
- p1 = document.createElement("p"),
- AllPage = document.createElement("div"),
- btn = document.createElement("div"),
- textNode = document.createTextNode(data ? data : ""),
- textNode1 = document.createTextNode('{!$Label.Environment_Url}'),
- btnText = document.createTextNode("纭畾");
- // 鎺у埗鏍峰紡
- csss(AllPage, {
- "position": "fixed",
- " _position": "absolute",
- " width": "100%",
- "height": "100%",
- "left": "0",
- "top": "0",
- "background": "rgba(0, 0, 0,0.5)",
- "-moz-opacity": "0.5",
- "filter": "alpha(opacity=50)",
- "z-index": "97",
- });
- csss(MainDiv, {
- "position": "fixed",
- "left": "0",
- "right": "0",
- "top": "30%",
- "width": "17rem",
- "height": "7rem",
- "padding-top":"0.5rem",
- "margin": "0 auto",
- "background-color": "white",
- "font-size": "0.75rem",
- "text-align": "center",
- "position": "relative",
- "border-radius": "5px 5px 5px 5px",
- });
- csss(btn, {
- "background": "#0070d2",
- "color": "white",
- "width": "6rem",
- "margin-left": "5.5rem",
- "margin-bottom":"0.25rem",
- "height": "1.5rem",
- "border-radius": "5px 5px 5px 5px",
- "position": "absolute",
- "padding-top":"0.5rem",
- "bottom":"0",
- })
- // 鍐呴儴缁撴瀯濂楀叆
- p1.appendChild(textNode1);
- p.appendChild(textNode);
- btn.appendChild(btnText);
- MainDiv.appendChild(p1);
- MainDiv.appendChild(p);
- MainDiv.appendChild(btn);
- AllPage.appendChild(MainDiv);
- // 鏁翠綋鏄剧ず鍒伴〉闈㈠唴
- document.getElementsByTagName("body")[0].appendChild(AllPage);
- //绂佹婊氬姩
- /*$("body").on("touchmove", function (event) {
- event.preventDefault;
- }, false)
- */
- // 纭畾缁戝畾鐐瑰嚮浜嬩欢鍒犻櫎鏍囩
- btn.onclick = function () {
- AllPage.parentNode.removeChild(AllPage);
- //鍚敤婊氬姩
- //$("body").off("touchmove");
- }
- }
- function csss(targetObj, cssObj) {
- var str = targetObj.getAttribute("style") ? targetObj.getAttribute("style") : "";
- for (var i in cssObj) {
- str += i + ":" + cssObj[i] + ";";
- }
- targetObj.style.cssText = str;
- }
+ // function alert1(data) {
+ // var MainDiv = document.createElement("div"),
+ // p = document.createElement("p"),
+ // p1 = document.createElement("p"),
+ // AllPage = document.createElement("div"),
+ // btn = document.createElement("div"),
+ // textNode = document.createTextNode(data ? data : ""),
+ // textNode1 = document.createTextNode('{!$Label.Environment_Url}'),
+ // btnText = document.createTextNode("纭畾");
+ // // 鎺у埗鏍峰紡
+ // csss(AllPage, {
+ // "position": "fixed",
+ // " _position": "absolute",
+ // " width": "100%",
+ // "height": "100%",
+ // "left": "0",
+ // "top": "0",
+ // "background": "rgba(0, 0, 0,0.5)",
+ // "-moz-opacity": "0.5",
+ // "filter": "alpha(opacity=50)",
+ // "z-index": "97",
+ // });
+ // csss(MainDiv, {
+ // "position": "fixed",
+ // "left": "0",
+ // "right": "0",
+ // "top": "30%",
+ // "width": "17rem",
+ // "height": "7rem",
+ // "padding-top":"0.5rem",
+ // "margin": "0 auto",
+ // "background-color": "white",
+ // "font-size": "0.75rem",
+ // "text-align": "center",
+ // "position": "relative",
+ // "border-radius": "5px 5px 5px 5px",
+ // });
+ // csss(btn, {
+ // "background": "#0070d2",
+ // "color": "white",
+ // "width": "6rem",
+ // "margin-left": "5.5rem",
+ // "margin-bottom":"0.25rem",
+ // "height": "1.5rem",
+ // "border-radius": "5px 5px 5px 5px",
+ // "position": "absolute",
+ // "padding-top":"0.5rem",
+ // "bottom":"0",
+ // })
+ // // 鍐呴儴缁撴瀯濂楀叆
+ // p1.appendChild(textNode1);
+ // p.appendChild(textNode);
+ // btn.appendChild(btnText);
+ // MainDiv.appendChild(p1);
+ // MainDiv.appendChild(p);
+ // MainDiv.appendChild(btn);
+ // AllPage.appendChild(MainDiv);
+ // // 鏁翠綋鏄剧ず鍒伴〉闈㈠唴
+ // document.getElementsByTagName("body")[0].appendChild(AllPage);
+ // //绂佹婊氬姩
+ // /*$("body").on("touchmove", function (event) {
+ // event.preventDefault;
+ // }, false)
+ // */
+ // // 纭畾缁戝畾鐐瑰嚮浜嬩欢鍒犻櫎鏍囩
+ // btn.onclick = function () {
+ // AllPage.parentNode.removeChild(AllPage);
+ // //鍚敤婊氬姩
+ // //$("body").off("touchmove");
+ // }
+ // }
+ // function csss(targetObj, cssObj) {
+ // var str = targetObj.getAttribute("style") ? targetObj.getAttribute("style") : "";
+ // for (var i in cssObj) {
+ // str += i + ":" + cssObj[i] + ";";
+ // }
+ // targetObj.style.cssText = str;
+ // }
</script>
</apex:page>
\ No newline at end of file
--
Gitblit v1.9.1