From 6947068a02499b9d1022f9efca5bcf1bdd3f1c70 Mon Sep 17 00:00:00 2001
From: Denny Chen <chenbangcai@prec-tech.com>
Date: 星期一, 28 二月 2022 10:45:11 +0800
Subject: [PATCH] Note test
---
force-app/main/default/pages/ConsumEquipmentSetShipment.page | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 205 insertions(+), 31 deletions(-)
diff --git a/force-app/main/default/pages/ConsumEquipmentSetShipment.page b/force-app/main/default/pages/ConsumEquipmentSetShipment.page
index f17c9b9..3d47fe9 100644
--- a/force-app/main/default/pages/ConsumEquipmentSetShipment.page
+++ b/force-app/main/default/pages/ConsumEquipmentSetShipment.page
@@ -93,6 +93,7 @@
<!-- Modal content -->
<div class="modal-content">
<!-- <span class="close" onclick="stopScan()">×</span> -->
+ <input type="hidden" id="havCode" value="" />
<button onclick="stopScan(0)" >淇濆瓨</button>
<button onclick="stopScan(1)" >鍙栨秷</button>
<button onclick="qrsacn(2);return false;" >ipad鎵弿琚嬪瓙鏉″舰鐮�</button>
@@ -270,6 +271,7 @@
//鐜板湪闇�瑕� 鎵埌鑰楁潗涔嬪悗 鑷姩鍕鹃�夌疆椤跺苟瀹氫綅鍒板搴旂殑鍙戣揣浠舵暟杈撳叆妗� 骞跺脊鍑虹晫闈� 鍏夋爣鑷姩瀹氫綅鍒�"鐮佹灙鎵弿琚嬪瓙鏉″舰鐮�"
var numObj; //鍙戣揣浠舵暟鐨� obj
var rowObj; //鏄庣粏琛岀殑obj
+ var checkObj; //澶嶉�夋鐨刼bj
var flag = ''; //璇ュ彉閲忎細鏈�"cancelConsumables"(鍙栨秷鑰楁潗) 鍜� "saveConsumables"(淇濆瓨鑰楁潗)
//鎵爜寮瑰嚭妗嗕箣鍚� 鎵皬鐮佺殑鎿嶄綔 --
//1.娣诲姞涓�琛�
@@ -340,7 +342,7 @@
}
//鑳借蛋鍒拌繖璇存槑寰呭垹闄ょ殑灏忕爜涓嶅瓨鍦ㄤ簬鏄庣粏鍒楄〃 鎵�浠ヨ缁欏嚭鎻愮ず
if (this.flag == 'delConsumables') {
- alert('蹇呴』鍏堟壂鎻忚鍙栨秷鐨勫皬鐮�');
+ alert('鍒犻櫎鐨勫皬鐮佸凡鍒犻櫎鎴栨湭鎵弿杩�');
j$( '#xiaomaCode' ).val("");
this.flag = '';
return false;
@@ -375,6 +377,7 @@
}
//5.涓哄脊鍑烘閲岀殑淇℃伅璧嬪�� 骞朵笖灞曠ず寮瑰嚭妗�
function showTb(leftobj,paobj,rightObj,scanType,content250) {
+ checkObj = leftobj;
numObj = rightObj;
rowObj = paobj;
var a = paobj[0].children[0].innerText; //澶囧搧閰嶅鏄庣粏鍨嬪彿
@@ -401,9 +404,60 @@
// return;
// }
// }
- moveToTop(leftobj);
+
+ //update wangweipeng 2022/02/21 start
+ // if (c == '') {
+ //鍒ゆ柇褰撳墠杈撳叆鏄洅
+ var bianma;
+ if (maqCode !='' && maqCode !=undefined && maqCode.substring(maqCode.length - 8,maqCode.length - 5) == '250') {
+ //璁剧疆绠＄悊缂栫爜
+ bianma = maqCode.substring(maqCode.length -5,maqCode.length);
+ //寮瑰嚭妗嗙殑绠＄悊缂栫爜璧嬪��
+ document.getElementById("bianma").innerHTML = bianma;
+ //缁欐槑缁嗚璧嬬鐞嗙紪鐮�
+ //paobj[0].children[10].children[0].value = bianma;
+ c = bianma;
+ }else if(content250 !='' && content250 !=undefined && content250.substring(content250.length - 8,content250.length - 5) == '250'){
+ //璁剧疆绠＄悊缂栫爜
+ bianma = content250.substring(content250.length -5,content250.length);
+ //寮瑰嚭妗嗙殑绠＄悊缂栫爜璧嬪��
+ document.getElementById("bianma").innerHTML = bianma;
+ //缁欐槑缁嗚璧嬬鐞嗙紪鐮�
+ //paobj[0].children[10].children[0].value = bianma;
+ c = bianma;
+
+ }
+ //鍒ゆ柇褰撳墠鎵弿鏄惁鎹㈢洅浜�
+ if(c != null && c != '' && c != undefined){
+ //鑾峰彇褰撳墠璁惧鐨勭鐞嗙紪鐮侊紝娉ㄦ剰鍙兘鏄竴涓�佸涓垨绌�
+ var oldbianma = paobj[0].children[10].children[0].value;
+ if(oldbianma != null && oldbianma != '' && oldbianma != undefined){
+ var oldbianmaArray = oldbianma.split(',');
+ var bianmaFlag = true;
+ for(var i = 0; i < oldbianmaArray.length; i++){
+ if(oldbianmaArray[i] != '' && oldbianmaArray[i].indexOf(c) == 0){
+ bianmaFlag = false;
+ }
+ }
+ if(bianmaFlag){
+ if(confirm('宸叉崲鐩掞紝纭缁х画鍚楋紵')){
+
+ }else{
+ leftobj.prop('checked', false);
+ j$("#maqCode").val("");
+ stopScan();
+ return;
+ }
+ }
+ }
+ }
+
+ /*moveToTop(leftobj);
leftobj.prop('checked', true).trigger("change");
- moveToTop(rightObj);
+ moveToTop(rightObj);*/
+
+ //update wangweipeng 2022/02/21 end
+
//鍒犻櫎缂撳瓨
var tableId = document.getElementById("detailTb");
if(tableId.rows.length > 0){
@@ -418,26 +472,6 @@
document.getElementById("xinghao").innerHTML = a; //澶囧搧閰嶅鏄庣粏鍨嬪彿
document.getElementById("bianhao").innerHTML = b; //鏈鸿韩缂栧彿
- // if (c == '') {
- //鍒ゆ柇褰撳墠杈撳叆鏄洅
- if (maqCode !='' && maqCode !=undefined && maqCode.substring(maqCode.length - 8,maqCode.length - 5) == '250') {
- //璁剧疆绠＄悊缂栫爜
- var bianma = maqCode.substring(maqCode.length -5,maqCode.length);
- //寮瑰嚭妗嗙殑绠＄悊缂栫爜璧嬪��
- document.getElementById("bianma").innerHTML = bianma;
- //缁欐槑缁嗚璧嬬鐞嗙紪鐮�
- paobj[0].children[10].children[0].value = bianma;
- c = bianma;
- }else if(content250 !='' && content250 !=undefined && content250.substring(content250.length - 8,content250.length - 5) == '250'){
- //璁剧疆绠＄悊缂栫爜
- var bianma = content250.substring(content250.length -5,content250.length);
- //寮瑰嚭妗嗙殑绠＄悊缂栫爜璧嬪��
- document.getElementById("bianma").innerHTML = bianma;
- //缁欐槑缁嗚璧嬬鐞嗙紪鐮�
- paobj[0].children[10].children[0].value = bianma;
- c = bianma;
-
- }
//alert('===c=='+paobj[0].children[10].children[0].innerText);
// document.getElementById("bianma").innerHTML = ; //绠＄悊缂栫爜
@@ -445,19 +479,29 @@
// var code = paobj[0].children[9].children[0].innerText;
var code = paobj[0].children[9].children[0].value; //.innerText;
+ var hecode = paobj[0].children[10].children[0].value; //.innerText;
alert('xiaoma'+code);
if (code != null && code.length > 0) {
//鍚戝脊鍑烘閲屾坊鍔犳槑缁嗚
var arr = code.split(',');
- alert('xiaomajinlaile'+arr);
- for (var i = arr.length - 1; i >= 0; i--) {
- addRow(arr[i],c);
+ var hearr = hecode.split(',');
+ //update by wangweipeng 2022/02/21 start
+ //鎸夌収澶嶉�夋鐨勯『搴忔潵灞曠ず
+ for (var i = 0; i < arr.length ; i++) {
+ if(c == hearr[i]){
+ addRow(arr[i],c);
+ }
}
+ /*for (var i = arr.length - 1; i >= 0; i--) {
+ if(c == hearr[i]){
+ addRow(arr[i],c);
+ }
+ }*/
+ //update by wangweipeng 2022/02/21 end
}
//j$(".modal").show();
j$("#myModal1").show();
//浣跨敤瀹氭椂鍣ㄨ缃厜鏍囧畾浣嶅洜涓哄鏋滄槸寮瑰嚭閫夋嫨鏈儴鐨勬涔嬪悗鍐嶈缃� 浼氬畾浣嶄笉鍒�
- alert('');
setTimeout(function(){j$("#xiaomaCode").focus();},1000);
// j$("#xiaomaCode").focus();
return;
@@ -468,12 +512,13 @@
//numflag= 1 鍏抽棴杈撳叆妗�,娓呯┖鐮佹灙杈撳叆鐨勫��,鍏夋爣鑷姩瀹氫綅鍒扮爜鏋緭鍏�
//j$(".modal").hide();
j$("#myModal1").hide();
-
+ scanType = null;
if(numflag == 0 ){
//鐢ㄦ埛鐐瑰嚮淇濆瓨 1.璁剧疆鏁伴噺鍒板彂璐т欢鏁颁笂 2.璁剧疆灏忕爜鍒版槑缁嗙殑澶囧搧绠＄悊鐮佷笂
if(numObj != null){
- //update wangweipeng 2022/01/12 start
+ //update wangweipeng 2022/02/21 start
+ /*//update wangweipeng 2022/01/12 start
//鎶婂彂璐т欢鏁板瓧娈佃缃负鍙
//numObj.val(j$("#detailTb").find("tr").length-1)
for(var i = 0;i < numObj.length;i++){
@@ -492,9 +537,136 @@
var resultVar = str.substring(0,str.length-1);
// rowObj[0].children[9].children[0].innerText = resultVar;
rowObj[0].children[9].children[0].value = resultVar;
+ //缁欐槑缁嗚璧嬬鐞嗙紪鐮�
+ //rowObj[0].children[10].children[0].value = tableId.rows[1].cells[0].innerHTML;
}
+ }*/
+
+ if(rowObj != null){
+ //鑾峰彇褰撳墠鎵殑鐩�
+ var newHe = document.getElementById("bianma").innerHTML;
+ //鍙栧緱鎵�鏈夊皬鐮� 鏀惧埌澶囧搧绠＄悊鐮佷笂
+ //娉ㄦ剰锛氭湁涓ょ鎯呭喌锛屽鏋滄娆℃壂鐨勫皬绫崇殑鐩掓槸宸茬粡鎵繃鐨勶紝閭ｄ箞鐩存帴鍔犲氨琛岋紝濡傛灉姝ゆ鐨勭洅娌℃湁鎵繃锛岃�屽師鏉ヤ篃鏈夊凡缁忔壂杩囩殑鐩掞紝閭ｄ箞灏遍渶瑕佺壒娈婂鐞�
+ var tableId = document.getElementById("detailTb");
+ var str = '';
+ var str1 = '';
+ var numstr = 0;
+ var he = rowObj[0].children[10].children[0].value;
+ var xiaoma = rowObj[0].children[9].children[0].value;
+ if(tableId.rows.length > 0){//鍒ゆ柇姝ゆ鎵殑鐩掓槸鍚︽湁灏忕爜
+ //棣栧厛鍒ゆ柇褰撳墠鏄庣粏鍘熸潵鏄惁宸茬粡鎵繃鐮�
+ //濡傛灉娌℃壂杩� 閭ｄ箞鍦ㄥ師鏉ョ殑 澶囧搧绠＄悊鐮併�佺鐞嗙紪鐮佸拰鍙戣揣浠舵暟鐨勫�间笂閮介渶瑕佸姞涓婃娆℃壂鐨勫皬鐮�
+ //濡傛灉鎵繃锛岄偅涔堥渶瑕佹妸鍘熸潵姝ょ洅鐨勫皬鐮侀兘鏀规垚姝ゆ鎵殑灏忕爜
+ if(he != null && he != '' && he != undefined && xiaoma != null && xiaoma != '' && xiaoma != undefined){
+ var linshistr = '';//涓存椂灏忕爜鍊�
+ var linshistr1 = '';//涓存椂鐩掔殑鍊�
+ var oldheArray = he.split(',');//鑾峰彇鍘熸潵鐨勬墍鏈夌洅
+ var oldxiaomaArray = xiaoma.split(',');//鑾峰彇鍘熸潵鐨勬墍鏈夊皬鐮�
+ //寰幆鍘熸潵鏄庣粏鐨勭洅
+ for(var i = 0;i < oldheArray.length;i++){
+ if(oldheArray[i] != null && oldheArray[i] != '' && oldheArray[i] != undefined){
+ var oldHe = '';//涓存椂鐘舵�佸彉閲忥紝1锛氬�间笉鍙橈紝2锛氬垹闄ゅ綋鍓嶅皬鐮佸拰鐩掞紝3锛氬綋鍓嶇洅绛変簬鍘熸潵鐩掞紝浣嗘槸褰撳墠灏忕爜娌℃湁鍙樺寲锛屽�艰繕鏄笉鍙�
+ //鍒ゆ柇鍘熸潵鐨勭洅鍜岀幇鍦ㄦ搷浣滅殑鐩掓槸鍚︾浉绛�
+ if(oldheArray[i] == newHe){
+ //濡傛灉鍘熸潵鐨勭洅绛変簬褰撳墠鎿嶄綔鐨勭洅锛岄偅涔堟帴鐫�鍒ゆ柇灏忕爜鎯呭喌
+ //寰幆寮瑰嚭妗嗙殑灏忕爜
+ for(var j=1;j<tableId.rows.length;j++) {
+ //鍘熸潵鐨勫皬鐮佺瓑浜庡綋鍓嶆壂鐨勫皬鐮侊紝閭ｄ箞鍊间笉闇�瑕佹敼鍙�
+ if(oldxiaomaArray[i] == tableId.rows[j].cells[1].innerHTML){
+ oldHe = '3';
+ }
+ }
+ }else{
+ //濡傛灉鍘熸潵鐨勭洅涓嶇瓑浜庡綋鍓嶆搷浣滅殑鐩掞紝閭ｄ箞涓嶉渶瑕佸仛鍙樺寲锛屽�兼妸鐜板湪寰幆鐨勭洅鏀惧埌涓存椂鍙橀噺閲岄潰
+ linshistr += oldxiaomaArray[i] + ',';
+ linshistr1 += oldheArray[i] + ',';
+ }
+ if(oldHe == '3'){
+ linshistr += oldxiaomaArray[i] + ',';
+ linshistr1 += oldheArray[i] + ',';
+ }
+ }
+ }
+ str = linshistr;
+ str1 = linshistr1;
+ //鐢变簬浠ヤ笂鐨勬搷浣滃彧鑳芥壘鍒板師鏉ョ殑鐩掑拰灏忕爜鏄惁鍒犻櫎锛岄偅涔堜竴涓嬬殑鎿嶄綔灏辨槸鎶婃渶鏂版搷浣滅殑鐩掑拰灏忕爜杩藉姞鍒板瓧绗︿覆鐨勬渶鍚庨潰
+ //寰幆寮瑰嚭妗嗙殑灏忕爜
+ for(var j=1;j<tableId.rows.length;j++) {
+ var vFlag = true;//涓存椂鍙橀噺锛岀敤浜庡垽鏂槸鍚﹂渶瑕佽拷鍔�
+ for(var o = 0;o < linshistr.split(',').length ; o++){
+ if(linshistr.split(',')[o] != '' && linshistr.split(',')[o] != null){
+ //鍒ゆ柇鏄惁鏈夌浉绛夌殑鐩�
+ if(linshistr1.split(',')[o] == newHe){
+ //鍒ゆ柇灏忕爜鏄惁涓�鏍凤紝濡傛灉涓�鏍凤紝閭ｄ箞涓嶉渶瑕佽拷鍔�
+ if(linshistr.split(',')[o] == tableId.rows[j].cells[1].innerHTML){
+ vFlag = false;
+ }
+ }
+ }
+ }
+ if(vFlag){
+ //杩藉姞鏂扮殑鐩掑拰灏忕爜
+ str += tableId.rows[j].cells[1].innerHTML + ',';
+ str1 += newHe + ',';
+ }
+ }
+ if(str != '' && str1 != null){
+ str = str.substring(0,str.length-1);
+ str1 = str1.substring(0,str1.length-1);
+ }
+
+ numstr = str == '' ? null : str.split(',').length;
+
+ }else{//濡傛灉鏄庣粏鍘熸潵娌℃湁鎵繃鐮侊紝閭ｄ箞鐩存帴杩藉姞灏辫
+ for(var i=1;i<tableId.rows.length;i++) {
+ str += tableId.rows[i].cells[1].innerHTML + ',';
+ str1 += document.getElementById("bianma").innerHTML + ',';//鐩�
+ }
+ if(str != '' && str1 != null){
+ str = str.substring(0,str.length-1);
+ str1 = str1.substring(0,str1.length-1);
+ }
+ numstr = j$("#detailTb").find("tr").length-1;//鍙戣揣浠舵暟
+
+ }
+ }else{
+ //濡傛灉娌℃湁灏忕爜锛岄偅涔堝垽鏂師鏉ョ殑鏄惁鏈夊皬鐮佸拰鐩掞紝濡傛灉鍘熸潵涔熸病鏈夛紝閭ｄ箞浠�涔堜篃涓嶇敤鍋�
+ //濡傛灉鍘熸潵鏈夛紝閭ｄ箞鎵惧埌绛変簬褰撳墠鐩掔殑鎵�鏈夊皬鐮侊紝閮藉垹闄ゆ帀
+ if(he != null && he != '' && he != undefined && xiaoma != null && xiaoma != '' && xiaoma != undefined){
+ var oldheArray = he.split(',');
+ var oldxiaomaArray = xiaoma.split(',');
+ for(var i = 0;i < oldheArray.length;i++){
+ if(oldheArray[i] != newHe){
+ str += oldxiaomaArray[i] + ',';
+ str1 += oldheArray[i] + ',';
+ }
+ }
+
+ if(str != '' && str1 != null){
+ str = str.substring(0,str.length-1);
+ str1 = str1.substring(0,str1.length-1);
+ }
+
+ numstr = str == '' ? null : str.split(',').length;//鍙戣揣浠舵暟
+ }
+ }
+ if(str == '' && he == '' && xiaoma == ''){
+ checkObj.prop('checked', false);
+ }else{
+ moveToTop(checkObj);
+ checkObj.prop('checked', true).trigger("change");
+ moveToTop(numObj);
+ }
+
+ rowObj[0].children[9].children[0].value = str; //澶囧搧绠＄悊鐮�
+ rowObj[0].children[10].children[0].value = str1;//绠＄悊缂栫爜
+ numObj[0].innerText = numstr;//鍙戣揣浠舵暟
}
+ //update wangweipeng 2022/02/21 end
}
+ }else if(numflag == 1){
+ //濡傛灉涓簍rue锛岄偅涔堣瘉鏄庨�夋嫨鐨勬槸鍙栨秷鎸夐挳锛岄偅涔堥渶瑕佹妸绗竴琛岀殑澶嶉�夋鍘绘帀
+ checkObj.prop('checked', false);
}
var maqCode = j$( '#maqCode' ).val();
alert('==='+j$( '#maqCode' ).val());
@@ -503,7 +675,7 @@
j$("#maqCode").focus();
}
}
- <!-- add by qiuyj 2021-11-30 start pc绔壂鐮佹敮鎸�-->
+ // <!-- add by qiuyj 2021-11-30 start pc绔壂鐮佹敮鎸�-->
j$(document).ready(function(){
j$( '#qrcode' ).unbind();
j$( '#qrcode' ).keypress( function ( e ) {
@@ -571,7 +743,7 @@
}
//鑳借蛋鍒拌繖璇存槑寰呭垹闄ょ殑灏忕爜涓嶅瓨鍦ㄤ簬鏄庣粏鍒楄〃 鎵�浠ヨ缁欏嚭鎻愮ず
if (this.flag == 'delConsumables') {
- alert('蹇呴』鍏堟壂鎻忚鍙栨秷鐨勫皬鐮�');
+ alert('鍒犻櫎鐨勫皬鐮佸凡鍒犻櫎鎴栨湭鎵弿杩�');
this.flag = '';
return false;
}
@@ -621,6 +793,7 @@
j$(".col_Barcode_F__c span").each(function(index) {
if (j$(this).text() && (content.indexOf(j$(this).text()) == 0)) {
rownum.push(this.id.match(/oppTable\:(\d*)/)[1]);
+ console.log('1---'+rownum);
return;
}
var JANCODE = content.substr(3, 12);
@@ -652,6 +825,7 @@
if ($prdSerialNo[index].value.startsWith(content2)) {
if(this.id != undefined){
rownum.push(this.id.match(/oppTable\:(\d*)/)[1]);
+ console.log('2---'+rownum);
return;
}
}
--
Gitblit v1.9.1