From 1312ba82d4c880bdb5357d28e0d4af5b285f610f Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 10 三月 2022 15:54:39 +0800
Subject: [PATCH] 最近一月修改内容
---
force-app/main/default/pages/ConsumEquipmentSetReceived.page | 130 ++++++++++++++++++++++++++++++++++++------
1 files changed, 110 insertions(+), 20 deletions(-)
diff --git a/force-app/main/default/pages/ConsumEquipmentSetReceived.page b/force-app/main/default/pages/ConsumEquipmentSetReceived.page
index a336cd5..4aec46b 100644
--- a/force-app/main/default/pages/ConsumEquipmentSetReceived.page
+++ b/force-app/main/default/pages/ConsumEquipmentSetReceived.page
@@ -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,7 +49,7 @@
border:none;
pointer-events: none;
}
-*/
+ */
.col_barcodeforReceipt__c{
display: none;
}
@@ -108,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"/> -->
@@ -452,6 +452,7 @@
//update by wangweipeng 2022/02/24 end
}
j$("#boxCode").val("");
+ setTimeout(function(){j$("#maqCode").focus();},300);
}
//4.鎵皬鐮佷箣鍚庡鐮佺殑鏍￠獙
@@ -522,12 +523,36 @@
return;
}
//鎵归噺璧嬪�肩殑涓�涓搷浣�
- if (nowCode == 'AllmoveToBaoFei') {
+ 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;
}
}
@@ -548,7 +573,7 @@
var YZCode =SMCode+nowCode;
//if (havCode.indexOf(nowCode) != -1) {
if (havCode.indexOf(YZCode) != -1) {
- alert('璇ユ槑缁嗗凡淇濆瓨杩�,璇烽噸鏂板皾璇�');
+ alert('璇ユ槑缁嗗凡淇濆瓨杩�,涓嶈兘鍐嶈繘琛屼慨鏀�');
j$( '#xiaomaCode' ).val("");
return;
}
@@ -556,18 +581,22 @@
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(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{
@@ -575,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') {
//鍒犻櫎杩欎竴琛�
@@ -585,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,'');
}
}
@@ -709,6 +754,33 @@
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;
@@ -717,24 +789,27 @@
var YZCode =SMCode+ipadnowCode;
//if (havCode.indexOf(ipadnowCode) != -1) {
if (havCode.indexOf(YZCode) != -1) {
- alert('璇ユ槑缁嗗凡淇濆瓨杩�,璇烽噸鏂板皾璇�')
+ alert('璇ユ槑缁嗗凡淇濆瓨杩�,涓嶈兘鍐嶈繘琛屼慨鏀�')
return false;
}
//aa 鎷垮埌璇ヤ繚鏈夎澶囧搴旂殑鎵�鏈夊皬鐮� 鍒ゆ柇鏄惁瀛樺湪
var aa = rowObj[0].children[17].children[1].value;
if (aa != null && aa.length > 0) {
-
//鍚戝脊鍑烘閲屾坊鍔犳槑缁嗚
//if (aa.indexOf(ipadnowCode) == -1) {
if (aa.indexOf(YZCode) == -1) {
console.log('3=='+ipadnowCode+'==='+ipadflag);
if (ipadflag == 'delConsumables') {
- alert('蹇呴』鍏堟壂鎻忚鍙栨秷鐨勫皬鐮�')
+ alert('宸茶繘鍏ュ垹闄ゅ皬鐮佹搷浣滐紝璇锋壂鎻忔纭殑灏忕爜')
ipadflag = '';
return false;
+ }else if(ipadnowCode != null && ipadnowCode.length == 3 && !isNaN(ipadnowCode)){
+ }else{
+ alert('褰撳墠灏忕爜涓嶆纭�');
+ return;
}
- alert('鎵弿鐨勫皬鐮佸湪鍙戣揣鏄庣粏涓笉瀛樺湪锛岃閲嶆柊鎵弿!')
+ alert('鎵弿鐨勫皬鐮佸湪鍙戣揣鏄庣粏涓笉瀛樺湪鎴栨湭瀵勫洖锛岃閲嶆柊鎵弿!')
return;
}else{
//鍒ゆ柇鏄惁宸茬粡鎵弿杩�
@@ -754,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')
@@ -762,10 +841,21 @@
// });
// j$
//alert(1)
- alert('宸蹭负鎮ㄦ粸鍚�!');
+ 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;
+ }
}
}
//
@@ -876,7 +966,7 @@
//add by youc 2021-12-07 end 鍒犻櫎杈撳叆妗嗗唴瀹� 骞跺厜鏍囪嚜鍔ㄥ畾浣嶅埌杈撳叆妗�
return false;
} else if(allboxbarcode.indexOf(content250) == -1){
- alert('鎵弿鐨勭洅涓庡彂璐ф椂涓嶄竴鑷达紝璇烽噸鏂版壂鎻�');
+ alert('鎵弿鐨勭洅涓庡彂璐ф椂涓嶄竴鑷存垨鏈瘎鍥烇紝璇烽噸鏂版壂鎻�');
if(maqiang !='' && maqiang !=undefined){
j$("#maqCode").val("");
j$("#maqCode").focus();
--
Gitblit v1.9.1