From cc266a1e4080bb3ecc47ea4a202dd549545111e1 Mon Sep 17 00:00:00 2001
From: 游畅 <youchang@prec-tech.com>
Date: 星期六, 29 四月 2023 16:10:52 +0800
Subject: [PATCH] 贸易合规20230429
---
force-app/main/default/pages/ConsumEquipmentSetReceived.page | 921 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 905 insertions(+), 16 deletions(-)
diff --git a/force-app/main/default/pages/ConsumEquipmentSetReceived.page b/force-app/main/default/pages/ConsumEquipmentSetReceived.page
index c628c4b..ddd83b0 100644
--- a/force-app/main/default/pages/ConsumEquipmentSetReceived.page
+++ b/force-app/main/default/pages/ConsumEquipmentSetReceived.page
@@ -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,11 +40,118 @@
height: 100px;
width: 30px;
}
+/*add start by youc 2021-12-07 鑰楁潗杩芥函 -鏀惰揣 绠＄悊缂栫爜 澶囧搧绠＄悊鐮佽缃垚鍙
+.col_ManagementCode__c input{
+ border:none;
+ pointer-events: none;
+}
+.col_EquipmentManagementCode__c input{
+ 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
+{
+ display:none;
+ position: fixed; /* Stay in place */
+ z-index: 10; /* Sit on top */
+ left: 0;
+ top: 0;
+ width: 100%; /* Full width */
+ height: 100%; /* Full height */
+ 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
+{
+ background-color: #fefefe;
+ margin: auto;
+ margin-top: 100px;
+ padding: 20px;
+ border: 1px solid #888;
+ width: 120%; /* Could be more or less, depending on screen size */
+}
+/*add end by youc 2021-12-07 鑰楁潗杩芥函 -鏀惰揣*/
+
</style>
<script type="text/javascript">
sforce.connection.sessionId = "{!$Api.Session_ID}";
var JANCODEMap = {};
</script>
+<!-- add by youc 2021-12-07 start 鑰楁潗杩芥函 -鐮佹灙鎵弿涔嬪悗寮瑰嚭妗� -->
+<div id="myModal1" class="modal">
+ <!-- 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>
+ <button onclick="qrsacn(2);return false;" >ipad鎵弿琚嬪瓙鏉″舰鐮�</button>
+ <table style="width:100%" >
+ <!-- <tr><th>褰撳墠璁惧淇℃伅</th></tr>
+ <tr> <td align="right">澶囧搧閰嶅鏄庣粏鍨嬪彿</td> <td><span id="xinghao"/></td> </tr>
+ <tr> <td align="right">鏈鸿韩缂栧彿</td> <td><span id="bianhao"/></td> </tr>
+ <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" />
+ </td>
+ <!-- <td class="headerRow booleanColumn"> <input id="xiaomaCode" onkeypress="return checkXiaoMa(event)" autofocus="autofocus" /> </td> -->
+ <!-- <td class="headerRow booleanColumn" colspan="8"/> -->
+ </tr>
+ </table>
+ <br/>
+ <table id="detailTb" style="width:100%" align="center" >
+ <!-- 鐢ㄥ瓧娈甸泦鏄剧ず鏇寸畝鍗曚竴鐐� 鐩存帴鐢ㄩ偅涓粍浠舵洿鏇寸畝鍗� 浣嗘槸娌＄湅鎳傞偅涓粍浠舵槸鍜嬬敤鐨� 鎵�浠ユ殏鏃剁敤鏈�绗ㄧ殑鏂规硶浜� -->
+ <tr class="headerRow" height="30px">
+ <!-- Fixture_Model_No__c Consumable_Guaranteen_end_F__c SerialNumber_F__c Salesdepartment__c Asset_return_Day__c Return_DeliverySlip__r.Name Hui_Ji_Jia__c Yi_Zhi_Bao_Fei_Jia__c Yi_Zhi_Guo_Qi_Jia__c Shang_Jia_Jia__c WH_location__c Barcode_F__c ManagementCode__c EquipmentManagementCode__c barcodeforReceipt__c -->
+ <!-- <th style="width:25px" class="headerRow booleanColumn"> -->
+ <th class="headerRow booleanColumn">{!$ObjectType.Consum_Apply_Equipment_Set_Detail__c.fields.Fixture_Model_No__c.label}</th>
+ <th class="headerRow booleanColumn">{!$ObjectType.Consum_Apply_Equipment_Set_Detail__c.fields.Consumable_Guaranteen_end_F__c.label}</th>
+ <th class="headerRow booleanColumn">{!$ObjectType.Consum_Apply_Equipment_Set_Detail__c.fields.SerialNumber_F__c.label}</th>
+ <th class="headerRow booleanColumn">{!$ObjectType.Consum_Apply_Equipment_Set_Detail__c.fields.Salesdepartment__c.label}</th>
+ <th class="headerRow booleanColumn">{!$ObjectType.Consum_Apply_Equipment_Set_Detail__c.fields.Asset_return_Day__c.label}</th>
+ <th class="headerRow booleanColumn">鍥炲瘎杩愯緭鍗曞彿</th>
+ <th class="headerRow booleanColumn">{!$ObjectType.Consum_Apply_Equipment_Set_Detail__c.fields.EquipmentManagementCode__c.label}</th>
+ <th class="headerRow booleanColumn">绉昏嚦鎶ュ簾鍖轰欢鏁�</th>
+ <th class="headerRow booleanColumn">绉昏嚦杩囨湡鍖轰欢鏁�</th>
+ <th class="headerRow booleanColumn">涓婃灦浠舵暟</th>
+ <!-- </th> -->
+ </tr>
+ <!-- <tr><td>XXX</td><td>001</td><td> <button value="鍒犻櫎" /></td></tr> -->
+ </table>
+
+ </div>
+</div>
+<!-- add by youc 2021-12-07 end 鑰楁潗杩芥函 -鐮佹灙鎵弿涔嬪悗寮瑰嚭妗� -->
+<!-- add by qiuyj 2021-11-30 start pc绔壂鐮佹敮鎸�-->
+<div id="myModal2" class="modal">
+ <!-- Modal content -->
+ <div class="modal-content" style="width:200px">
+ <span class="close" onclick="stopScan()">×</span>
+ <p>鎵弿涓�</p>
+ <p>Code:<input type="text" id="qrcode"/></p>
+ <video playsinline="true" id="preview" style="width: 100%;z-index: 11;transform: scaleX(-1);margin-top: 10px;"></video>
+ 鎵爜灞ュ巻锛�
+ <ul id="scanedqr" style="list-style-type: none; text-align: center;padding: 0;width: 100%; height: 100px; overflow: auto">
+ </ul>
+ </div>
+</div>
+<!-- add by qiuyj 2021-11-30 end pc绔壂鐮佹敮鎸�-->
<apex:form id="allForm">
<apex:inputHidden value="{!done_flg}" id="done_flg"/>
<apex:outputPanel id="pageallPanel">
@@ -53,6 +160,10 @@
<apex:commandButton style="float:left;" action="{!save}" onclick="blockme();" value="淇濆瓨" rerender="allForm" oncomplete="unblockUI();checkMessage();" />
<apex:commandButton action="{!cancel}" value="鍙栨秷" rerender="allForm"/>
<apex:commandButton onclick="qrsacn(0);return false;" value="鎵竴鎵�楁潗" rerender="allForm"/>
+ <!-- add by youc 2021-12-07 start 鏂板鐮佹灙鎵弿 -->
+ <apex:commandButton onclick="document.getElementById('maqCode').focus();return false" id="maqCodeBtn" value="鐮佹灙鎵弿锛�" style="padding: 6px;font-size: 110%;margin-right: 1px;"/>
+ <input id="maqCode" style="padding:6px" onkeypress="return onKeyPress(event)" autofocus="autofocus" />
+ <!-- add by youc 2021-12-07 end 鏂板鐮佹灙鎵弿 -->
</apex:pageBlockButtons>
<table>
@@ -115,6 +226,459 @@
</apex:outputPanel>
</apex:form>
<script type="text/javascript">
+ //add by youc 2021-12-07 start =====================================start==================================
+ //1.鎵爜鍚庡鐮佺殑鏍￠獙
+ function onKeyPress(e) {
+ var keyCode = null;
+
+ if(e.which)
+ keyCode = e.which;
+ else if(e.keyCode)
+ keyCode = e.keyCode;
+ if(keyCode == 13) {
+ //鎷垮埌褰撳墠杈撳叆code
+ var nowCode = j$( '#maqCode' ).val();
+ filljsQR(nowCode);
+ nowCode = '';
+ return false;
+ }
+ return true;
+ }
+ var numObj; //鍙戣揣浠舵暟鐨� obj
+ var rowObj; //鏄庣粏琛岀殑obj
+ //2.涓哄脊鍑烘閲岀殑淇℃伅璧嬪�� 骞朵笖灞曠ず寮瑰嚭妗�
+ function showTb(paobj,rightObj,condamama,content250) {
+ numObj = rightObj;
+ rowObj = paobj;
+ //鍒犻櫎缂撳瓨
+ var tableId = document.getElementById("detailTb");
+ if(tableId.rows.length > 0){
+ var rownum = tableId.rows.length ;
+ for (i=1;i<rownum;i++) {
+ tableId.deleteRow(i);
+ rownum=rownum-1;
+ i=i-1;
+ }
+ }
+ j$("#SMCode").val(condamama);//鍚庝簲浣�
+ j$("#boxCode").val(content250);//鐩掑瓙鐮�
+ //鏄惁闇�瑕佸睍绀哄凡瀛樺湪淇℃伅,--- 灞曠ず鐨勮瘽鏄笉鏄繕闇�瑕佹妸鎵撳嬀鐨勫睍绀哄嚭鏉� 鐢ㄦ埛娌℃壂鎻忓皬鐮佷篃灞曠ず鍚�(涓嶆樉绀�) 杩樻槸璇村睍绀洪�夎繃鐨勶紙淇濆瓨杩囩殑涔熶笉鍐嶅脊绐楅噷鏄剧ず锛�
+ //椤甸潰涓婃墦浜嗗嬀 鍏充簡妗嗗悗鍙堢偣寮�杩欎釜妗�
+ var codea = '';
+ //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() && content250.indexOf(j$(this).text()) == 0){
+ var ddd = j$(this).parent().parent()[0].children[7].children[0].disabled;//绉昏嚦鎶ュ簾鍖轰欢鏁� 鍒ゆ柇鏄惁鏄彲缂栬緫鐘舵�� 濡傛灉鏄彲缂栬緫鐘舵�侊紝璇存槑杩樻病鏈変繚瀛橈紝杩涜鏀惰揣鍛�
+ if (ddd == false) {
+ //鍒ゆ柇鏄惁鎵撲簡鍕�
+ var bf = j$(this).parent().parent()[0].children[7].children[0].value;
+ var gq = j$(this).parent().parent()[0].children[8].children[0].value;
+ var sj = j$(this).parent().parent()[0].children[9].children[0].value;
+ //var xiaomamma =j$(this).parent().parent()[0].children[13].children[0].value;//灏忕爜 001
+ var xiaomamma =j$(this).parent().parent()[0].children[13].innerText;
+ //var xiaomamma2 =j$(this).parent().parent()[0].children[13].children[0].innerText;
+ console.log('灏忕爜=='+xiaomamma);
+ if (bf== '1') {
+ addRow(xiaomamma,'1');
+ }else if (gq == '1') {
+ addRow(xiaomamma,'2');
+ }else if (sj == '1') {
+ addRow(xiaomamma,'3')
+ }
+ }else{//濡傛灉鏄彧璇荤姸鎬侊紝璇存槑鏄郴缁熷凡缁忓瓨鍦ㄧ殑鏁版嵁浜�
+ var xiaomamma =j$(this).parent().parent()[0].children[13].innerText;
+ //var xiaomamma =j$(this).parent().parent()[0].children[13].children[0].value;
+ var damamma =j$(this).parent().parent()[0].children[12].innerText;
+ codea += damamma+xiaomamma + ',';
+ console.log('灏忕爜=='+codea);
+ j$("#havCode").val(codea);
+ }
+
+ }
+ })
+ // var aa = paobj[0].children[15].children[1].value;
+ // if (aa != null && aa.length > 0) {
+ // //鍚戝脊鍑烘閲屾坊鍔犳槑缁嗚
+ // var arr = aa.split(',');
+ // for (var i = arr.length - 1; i >= 0; i--) {
+ // addRow(arr[i]);
+ // }
+ // }
+ //j$(".modal").show();
+ j$("#myModal1").show();
+ //浣跨敤瀹氭椂鍣ㄨ缃厜鏍囧畾浣嶅洜涓哄鏋滄槸寮瑰嚭閫夋嫨鏈儴鐨勬涔嬪悗鍐嶈缃� 浼氬畾浣嶄笉鍒�
+ setTimeout(function(){j$("#xiaomaCode").focus();},300);
+ // j$("#xiaomaCode").focus();
+ return;
+ // j$("#maqCodeBtn").click();
+ }
+
+ //3.鍏抽棴寮规
+ function stopScan(numflag) {
+ //numflag= 1 鍏抽棴杈撳叆妗�,娓呯┖鐮佹灙杈撳叆鐨勫��,鍏夋爣鑷姩瀹氫綅鍒扮爜鏋緭鍏�
+ //j$(".modal").hide();
+ j$("#myModal1").hide();
+ //鍙栧緱鐩掑瓙鏉″舰鐮�
+ 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");
+
+ if(tableId.rows.length > 0){
+ for(var i=1;i<tableId.rows.length;i++) {
+ var xiaoma = tableId.rows[i].children[6].innerText;
+ var bf = tableId.rows[i].children[7].children[0].checked;
+ var gq = tableId.rows[i].children[8].children[0].checked;
+ var sj = tableId.rows[i].children[9].children[0].checked;
+ //alert('杩涙潵浜�'+xiaoma+'=bf='+bf+'=gq='+gq+'=sj='+sj);
+ var typeflag = '';
+ if (bf) {typeflag = '1';}
+ else if (gq) {typeflag = '2';}
+ else if (sj) {typeflag = '3';}
+ typeMap.set(xiaoma,typeflag)
+ arrXiaoma.push(xiaoma);
+ }
+
+ }
+ }
+ //alert('==typeMap=='+typeMap);
+ //1.鍙栧緱褰撳墠灞曠ず鐨勪俊鎭� --涓轰簡闃叉鍐欒繃澶氱殑浠ｇ爜 鎴戜滑鐩存帴鍙栧睍绀哄垪琛ㄧ殑绗竴琛屽嵆鍙� 鎷垮埌barcode鍜屾墍鍦ㄥ湴鍖烘湰閮�
+ var a = rowObj[0].children[3].innerText; //鎵�鍦ㄥ湴鍖�(鏈儴) 鐜板湪
+ var b = rowObj[0].children[11].innerText; //鏉″舰鐮�
+ var c = rowObj[0].children[12].innerText; //澶х爜
+ //2.鏍规嵁杩欎袱涓�煎彇寰楀睍绀哄垪琛ㄧ殑鏄庣粏琛�
+ //2.1 鍙栧緱barcode鐩稿悓鐨勬暟鎹-- 鍚屼竴涓繚鏈夎澶�
+ let sameAss = [];
+ //鐢ㄤ簬瀛樻斁 灏忕爜锛氬灏戣锛屼究浜庤幏鍙�
+ 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 && 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;
+
+ if(typeMap.has(xiaomamma) && typeMap.get(xiaomamma) == '1' ){
+ j$(this).parent().parent()[0].children[7].children[0].value = '1';
+ 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]);
+ 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[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) {
+ //鍊掑彊锛岀敤浜庡拰寮圭獥妗嗛噷闈㈢殑椤哄簭涓�鏍�
+ 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);
+ 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:'+rn+':') !== -1) {
+ // j$(this).find("input").attr('autofocus', 'autofocus');
+ var rightobj = j$(this).find("input:not(:disabled)");
+ //alert(rn+'=rightobj='+rightobj);
+ moveToTop(rightobj);
+ }
+ })
+ })*/
+ }
+ //update by wangweipeng 2022/02/24 end
+ }
+ j$("#boxCode").val("");
+ setTimeout(function(){j$("#maqCode").focus();},300);
+ }
+
+ //4.鎵皬鐮佷箣鍚庡鐮佺殑鏍￠獙
+ var flag = '';
+ function checkXiaoMa(e) {
+ var keyCode = null;
+ if(e.which)
+ keyCode = e.which;
+ else if(e.keyCode)
+ keyCode = e.keyCode;
+ if(keyCode == 13) {
+ //鎷垮埌褰撳墠杈撳叆code 鍏堟壂灏忕爜 鍐嶆壂涓変釜鍖�
+ var nowCode = j$( '#xiaomaCode' ).val();
+ //alert(nowCode);
+ //鍒ゆ柇杩欎釜灏忕爜鏄惁涓� delConsumables(鍒犻櫎鑰楁潗) 濡傛灉鏄� 瀛樿淇℃伅鍒癴lag涓�
+ if (nowCode == 'delConsumables') {
+ this.flag = 'delConsumables';
+ j$( '#xiaomaCode' ).val("");
+ return;
+ }
+ //鍒ゆ柇杩欎釜灏忕爜鏄惁涓� saveConsumables(淇濆瓨鑰楁潗) 濡傛灉鏄� 淇濆瓨
+ if (nowCode == 'saveConsumables') {
+ //鐩稿綋浜庣偣鍑讳繚瀛樻寜閽�
+ stopScan(0);
+ j$( '#xiaomaCode' ).val("");
+ j$("#maqCode").focus();
+ return;
+ }
+ //鍒ゆ柇杩欎釜灏忕爜鏄惁涓� cancelConsumables(鍙栨秷鑰楁潗) 濡傛灉鏄� 鍙栨秷
+ if (nowCode == 'cancelConsumables') {
+ //鐩稿綋浜庣偣鍑诲彇娑堟寜閽�
+ stopScan(1);
+ j$( '#xiaomaCode' ).val("");
+ return;
+ }
+ //鍒ゆ柇褰撳墠灏忕爜鐨勫�� 鏄惁涓�(moveToBaoFei 绉昏嚦鎶ュ簾鍖�) (moveToGuoqi 绉昏嚦杩囨湡鍖�) (shangjiaQuantity 涓婃灦浠舵暟)
+ var tableId = document.getElementById("detailTb");
+ if (nowCode.length != 3) {
+ if (tableId.children[0].children[tableId.rows.length-1].children[7].children[0] == undefined) {
+ alert('璇峰厛鎵皬鐮�');
+ j$( '#xiaomaCode' ).val("");
+ return;
+ }
+ }
+
+ if (nowCode == 'moveToBaoFei') {
+ //鍙栧緱涓婁竴涓壂鐨勬潯鐮�
+ tableId.children[0].children[tableId.rows.length-1].children[7].children[0].checked = true;
+ 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 = false;
+ //alert('moveToBaoFei'+nowCode);
+ j$( '#xiaomaCode' ).val("");
+ return;
+ }
+ if (nowCode == 'moveToGuoqi') {
+ //鍙栧緱涓婁竴涓壂鐨勬潯鐮�
+ tableId.children[0].children[tableId.rows.length-1].children[7].children[0].checked = false;
+ tableId.children[0].children[tableId.rows.length-1].children[8].children[0].checked = true;
+ tableId.children[0].children[tableId.rows.length-1].children[9].children[0].checked = false;
+ j$( '#xiaomaCode' ).val("");
+ return;
+ }
+ if (nowCode == 'shangjiaQuantity') {
+ tableId.children[0].children[tableId.rows.length-1].children[7].children[0].checked = false;
+ 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;
+ 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("");
+ // return;
+ // }
+ //濡傛灉鎵殑灏忕爜涔嬪墠鎵弿杩囧苟淇濆瓨浜� 鎻愮ず淇℃伅
+ // var tableId = document.getElementById("detailTb");
+ // debugger;
+ var havCode = document.getElementById("havCode").value;
+ //瀛樺湪浜庡凡缁忔壂鎻忚繃鐨勭爜 缁欏嚭鎻愮ず
+ 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[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('宸茶繘鍏ュ垹闄ゅ皬鐮佹搷浣滐紝璇锋壂鎻忔纭殑灏忕爜');
+ j$( '#xiaomaCode' ).val("");
+ this.flag = '';
+ return;
+ } else if(nowCode != null && nowCode.length == 3 && !isNaN(nowCode)){
+ }else{
+ alert('褰撳墠灏忕爜涓嶆纭�');
+ j$( '#xiaomaCode' ).val("");
+ return;
+ }
+ alert('鎵弿鐨勫皬鐮佸湪鍙戣揣鏄庣粏涓笉瀛樺湪鎴栨湭瀵勫洖锛岃閲嶆柊鎵弿!');
+ j$( '#xiaomaCode' ).val("");
+ return;
+ }else{
+ //鍒ゆ柇鏄惁宸茬粡鎵弿杩�
+ // var tableId = document.getElementById("detailTb");
+ if(tableId.rows.length > 0){
+ for(var i=1;i<tableId.rows.length;i++) {
+ console.log(nowCode+'=498='+tableId.rows[i].cells[6].innerHTML);
+ if(nowCode == tableId.rows[i].cells[6].innerHTML){
+ if (this.flag == 'delConsumables') {
+ //鍒犻櫎杩欎竴琛�
+ tableId.rows[i].remove();
+ this.flag = '';
+ j$( '#xiaomaCode' ).val("");
+ 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('灏忕爜宸叉壂鎻忥紝鏃犻渶鍐嶆鎵弿锛�');
+ // 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,'');
+ }
+ }
+ return;
+ }
+ return;
+ }
+ //5.娣诲姞1琛�
+ function addRow(nowcode,xm) {
+ // 鍙栧緱瀵瑰簲鐨勬槑缁嗚
+ //1. 鎷垮埌寰呭睍绀虹殑鏁版嵁
+ var a = rowObj[0].children[0].innerText; //澶囧搧閰嶅鏄庣粏鍨嬪彿
+ var b = rowObj[0].children[1].innerText; //娑堣�楀搧鏈夋晥鏈熻嚦
+ var c = rowObj[0].children[2].innerText; //鏈鸿韩缂栧彿
+ var d = rowObj[0].children[3].innerText; //鎵�鍦ㄥ湴鍖�(鏈儴) 鐜板湪
+ var e = rowObj[0].children[4].innerText; //鍥炲瘎鏃�
+ var f = rowObj[0].children[5].innerText; //鍥炲瘎杩愯緭鍗曞彿
+/**
+ j$("#detailTb").append("<tr><td>"+a+"</td><td>"+b+"</td><td>"+c+"</td><td>"+d+"</td><td>"+e+"</td><td>"+f+"</td><td>"+nowcode+"</td><td><input type=\"checkbox\" onchange=\"checktype(1,j$(this))\" /></td><td><input type=\"checkbox\" onchange=\"checktype(2,j$(this))\" /></td><td><input type=\"checkbox\" onchange=\"checktype(3,j$(this))\"/></td></tr>");
+**/
+ j$('#detailTb').append('<tr><td>'+a+'</td><td>'+b+'</td><td>'+c+'</td><td>'+d+'</td><td>'+e+'</td><td>'+f+'</td><td>'+nowcode+'</td><td><input type=\'checkbox\' onchange=\'checktype(1,j$(this))\' /></td><td><input type=\'checkbox\' onchange=\'checktype(2,j$(this))\' /></td><td><input type=\'checkbox\' onchange=\'checktype(3,j$(this))\'/></td></tr>');
+ //鍒ゆ柇鏄摢涓被鍨�
+ j$('#detailTb tr:last').find('td')[7].children[0].checked = xm == '1' ? true : false;
+ j$('#detailTb tr:last').find('td')[8].children[0].checked = xm == '2' ? true : false;
+ j$('#detailTb tr:last').find('td')[9].children[0].checked = xm == '3' ? true : false;
+ //娓呯┖杈撳叆妗�
+ j$( '#xiaomaCode' ).val("");
+
+ }
+ //6.閫変腑涓�涓被鍨嬪悗鍏朵粬涓や釜鑷姩鍙栨秷鍕鹃��
+ function checktype(num,checjObj) {
+ // body...
+ var tr = checjObj.parent().parent();
+ // debugger;
+ tr[0].children[7].children[0].checked = num == 1 ? true : false;
+ tr[0].children[8].children[0].checked = num == 2 ? true : false;
+ tr[0].children[9].children[0].checked = num == 3 ? true : false;
+ // debugger;
+ }
+ //add by youc 2021-12-07 end =====================================end==================================
j$(document).ready(function(){
// j$( '#qrcode' ).unbind();
// j$( '#qrcode' ).keypress( function ( e ) {
@@ -123,14 +687,193 @@
// return false;
// }
// });
+ //<!-- add by qiuyj 2021-11-30 start pc绔壂鐮佹敮鎸�-->
+ j$( '#qrcode' ).unbind();
+ j$( '#qrcode' ).keypress( function ( e ) {
+ if ( e.which == 13 ) {
+ filljsQR(j$( '#qrcode' ).val());
+ j$("#scanedqr").append("<li>"+j$( '#qrcode' ).val()+"</li>");
+ j$("#scanedqr").animate({ scrollTop: j$("#scanedqr").prop("scrollHeight")}, 1000);
+ j$('#myModal2').hide();
+ return false;
+ }
+ });
+ //<!-- add by qiuyj 2021-11-30 end pc绔壂鐮佹敮鎸�-->
var tbwidth = j$('#tableHeader').css('width');
tbwidth = parseInt(tbwidth.slice(0, -2)) - 76;
j$('#tableHeader').css('width', tbwidth+'px');
j$('#tableData').css('width', tbwidth+'px');
});
+ // add by youc 2022-01-11 start
+ //ipad鎵畬灏忕爜涔嬪悗
+ var ipadflag = '';
+ var ipadnowCode;
+ function checkipadXiaoMa(ipadnowCode1) {
+ ipadnowCode = ipadnowCode1;
+ console.log('0=='+ipadnowCode+ipadflag);
+ if (ipadnowCode == 'delConsumables') {
+ ipadflag = 'delConsumables';
+ return false;
+ }
+ //鍒ゆ柇杩欎釜灏忕爜鏄惁涓� saveConsumables(淇濆瓨鑰楁潗) 濡傛灉鏄� 淇濆瓨
+ else if (ipadnowCode == 'saveConsumables') {
+ //鐩稿綋浜庣偣鍑讳繚瀛樻寜閽�
+ stopScan(0);
+ return false;
+ }
+ //鍒ゆ柇杩欎釜灏忕爜鏄惁涓� cancelConsumables(鍙栨秷鑰楁潗) 濡傛灉鏄� 鍙栨秷
+ else if (ipadnowCode == 'cancelConsumables') {
+ //鐩稿綋浜庣偣鍑诲彇娑堟寜閽�
+ stopScan(1);
+ return false;
+ }
+ console.log('1=='+ipadnowCode);
+ //鍒ゆ柇褰撳墠灏忕爜鐨勫�� 鏄惁涓�(moveToBaoFei 绉昏嚦鎶ュ簾鍖�) (moveToGuoqi 绉昏嚦杩囨湡鍖�) (shangjiaQuantity 涓婃灦浠舵暟)
+ var tableId = document.getElementById("detailTb");
+ if (ipadnowCode.length != 3) {
+ if (tableId.children[0].children[tableId.rows.length-1].children[7].children[0] == undefined) {
+ alert('璇峰厛鎵皬鐮�')
+ console.log('2=='+ipadnowCode+ipadflag);
+ return false;
+ }
+ }
+ if (ipadnowCode == 'moveToBaoFei') {
+ //鍙栧緱涓婁竴涓壂鐨勬潯鐮�
+ tableId.children[0].children[tableId.rows.length-1].children[7].children[0].checked = true;
+ 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 = false;
+ return false
+ }else if (ipadnowCode == 'moveToGuoqi') {
+ //鍙栧緱涓婁竴涓壂鐨勬潯鐮�
+ tableId.children[0].children[tableId.rows.length-1].children[7].children[0].checked = false;
+ tableId.children[0].children[tableId.rows.length-1].children[8].children[0].checked = true;
+ tableId.children[0].children[tableId.rows.length-1].children[9].children[0].checked = false;
+ return false
+ }else if (ipadnowCode == 'shangjiaQuantity') {
+ tableId.children[0].children[tableId.rows.length-1].children[7].children[0].checked = false;
+ 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;
+ //瀛樺湪浜庡凡缁忔壂鎻忚繃鐨勭爜 缁欏嚭鎻愮ず
+ 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[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('宸茶繘鍏ュ垹闄ゅ皬鐮佹搷浣滐紝璇锋壂鎻忔纭殑灏忕爜')
+ ipadflag = '';
+
+ return false;
+ }else if(ipadnowCode != null && ipadnowCode.length == 3 && !isNaN(ipadnowCode)){
+ }else{
+ alert('褰撳墠灏忕爜涓嶆纭�');
+ return;
+ }
+ alert('鎵弿鐨勫皬鐮佸湪鍙戣揣鏄庣粏涓笉瀛樺湪鎴栨湭瀵勫洖锛岃閲嶆柊鎵弿!')
+ return;
+ }else{
+ //鍒ゆ柇鏄惁宸茬粡鎵弿杩�
+ // var tableId = document.getElementById("detailTb");
+ var flagto =false;
+ if(tableId.rows.length > 0){
+ for(var i=1;i<tableId.rows.length;i++) {
+ //alert(ipadnowCode+'=498='+tableId.rows[i].cells[6].innerHTML)
+ if(ipadnowCode == tableId.rows[i].cells[6].innerHTML){
+ console.log('4==='+ipadflag);
+ if (null!=ipadflag && ipadflag == 'delConsumables') {
+ //鍒犻櫎杩欎竴琛�
+ tableId.rows[i].remove();
+ ipadflag = '';
+ flagto =true;
+ //return;
+ 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')
+ // this.j$alert('ceshi','123',{
+ // confirmButtonText:'纭畾',
+ // });
+ // j$
+ //alert(1)
+ alert('灏忕爜宸叉壂鎻忥紝鏃犻渶鍐嶆鎵弿锛�');
+ //宸蹭负鎮ㄦ粸鍚�!
+ //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;
+ }
+ }
+ }
+ //
+
+ }
+ if(!flagto){
+ addRow(ipadnowCode,'');
+ }
+
+ }
+ }
+ return true;
+ }
+ // add by youc 2022-01-11 end
+
function checkMessage() {
if (j$(escapeVfId('allPage:allForm:done_flg')).val() == 'true') {
- alert("淇濆瓨鎴愬姛");
+ alert('淇濆瓨鎴愬姛');
}
}
@@ -142,14 +885,21 @@
function filljsQR(content) {
if (scanType == 1) {
j$("input[name$='slipNo']").val(content);
+ }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);
}
let rownum = [];
var $Col_Scroll = j$(".dataRow.col_Scroll");
- j$(".col_Barcode_F__c span").each(function(index) {
+ //update by youc 2021-12-07 start 鏍规嵁col_barcodeforReceipt__c灞曠ず 闃叉閲嶅
+ // 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;
@@ -187,8 +937,41 @@
}
}
})
- if (rownum.length == 0) {
- alert('鎵弿鐨勮�楁潗涓嶅瓨鍦�!')
+ var maqiang = j$( '#maqCode' ).val();
+ 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{
+ 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) {
@@ -217,34 +1000,57 @@
action: function () {
var rn = this.$content.find('#salesDept').val();
var leftobj = j$("input[name$='oppTable_L:"+rn+":rowCheck']:not(:disabled)");
- moveToTop(leftobj);
- leftobj.prop('checked', true).trigger("change");
+ //moveToTop(leftobj);
+ //娉ㄩ噴 by youc 鍥犱负 涔嬪墠鐨勯�昏緫鏄洿鎺ユ壘鍒版暣涓�涓澶囧苟涓旂疆椤跺苟鍕鹃��
+ // leftobj.prop('checked', true).trigger("change");
+ //娉ㄩ噴 by youc 鍥犱负 涔嬪墠鐨勯�昏緫鏄洿鎺ユ壘鍒版暣涓�涓澶囧苟涓旂疆椤跺苟鍕鹃��
+
j$(".col_Yi_Zhi_Bao_Fei_Jia__c").each(function () {
if (j$(this).children()[0] && j$(this).children()[0].id.indexOf('oppTable:'+rn+':') !== -1) {
// j$(this).find("input").attr('autofocus', 'autofocus');
var rightobj = j$(this).find("input:not(:disabled)");
- moveToTop(rightobj);
- rightobj.focus();
+ //moveToTop(rightobj);
+ // rightObj.focus();
+ //add by youc 2021-12-07 start 灞曠ず寮瑰嚭妗�
+ var paobj = j$(this).parent();
+ var condamama = content250.substr(-5);
+ showTb(paobj,rightobj,condamama,content250);
+ //add by youc 2021-12-07 end 灞曠ず寮瑰嚭妗�
return;
}
})
}
},
cancel: {
- text: '鍙栨秷'
+ text: '鍙栨秷',
+ //add by youc 2021-11-30 start
+ action: function () {
+ if(maqiang !='' && maqiang !=undefined){
+ j$("#maqCode").val("");
+ j$("#maqCode").focus();
+ }
+ }
+
}
}
});
} else {
var leftobj = j$("input[name$='oppTable_L:"+rownum[0]+":rowCheck']:not(:disabled)");
- moveToTop(leftobj);
- leftobj.prop('checked', true).trigger("change");
+ //moveToTop(leftobj);
+ //娉ㄩ噴 by youc 鍥犱负 涔嬪墠鐨勯�昏緫鏄洿鎺ユ壘鍒版暣涓�涓澶囧苟涓旂疆椤跺苟鍕鹃��
+ // leftobj.prop('checked', true).trigger("change");
+ //娉ㄩ噴 by youc 鍥犱负 涔嬪墠鐨勯�昏緫鏄洿鎺ユ壘鍒版暣涓�涓澶囧苟涓旂疆椤跺苟鍕鹃��
j$(".col_Yi_Zhi_Bao_Fei_Jia__c").each(function () {
if (j$(this).children()[0] && j$(this).children()[0].id.indexOf('oppTable:'+rownum[0]+':') !== -1) {
// j$(this).find("input").attr('autofocus', 'autofocus');
var rightobj = j$(this).find("input:not(:disabled)");
- moveToTop(rightobj);
- rightobj.focus();
+ //moveToTop(rightobj);
+ //rightobj.focus();
+ //灞曠ず寮瑰嚭妗� add by youc 2021-12-07 start
+ var paobj = j$(this).parent();
+ var condamama = content250.substr(-5);
+ showTb(paobj,rightobj,condamama,content250);
+ //灞曠ず寮瑰嚭妗� add by youc 2021-12-07 end
return;
}
})
@@ -294,8 +1100,91 @@
if (!standalone && !safari && ios) {
window.location.href="sfqr://scan";
} else {
- alert('鎵弿鏉″舰鐮佽浣跨敤App');
+ //<!-- add by qiuyj 2021-11-30 start pc绔壂鐮佹敮鎸�-->
+ j$("#myModal2").show();
+ j$("#qrcode").focus();
+ //<!-- add by qiuyj 2021-11-30 end pc绔壂鐮佹敮鎸�-->
+ //alert('鎵弿鏉″舰鐮佽浣跨敤App');
}
}
+
+ // 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