From cb4bae31a02af72fea30e1a57c1d498eabef5d01 Mon Sep 17 00:00:00 2001
From: 李彤 <litong@prec-tech.com>
Date: 星期四, 16 三月 2023 10:17:12 +0800
Subject: [PATCH] 同步代码
---
force-app/main/default/pages/ConsumEquipmentSetShipment.page | 929 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 817 insertions(+), 112 deletions(-)
diff --git a/force-app/main/default/pages/ConsumEquipmentSetShipment.page b/force-app/main/default/pages/ConsumEquipmentSetShipment.page
index fc05b02..a5b4416 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}" >
<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">
@@ -22,7 +22,7 @@
{
padding: 6px;
font-size: 110%;
- margin-right: 20px;
+ margin-right: 10px;
}
.col_Barcode_F__c
{
@@ -36,26 +36,128 @@
height: 100px;
width: 30px;
}
+/* 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;
+ 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 */
+}
+/* Modal Content/Box */
+.modal-content
+{
+ background-color: #fefefe;
+ margin: auto;
+ margin-top: 100px;
+ padding: 20px;
+ border: 1px solid #888;
+ width: 50%; /* Could be more or less, depending on screen size */
+}
+.bPageBlock .pbTitle
+{
+ width: 0%;
+}
+/* add by rentx 2021-10-21 start 璁剧疆灞曠ず妗� */
+
+.close {
+ color: #aaaaaa;
+ float: right;
+ font-size: 28px;
+ font-weight: bold;
+}
+.close:hover,
+.close:focus {
+ color: #000;
+ text-decoration: none;
+
+}
</style>
<script type="text/javascript">
sforce.connection.sessionId = "{!$Api.Session_ID}";
var JANCODEMap = {};
</script>
+<!-- add by rentx 2021-10-19 start 鑰楁潗杩芥函 -鐮佹灙鎵弿涔嬪悗寮瑰嚭妗� -->
+<div id="myModal1" class="modal">
+ <!-- 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>
+ <table style="width:85%" >
+ <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" value=""/></td> </tr>
+ <tr>
+ <td onclick="document.getElementById('xiaomaCode').focus();return false" align="right">鐮佹灙鎵弿琚嬪瓙鏉″舰鐮�</td>
+ <td> <input id="xiaomaCode" onkeypress="return checkXiaoMa(event)" autofocus="autofocus" /> </td>
+ </tr>
+ </table>
+ <br/>
+ <table id="detailTb" style="width:85%" >
+ <tr><th>绠＄悊缂栫爜</th><th>澶囧搧绠＄悊鐮�</th><th>鎿嶄綔</th></tr>
+ <!-- <tr><td>XXX</td><td>001</td><td> <button value="鍒犻櫎" /></td></tr> -->
+ </table>
+ </div>
+</div>
+<!-- add by rentx 2021-10-19 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"/>
+ <!-- update wangweipeng 2022/01/28 start -->
+ <!-- <apex:inputHidden value="{!done_flg}" id="done_flg"/> -->
+ <!-- update wangweipeng 2022/01/28 start -->
<apex:outputPanel id="pageallPanel">
<apex:pageBlock id="searchBlock" tabStyle="Report">
<apex:pageBlockButtons location="top">
- <apex:commandButton style="float:left;" action="{!save}" onclick="blockme();" value="淇濆瓨" rerender="allForm" oncomplete="unblockUI();checkMessage();checEventFrame()" />
+ <apex:commandButton action="{!save}" onclick="blockme();" value="淇濆瓨" rerender="allForm" oncomplete="unblockUI();checkMessage();checEventFrame()" />
<apex:commandButton action="{!cancel}" value="鍙栨秷" rerender="allForm" oncomplete="checEventFrame()"/>
<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="allForm" oncomplete="unblockUI();checkMessage();checEventFrame()"/>
+ <apex:commandButton onclick="blockme();" action="{!send}" value="鍙戣揣" rerender="message" oncomplete="unblockUI();checkMessage();checEventFrame()"/>
+ <!-- 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;"/>
+ <input autofocus="autofocus" id="maqCode" name="maqCode" style="padding:6px" onkeypress="return onKeyPress(event)" />
+ <!-- autofocus="autofocus" -->
+ <!-- add by rentx 2021-10-21 end 鏂板鐮佹灙鎵弿 -->
+
</apex:pageBlockButtons>
-
+
<table>
<tr>
+
<td width="20px"/>
<td width="35%">
<apex:outputLabel for="applyNo" value="鐢宠鍗曞彿锛�" />
@@ -81,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 >
@@ -116,6 +219,9 @@
<div style="clear:both;"></div>
<apex:outputPanel id="message">
+ <!-- add wangweipeng 2022/01/28 start -->
+ <apex:inputHidden value="{!done_flg}" id="done_flg"/>
+ <!-- add wangweipeng 2022/01/28 end -->
<apex:pageMessages />
</apex:outputPanel>
</apex:pageBlock>
@@ -123,6 +229,8 @@
<apex:outputPanel id="checEventFrame">
<script>
function checEventFrame() {
+ //var aaa=j$(escapeVfId('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable:2:j_id162:9:j_id169')).val();
+ // alert('checEventFrame==='+aaa);
j$('select[name$="deliveryType"]').val('鍙戣揣');
j$('select[name$="deliveryType"]').prop('disabled', true);
@@ -138,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");
})
@@ -148,11 +257,476 @@
j$('.messageText').text('鍙栧緱浜� {!changeMessage} 鏉℃暟鎹�')
}
}
+ //20220215 瀛楁闆嗕腑鐨勮緭鍏ユ鍙樻垚鍙锛屼笉鑳界洿鎺ュ彉鎴恠pan锛屽惁鍒欏悗鍙板彇涓嶅埌鍊�
+ //j$("#tableData input[type=text]").attr("readonly",true); 鍏堥殣钘忔帀
+ //j$("#tableData input[type=text]").attr("disabled","disabled");
</script>
</apex:outputPanel>
</apex:outputPanel>
</apex:form>
<script type="text/javascript">
+
+
+
+
+
+ // add by rentx 2021-10-19 start 鑰楁潗杩芥函 -鐮佹灙鎵爜涔嬪悗灞曠ず寮瑰嚭妗�
+ //涔嬪墠鏄� 鎵埌鑰楁潗涔嬪悗 鑷姩鍕鹃�夌疆椤跺苟瀹氫綅鍒板搴旂殑鍙戣揣浠舵暟杈撳叆妗�
+ //鐜板湪闇�瑕� 鎵埌鑰楁潗涔嬪悗 鑷姩鍕鹃�夌疆椤跺苟瀹氫綅鍒板搴旂殑鍙戣揣浠舵暟杈撳叆妗� 骞跺脊鍑虹晫闈� 鍏夋爣鑷姩瀹氫綅鍒�"鐮佹灙鎵弿琚嬪瓙鏉″舰鐮�"
+ var numObj; //鍙戣揣浠舵暟鐨� obj
+ var rowObj; //鏄庣粏琛岀殑obj
+ var checkObj; //澶嶉�夋鐨刼bj
+ var flag = ''; //璇ュ彉閲忎細鏈�"cancelConsumables"(鍙栨秷鑰楁潗) 鍜� "saveConsumables"(淇濆瓨鑰楁潗)
+ //鎵爜寮瑰嚭妗嗕箣鍚� 鎵皬鐮佺殑鎿嶄綔 --
+ //1.娣诲姞涓�琛�
+ function addRow(nowcode,bianma) {
+ //鑾峰彇table 骞朵笖娣诲姞 鍊奸渶瑕佸甫杩囨潵鎴栬�呮煡涓�涓�
+ //绠＄悊缂栫爜鏆傚畾
+ j$("#detailTb").append("<tr><td>"+bianma+"</td><td>"+nowcode+"</td><td> <button onclick=\"delRow(j$(this))\">鍒犻櫎 </button> </td></tr>");
+ //娓呯┖杈撳叆妗�
+ j$( '#xiaomaCode' ).val("");
+
+ }
+ //2.鍒犻櫎褰撳墠琛�
+ function delRow(tr) {
+ //鑾峰彇寰呭垹闄ょ殑琛� 鍒犳帀
+ j$(tr).parent().parent().remove();
+ }
+ //3.鎵爜鏋� 鎵畬灏忕爜涔嬪悗
+ 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();
+ //鍒ゆ柇杩欎釜灏忕爜鏄惁涓� delConsumables(鍒犻櫎鑰楁潗) 濡傛灉鏄� 瀛樿淇℃伅鍒癴lag涓�
+ if (nowCode == 'delConsumables') {
+ this.flag = 'delConsumables';
+ j$( '#xiaomaCode' ).val("");
+ return false;
+ }
+ //鍒ゆ柇杩欎釜灏忕爜鏄惁涓� saveConsumables(淇濆瓨鑰楁潗) 濡傛灉鏄� 淇濆瓨
+ if (nowCode == 'saveConsumables') {
+ //鐩稿綋浜庣偣鍑讳繚瀛樻寜閽�
+ stopScan(0);
+ j$( '#xiaomaCode' ).val("");
+ return false;
+ }
+ //鍒ゆ柇杩欎釜灏忕爜鏄惁涓� cancelConsumables(鍙栨秷鑰楁潗) 濡傛灉鏄� 鍙栨秷
+ if (nowCode == 'cancelConsumables') {
+ //鐩稿綋浜庣偣鍑诲彇娑堟寜閽�
+ stopScan(1);
+ j$( '#xiaomaCode' ).val("");
+ 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");
+ if(tableId.rows.length > 0){
+ var str = '';
+ for(var i=1;i<tableId.rows.length;i++) {
+ if(nowCode == tableId.rows[i].cells[1].innerHTML){
+ if (this.flag == 'delConsumables') {
+ //鍒犻櫎杩欎竴琛�
+ tableId.rows[i].remove();
+ this.flag = '';
+ }else{
+ alert('灏忕爜宸插瓨鍦�');
+ }
+ //娓呯┖杈撳叆妗�
+ j$( '#xiaomaCode' ).val("");
+ return false;
+ }
+ }
+ }
+ //鑳借蛋鍒拌繖璇存槑寰呭垹闄ょ殑灏忕爜涓嶅瓨鍦ㄤ簬鏄庣粏鍒楄〃 鎵�浠ヨ缁欏嚭鎻愮ず
+ if (this.flag == 'delConsumables') {
+ alert('鍒犻櫎鐨勫皬鐮佸凡鍒犻櫎鎴栨湭鎵弿杩�');
+ j$( '#xiaomaCode' ).val("");
+ this.flag = '';
+ return false;
+ }
+ var bianma = document.getElementById("bianma").innerHTML;
+ addRow(nowCode,bianma);
+ }else{
+ //娓呯┖杈撳叆妗�
+ j$( '#xiaomaCode' ).val("");
+ alert('褰撳墠灏忕爜涓嶆纭�')
+ }
+ return false;
+ }
+ return true;
+ }
+ //4.鎵爜鍚庡鐮佺殑鏍￠獙
+ 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;
+ }
+ //5.涓哄脊鍑烘閲岀殑淇℃伅璧嬪�� 骞朵笖灞曠ず寮瑰嚭妗�
+ function showTb(leftobj,paobj,rightObj,scanType,content250) {
+ checkObj = leftobj;
+ numObj = rightObj;
+ rowObj = paobj;
+ var a = paobj[0].children[0].innerText; //澶囧搧閰嶅鏄庣粏鍨嬪彿
+ var b = paobj[0].children[3].innerText; //鏈鸿韩缂栧彿
+ //var c = paobj[0].children[10].innerText; //鍙栧緱绠＄悊缂栫爜,鍒ゆ柇绠＄悊缂栫爜鏄惁涓虹┖ span妗嗚繖鏍峰彇
+ var c = paobj[0].children[10].children[0].value; //澶х爜 杈撳叆妗嗚繖鏍峰彇
+ var maqCode = j$( '#maqCode' ).val();
+ // alert('maqiang'+maqCode);
+ // alert('scanType=='+scanType+'==绠＄悊缂栫爜'+c+'=='+content250);
+ // //濡傛灉绠＄悊缂栫爜涓虹┖骞朵笖鐮佹灙鎵弿鐨勮緭鍏ュ�间笉鏄洅,鎻愮ず;
+ // //(c == '' || c == undefined) && yc
+ // if (maqCode !='' && maqCode !=undefined && maqCode.substring(maqCode.length - 8,maqCode.length - 5) != '250') {
+ // alert('璇峰厛鎵洅!');
+ // j$("#maqCode").val("");
+ // j$("#maqCode").focus();
+ // return;
+ // }
+ // //scanType=0 璇存槑鏄痠pad鎵弿鐨�
+ // if( scanType != undefined && scanType == 0){
+ // alert('000');
+ // if( content250 !='' && content250 !=undefined && content250.substring(content250.length - 8,content250.length - 5) != '250'){
+ // alert('璇峰厛鎵洅!');
+ // j$("#maqCode").focus();
+ // return;
+ // }
+ // }
+
+ //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;
+
+ j$("#havCode").val(maqCode);
+ 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;
+
+ j$("#havCode").val(content250);
+ 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);*/
+
+ //update wangweipeng 2022/02/21 end
+
+ //鍒犻櫎缂撳瓨
+ 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;
+ }
+ }
+ //鍒犻櫎缂撳瓨 end
+ document.getElementById("xinghao").innerHTML = a; //澶囧搧閰嶅鏄庣粏鍨嬪彿
+ document.getElementById("bianhao").innerHTML = b; //鏈鸿韩缂栧彿
+
+ //alert('===c=='+paobj[0].children[10].children[0].innerText);
+
+ // document.getElementById("bianma").innerHTML = ; //绠＄悊缂栫爜
+ //鍒ゆ柇灏忕爜 骞跺彇寰楁暟鎹簱涓凡瀛樺湪鐨勫皬鐮� 娉�:宸插瓨鍦ㄧ殑鐢�","鎷兼帴
+ // 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(',');
+ 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();
+ //浣跨敤瀹氭椂鍣ㄨ缃厜鏍囧畾浣嶅洜涓哄鏋滄槸寮瑰嚭閫夋嫨鏈儴鐨勬涔嬪悗鍐嶈缃� 浼氬畾浣嶄笉鍒�
+ setTimeout(function(){j$("#xiaomaCode").focus();},1000);
+ // j$("#xiaomaCode").focus();
+ return;
+ // j$("#maqCodeBtn").click();
+ }
+ //6.鍏抽棴寮规
+ function stopScan(numflag) {
+ //numflag= 1 鍏抽棴杈撳叆妗�,娓呯┖鐮佹灙杈撳叆鐨勫��,鍏夋爣鑷姩瀹氫綅鍒扮爜鏋緭鍏�
+ //j$(".modal").hide();
+ j$("#myModal1").hide();
+ scanType = null;
+ j$("#maqCode").focus();
+ if(numflag == 0 ){
+ //鐢ㄦ埛鐐瑰嚮淇濆瓨 1.璁剧疆鏁伴噺鍒板彂璐т欢鏁颁笂 2.璁剧疆灏忕爜鍒版槑缁嗙殑澶囧搧绠＄悊鐮佷笂
+ if(numObj != null){
+ //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++){
+ numObj[i].innerText = j$("#detailTb").find("tr").length-1;
+ }
+ //update wangweipeng 2022/01/12 end
+
+ if (rowObj != null) {
+ //鍙栧緱鎵�鏈夊皬鐮� 鏀惧埌澶囧搧绠＄悊鐮佷笂
+ var tableId = document.getElementById("detailTb");
+ if(tableId.rows.length > 0){
+ var str = '';
+ for(var i=1;i<tableId.rows.length;i++) {
+ str += tableId.rows[i].cells[1].innerHTML + ',';
+ }
+ 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 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){//鍒ゆ柇姝ゆ鎵殑鐩掓槸鍚︽湁灏忕爜
+ //棣栧厛鍒ゆ柇褰撳墠鏄庣粏鍘熸潵鏄惁宸茬粡鎵繃鐮�
+ //濡傛灉娌℃壂杩� 閭ｄ箞鍦ㄥ師鏉ョ殑 澶囧搧绠＄悊鐮併�佺鐞嗙紪鐮佸拰鍙戣揣浠舵暟鐨勫�间笂閮介渶瑕佸姞涓婃娆℃壂鐨勫皬鐮�
+ //濡傛灉鎵繃锛岄偅涔堥渶瑕佹妸鍘熸潵姝ょ洅鐨勫皬鐮侀兘鏀规垚姝ゆ鎵殑灏忕爜
+ 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){
+ 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] + ',';
+ 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++) {
+ 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 + ',';
+ 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;
+
+ }else{//濡傛灉鏄庣粏鍘熸潵娌℃湁鎵繃鐮侊紝閭ｄ箞鐩存帴杩藉姞灏辫
+ 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;//鍙戣揣浠舵暟
+
+ }
+ }else{
+ //濡傛灉娌℃湁灏忕爜锛岄偅涔堝垽鏂師鏉ョ殑鏄惁鏈夊皬鐮佸拰鐩掞紝濡傛灉鍘熸潵涔熸病鏈夛紝閭ｄ箞浠�涔堜篃涓嶇敤鍋�
+ //濡傛灉鍘熸潵鏈夛紝閭ｄ箞鎵惧埌绛変簬褰撳墠鐩掔殑鎵�鏈夊皬鐮侊紝閮藉垹闄ゆ帀
+ 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;//鍙戣揣浠舵暟
+ }
+ }
+ 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;//鍙戣揣浠舵暟
+ rowObj[0].children[11].children[0].value =str2;
+ }
+ //update wangweipeng 2022/02/21 end
+ }
+ }else if(numflag == 1){
+ //濡傛灉涓簍rue锛岄偅涔堣瘉鏄庨�夋嫨鐨勬槸鍙栨秷鎸夐挳锛岄偅涔堥渶瑕佹妸绗竴琛岀殑澶嶉�夋鍘绘帀
+ checkObj.prop('checked', false);
+ }
+ var maqCode = j$( '#maqCode' ).val();
+ //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(){
+ 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;
+ }
+ });
+ setTimeout(function(){j$("#maqCode").focus();},300);
+
+ });
+ // add by qiuyj 2021-11-30 end pc绔壂鐮佹敮鎸�
+ // add by rentx 2021-10-19 end 鑰楁潗杩芥函 -鐮佹灙鎵爜涔嬪悗灞曠ず寮瑰嚭妗�
+
// j$(document).ready(function(){
// j$('select[name$="deliveryType"]').val('鍙戣揣');
// j$('select[name$="deliveryType"]').prop('disabled', true)
@@ -164,8 +738,68 @@
// // }
// // });
// });
+ // add by youc 2021-12-01 start
+ //ipad鎵畬灏忕爜涔嬪悗
+ function checkipadXiaoMa(ipadnowCode) {
+ //鍒ゆ柇杩欎釜灏忕爜鏄惁涓� delConsumables(鍒犻櫎鑰楁潗) 濡傛灉鏄� 瀛樿淇℃伅鍒癴lag涓�
+ if (ipadnowCode == 'delConsumables') {
+ this.flag = 'delConsumables';
+ return false;
+ }
+ //鍒ゆ柇杩欎釜灏忕爜鏄惁涓� saveConsumables(淇濆瓨鑰楁潗) 濡傛灉鏄� 淇濆瓨
+ if (ipadnowCode == 'saveConsumables') {
+ //鐩稿綋浜庣偣鍑讳繚瀛樻寜閽�
+ stopScan(0);
+ return false;
+ }
+ //鍒ゆ柇杩欎釜灏忕爜鏄惁涓� cancelConsumables(鍙栨秷鑰楁潗) 濡傛灉鏄� 鍙栨秷
+ if (ipadnowCode == 'cancelConsumables') {
+ //鐩稿綋浜庣偣鍑诲彇娑堟寜閽�
+ stopScan(1);
+ return false;
+ }
+ //鍒ゆ柇杩欎釜灏忕爜code 鏄惁绗﹀悎瑕佹眰 1:闀垮害鏄惁姝ｇ‘ 2:鏄惁閲嶅杈撳叆 3:杈撳叆鐨勬槸鍚︿负3浣嶆暟瀛�
+ if(ipadnowCode != null && ipadnowCode.length == 3 && !isNaN(ipadnowCode)){
+ //鑾峰彇鎵弿杩囩殑灏忕爜
+ var tableId = document.getElementById("detailTb");
+ if(tableId.rows.length > 0){
+ var str = '';
+ for(var i=1;i<tableId.rows.length;i++) {
+ if(ipadnowCode == tableId.rows[i].cells[1].innerHTML){
+ if (this.flag == 'delConsumables') {
+ //鍒犻櫎杩欎竴琛�
+ tableId.rows[i].remove();
+ this.flag = '';
+ }else{
+ alert('灏忕爜宸插瓨鍦�');
+ }
+ return false;
+ }
+ }
+ }
+ //鑳借蛋鍒拌繖璇存槑寰呭垹闄ょ殑灏忕爜涓嶅瓨鍦ㄤ簬鏄庣粏鍒楄〃 鎵�浠ヨ缁欏嚭鎻愮ず
+ if (this.flag == 'delConsumables') {
+ alert('鍒犻櫎鐨勫皬鐮佸凡鍒犻櫎鎴栨湭鎵弿杩�');
+ this.flag = '';
+ return false;
+ }
+ var bianma = document.getElementById("bianma").innerHTML;
+ addRow(ipadnowCode,bianma);
+ }else{
+ //娓呯┖杈撳叆妗�
+ alert('褰撳墠灏忕爜涓嶆纭�')
+ return false;
+ }
+
+ return true;
+ }
function checkMessage() {
- if (j$(escapeVfId('allPage:allForm:done_flg')).val() == 'true') {
+ //var aaa=j$(escapeVfId('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable:2:j_id162:9:j_id169')).val();
+ //alert('checkMessage==='+aaa);
+ //update wangweipeng 2022/01/28 start
+ //if (j$(escapeVfId('allPage:allForm:done_flg')).val() == 'true') {
+ if (j$(escapeVfId('allPage:allForm:searchBlock:done_flg')).val() == 'true') {
+ //update wangweipeng 2022/01/28 end
alert("淇濆瓨鎴愬姛");
}
}
@@ -176,120 +810,182 @@
ios = /iphone|ipod|ipad/.test( userAgent );
var scanType;
function filljsQR(content) {
+ 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);
- 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) {
- if (j$(this).text() && (content.indexOf(j$(this).text()) == 0)) {
- rownum.push(this.id.match(/oppTable\:(\d*)/)[1]);
- return;
+
+ var tracingCode = content.substr(-8);//鎴彇鍚�8浣�
+ //add by youc 2021-11-29 start
+ var content250 = content;//涓轰簡鑾峰彇ipad绔壂鐮佺殑鍊�
+ if (tracingCode.indexOf('250') == 0) {//鍚�8浣嶇湅鏄惁鍖呭惈250
+ content = content.slice(0, -8);
}
- var JANCODE = content.substr(3, 12);
- var GTINCODE = content.substr(3, 12);
- // var yyyyMMdd = "20" + content.substr(18, 6);
- // 鍒�2100骞� 灏遍渶瑕佷笅闈㈢殑logic浜�
- // var now = new Date();
- // var current_yyyyMMdd = now.getFullYear()
- // + ("0" + (now.getMonth() + 1)).slice(-2)
- // + ("0" + now.getDate()).slice(-2);
- // var currentYear = new Date().getFullYear();
- // var yyyyMMdd = Math.floor(currentYear / 100) + content.substr(18, 6);
- // if (yyyyMMdd < currentYear) yyyyMMdd = yyyyMMdd + 1000000; // 浣跨敤鏈熼檺 搴旇鏄湭鏉ョ殑鏃ユ湡
- var result = extractDateSerial(content);
- var yyyyMMdd = result['yyyyMMdd'];
- var serial = result['serial'];
- if (JANCODEMap[JANCODE]) {
- } else {
- var query = "Select ProductCode From Product2 WHERE JANCODE__c LIKE '" + JANCODE + "%' OR Device_GTIN_2_13_F__c = '" + GTINCODE + "' LIMIT 1";
- var records = sforce.connection.query(query).getArray('records');
- if (records.length > 0) {
- JANCODEMap[JANCODE] = records[0].ProductCode;
+ let rownum = [];
+ var $Col_Scroll = j$(".dataRow.col_Scroll");
+ 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;
}
- }
- if (JANCODEMap[JANCODE]) {
- var content2 = JANCODEMap[JANCODE] + ":" + serial + "(" + yyyyMMdd + ")";
- var $prdSerialNo = $Col_Scroll.find("input[name=Product_Serial_No_F__c]");
- if ($prdSerialNo[index].value.startsWith(content2)) {
- if(this.id != undefined){
- rownum.push(this.id.match(/oppTable\:(\d*)/)[1]);
- return;
+ var JANCODE = content.substr(3, 12);
+ var GTINCODE = content.substr(3, 12);
+ // var yyyyMMdd = "20" + content.substr(18, 6);
+ // 鍒�2100骞� 灏遍渶瑕佷笅闈㈢殑logic浜�
+ // var now = new Date();
+ // var current_yyyyMMdd = now.getFullYear()
+ // + ("0" + (now.getMonth() + 1)).slice(-2)
+ // + ("0" + now.getDate()).slice(-2);
+ // var currentYear = new Date().getFullYear();
+ // var yyyyMMdd = Math.floor(currentYear / 100) + content.substr(18, 6);
+ // if (yyyyMMdd < currentYear) yyyyMMdd = yyyyMMdd + 1000000; // 浣跨敤鏈熼檺 搴旇鏄湭鏉ョ殑鏃ユ湡
+ var result = extractDateSerial(content);
+ var yyyyMMdd = result['yyyyMMdd'];
+ var serial = result['serial'];
+
+ if (JANCODEMap[JANCODE]) {
+ } else {
+ var query = "Select ProductCode From Product2 WHERE JANCODE__c LIKE '" + JANCODE + "%' OR Device_GTIN_2_13_F__c = '" + GTINCODE + "' LIMIT 1";
+ var records = sforce.connection.query(query).getArray('records');
+ if (records.length > 0) {
+ JANCODEMap[JANCODE] = records[0].ProductCode;
}
}
- }
- })
- if (rownum.length == 0) {
- alert('鎵弿鐨勮�楁潗涓嶅瓨鍦�!')
- } else if (rownum.length > 1) {
- let optStr = "";
- rownum.forEach(function (rn) {
- j$(".col_Salesdepartment__c").each(function () {
- if (j$(this).children()[0] && j$(this).children()[0].id.indexOf('oppTable:'+rn+':') !== -1) {
- optStr += '<option value="'+rn+'">'+j$(this).text()+'</option>';
+ if (JANCODEMap[JANCODE]) {
+ var content2 = JANCODEMap[JANCODE] + ":" + serial + "(" + yyyyMMdd + ")";
+ var $prdSerialNo = $Col_Scroll.find("input[name=Product_Serial_No_F__c]");
+ if ($prdSerialNo[index].value.startsWith(content2)) {
+ if(this.id != undefined){
+ rownum.push(this.id.match(/oppTable\:(\d*)/)[1]);
+ console.log('2---'+rownum);
+ return;
+ }
+ }
+ }
+ })
+ //add by youc 2021-11-30 start
+ //濡傛灉绠＄悊缂栫爜涓虹┖骞朵笖鐮佹灙鎵弿鐨勮緭鍏ュ�间笉鏄洅,鎻愮ず;
+ var maqiang = j$( '#maqCode' ).val();
+ 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) {
+ alert('鎵弿鐨勮�楁潗涓嶅瓨鍦�!')
+ //add by rentx 2021-10-22 start 鍒犻櫎杈撳叆妗嗗唴瀹� 骞跺厜鏍囪嚜鍔ㄥ畾浣嶅埌杈撳叆妗�
+ if(maqiang !='' && maqiang !=undefined){
+ j$("#maqCode").val("");
+ j$("#maqCode").focus();
+ }
+ return;
+ //add by rentx 2021-10-22 end 鍒犻櫎杈撳叆妗嗗唴瀹� 骞跺厜鏍囪嚜鍔ㄥ畾浣嶅埌杈撳叆妗�
+
+ } else if (rownum.length > 1) {
+ let optStr = "";
+ rownum.forEach(function (rn) {
+ j$(".col_Salesdepartment__c").each(function () {
+ if (j$(this).children()[0] && j$(this).children()[0].id.indexOf('oppTable:'+rn+':') !== -1) {
+ optStr += '<option value="'+rn+'">'+j$(this).text()+'</option>';
+ return;
+ }
+ })
+ })
+ j$.confirm({
+ title: '鎵弿鐨勮�楁潗鏈夊鏁板瓨鍦�',
+ boxWidth: '50%',
+ useBootstrap: false,
+ content: '' +
+ '<form action="" class="formName">' +
+ '<div style="overflow: hidden;">' +
+ '<label for="salesDept">璇烽�夋嫨鎵�鍦ㄥ湴鍖�(鏈儴):</label>' +
+ '<select id="salesDept" name="salesDept">'+optStr+'</select>' +
+ '</div>' +
+ '</form>',
+ buttons: {
+ formSubmit: {
+ text: '纭',
+ btnClass: 'btn-blue',
+ 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");
+
+ j$(".col_Inspection_Cnt_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');
+ //update wangweipeng 2022/01/12 start
+ //鐢变簬鎶婂彂璐т欢鏁颁粠杈撳叆娴佹敼鎴愬彧璇伙紝鎵�浠ヨ繖閲岄渶瑕佹敼鍙�
+ //var rightObj = j$(this).find("input:not(:disabled)");
+ var rightObj = j$(this).find("span");
+ //update wangweipeng 2022/01/12 end
+ // moveToTop(rightObj);
+ // rightObj.focus();
+ //add by rentx 2021-10-26 start
+ //paobj鎵�鍦ㄦ槑缁嗚, rightObj 鍙戣揣浠舵暟杈撳叆妗�
+ var paobj = j$(this).parent();
+ showTb(leftobj,paobj,rightObj,scanType,content250);
+ //add by rentx 2021-10-26 end
+ return;
+ }
+ })
+ }
+ },
+ cancel: {
+ text: '鍙栨秷',
+ //add by rentx 2021-10-27 start 鑰楁潗杩芥函 --鍙戣揣
+ action: function () {
+ if(maqiang !='' && maqiang !=undefined){
+ j$("#maqCode").val("");
+ j$("#maqCode").focus();
+ }
+ }
+ //add by rentx 2021-10-27 end 鑰楁潗杩芥函 --鍙戣揣
+ }
+ }
+ });
+ } else {
+ var leftobj = j$("input[name$='oppTable_L:"+rownum[0]+":rowCheck']:not(:disabled)")
+ //缃《锛屽閫夋鍕鹃�� 鍙戣揣浠舵暟杈撳叆妗嗗畾浣� 20211126 yc 绉诲埌鍒ゆ柇涔嬪悗鍐嶇‘璁�
+ //moveToTop(leftobj);
+ //leftobj.prop('checked', true).trigger("change");
+ j$(".col_Inspection_Cnt_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');
+ //update wangweipeng 2022/01/12 start
+ //鐢变簬鎶婂彂璐т欢鏁板瓧娈佃缃负鍙锛屾墍浠ヨ繖閲岄渶瑕佹敼鍙�
+ //var rightObj = j$(this).find("input:not(:disabled)");
+ var rightObj = j$(this).find("span");
+ //update wangweipeng 2022/01/12 end
+
+ //moveToTop(rightObj);
+ //rightObj.focus(); 鍙戣揣浠舵暟杈撳叆妗嗗畾浣�
+ //灞曠ず寮瑰嚭妗� add by rentx 2021-10-21 start
+ var paobj = j$(this).parent()
+ //paobj鎵�鍦ㄦ槑缁嗚, rightObj 鍙戣揣浠舵暟杈撳叆妗�
+ showTb(leftobj,paobj,rightObj,scanType,content250);
+ //灞曠ず寮瑰嚭妗� add by rentx 2021-10-21 end
return;
}
})
- })
- j$.confirm({
- title: '鎵弿鐨勮�楁潗鏈夊鏁板瓨鍦�',
- boxWidth: '50%',
- useBootstrap: false,
- content: '' +
- '<form action="" class="formName">' +
- '<div style="overflow: hidden;">' +
- '<label for="salesDept">璇烽�夋嫨鎵�鍦ㄥ湴鍖�(鏈儴):</label>' +
- '<select id="salesDept" name="salesDept">'+optStr+'</select>' +
- '</div>' +
- '</form>',
- buttons: {
- formSubmit: {
- text: '纭',
- btnClass: 'btn-blue',
- 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");
-
- j$(".col_Inspection_Cnt_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();
- return;
- }
- })
- }
- },
- cancel: {
- text: '鍙栨秷'
- }
- }
- });
- }else {
- var leftobj = j$("input[name$='oppTable_L:"+rownum[0]+":rowCheck']:not(:disabled)")
- moveToTop(leftobj);
- leftobj.prop('checked', true).trigger("change");
-
- j$(".col_Inspection_Cnt_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();
- return;
- }
- })
+ }
+ }
+ } catch (e) {
+ alert("鍙戠敓寮傚父:" + e);
+ console.log("鍙戠敓寮傚父:" + e);
}
- }
}
+
function extractDateSerial(content){
var yyyyMMdd = '';
var noJancodeContent = content.slice(16);
@@ -333,8 +1029,17 @@
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');
+
}
}
+
+
+
+
</script>
</apex:page>
\ No newline at end of file
--
Gitblit v1.9.1