From d9c12a72cbff5ac73e72611e7fc7c06bc6ac177b Mon Sep 17 00:00:00 2001 From: lch <luluchen515@163.com> Date: 星期五, 23 八月 2024 16:09:20 +0800 Subject: [PATCH] 盘点单,销售出库 优化 --- js/CangKuManage_js/GS_HBLLD.js | 2 pages/CangKuManage/GS_CKPDD.html | 232 ++++++---- unpackage/release/H546D0BA6.wgt | 0 pages/CangKuManage/CK_XSCK.html | 1 .vs/slnx.sqlite | 0 manifest.json | 2 js/CangKuManage_js/GS_CKPDD.js | 923 ++++++++++++++++++++++++++------------------- 7 files changed, 670 insertions(+), 490 deletions(-) diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite new file mode 100644 index 0000000..bb41242 --- /dev/null +++ b/.vs/slnx.sqlite Binary files differ diff --git a/js/CangKuManage_js/GS_CKPDD.js b/js/CangKuManage_js/GS_CKPDD.js index b554f10..5483ddd 100644 --- a/js/CangKuManage_js/GS_CKPDD.js +++ b/js/CangKuManage_js/GS_CKPDD.js @@ -5,30 +5,36 @@ // 鍏ㄥ眬鍙橀噺 var billNo = ''; var i = 0; //璁$畻鎵弿鏉$爜鏁伴噺 -var WLBM = "";//鐗╂枡缂栫爜 +var WLBM = ""; //鐗╂枡缂栫爜 var matterTable = null; var PopPicker = new mui.PopPicker(); +var pici = '1'; // mui.ready(function() { // console.log("鐩樼偣鍗曡幏鍙栨祴璇曪紒"); // app.init(); // fetchData(); - -// }); +// }); +// mui.ready(function() { + +// fetchData(); +// console.log("杩炴帴娴嬭瘯锛�"); +// }); //鍒濆鍖栵紝榛樿鐒︾偣 -mui.plusReady(function(){ - +mui.plusReady(function() { + app.init(); fetchData(); mui("#txtGD")[0].focus(); console.log("杩炴帴娴嬭瘯锛�"); initBluetooth(); //SetBillNo(); - $('#info').height($(window).height()- $("#row001").height() - $("#div001").height()- $("#div002").height() - 70); -}); + $('#info').height($(window).height() - $("#row001").height() - $("#div001").height() - $("#div002") + .height() - 70); +}); // $(function(){ - // billNo= GetMaxBillNO("1201",GetSysDateTime());//璋冩嫧鍗曞彿锛屽彧瑕佷笉绂诲紑鐣岄潰锛屽崟鍙蜂笉鍙� +// billNo= GetMaxBillNO("1201",GetSysDateTime());//璋冩嫧鍗曞彿锛屽彧瑕佷笉绂诲紑鐣岄潰锛屽崟鍙蜂笉鍙� // $('#info').height($(window).height()- $("#row001").height() - $("#div001").height()- $("#div002").height() - 70); // }) @@ -37,8 +43,8 @@ // }); function SetBillNo() { - $("#txtBillNo").click(function() { - GetBillList(); + $("#txtBillNo").click(function() { + GetBillList(); PopPicker.show(function(items) { var billNo = items[0].text; $("#txtBillNo").val(billNo); @@ -49,13 +55,13 @@ //鏁板瓧鎷栧姩涔嬪悗璋冩暣鏁板瓧灏忓浘鏍囦綅缃� function onStopDrag(e) { var d = e.data; - if(d.left < 0) { + if (d.left < 0) { d.left = 0 } - if(d.top < 0) { + if (d.top < 0) { d.top = 0 } - if(d.top + $(d.target).outerHeight() > $(d.parent).height()) { + if (d.top + $(d.target).outerHeight() > $(d.parent).height()) { $("#dgWOMDAG-sum")[0].innerHTML = "0"; $("#dgWOMDAG-sum").css("top", d.startTop + "px"); $("#dgWOMDAG-sum").css("left", d.startLeft + "px"); @@ -67,414 +73,549 @@ //鏇存柊琛ㄦ牸鏁版嵁 // 灏嗘暟鎹斁鍒拌〃鏍间腑 function populateTable(data) { - + //console.log('1'); - let tbody = document.querySelector("#myTable tbody"); + let tbody = document.querySelector("#myTable tbody"); - // 娓呯┖琛ㄦ牸鍐呭 - tbody.innerHTML = ""; + // 娓呯┖琛ㄦ牸鍐呭 + tbody.innerHTML = ""; - // 寰幆閬嶅巻鏁版嵁锛岀敓鎴愯〃鏍艰 - for (let i = 0; i < data["鏉$爜缂栧彿"].length; i++) { - let tr = document.createElement("tr"); + // 寰幆閬嶅巻鏁版嵁锛岀敓鎴愯〃鏍艰 + for (let i = 0; i < data["鏉$爜缂栧彿"].length; i++) { + let tr = document.createElement("tr"); + pici = data["鎵规"][0]; - // 鍒涘缓琛ㄦ牸鍗曞厓鏍硷紝骞跺皢鏁版嵁濉叆 - let td1 = document.createElement("td"); - td1.textContent = data["鏉$爜缂栧彿"][i]; - tr.appendChild(td1); + let td7 = document.createElement("td"); + td7.textContent = data["搴忓彿"][i]; + tr.appendChild(td7); + // 鍒涘缓琛ㄦ牸鍗曞厓鏍硷紝骞跺皢鏁版嵁濉叆 + let td1 = document.createElement("td"); + td1.textContent = data["鏉$爜缂栧彿"][i]; + tr.appendChild(td1); - // let td2 = document.createElement("td"); - // td2.textContent = data["鐗╂枡浠g爜"][i]; - // tr.appendChild(td2); + // let td2 = document.createElement("td"); + // td2.textContent = data["鐗╂枡浠g爜"][i]; + // tr.appendChild(td2); - let td3 = document.createElement("td"); - td3.textContent = data["鏉$爜鏁伴噺"][i]; - tr.appendChild(td3); - - let td4 = document.createElement("td"); - td4.textContent = data["浠撲綅"][i]; - tr.appendChild(td4); + let td3 = document.createElement("td"); + td3.textContent = data["鏉$爜鏁伴噺"][i]; + tr.appendChild(td3); - let td5 = document.createElement("td"); - td5.textContent = data["瀹炵洏鏁伴噺"][i]; - tr.appendChild(td5); - - let td6 = document.createElement("td"); - td6.textContent = data["瀹炵洏搴撲綅"][i]; - tr.appendChild(td6); + let td4 = document.createElement("td"); + td4.textContent = data["浠撲綅"][i]; + tr.appendChild(td4); + + let td5 = document.createElement("td"); + td5.textContent = data["瀹炵洏鏁伴噺"][i]; + tr.appendChild(td5); + + let td6 = document.createElement("td"); + td6.textContent = data["瀹炵洏搴撲綅"][i]; + tr.appendChild(td6); - // let td6 = document.createElement("td"); - // td6.textContent = data["鍥惧彿"][i]; - // tr.appendChild(td6); + // let td6 = document.createElement("td"); + // td6.textContent = data["鍥惧彿"][i]; + // tr.appendChild(td6); - tbody.appendChild(tr); - - - $(function() { - // 灏嗘爣棰樿鐨勮儗鏅鑹茶缃负鐏拌壊 - $('tr:first-child th').css('background-color', 'gray'); - - // 閬嶅巻琛ㄦ牸鐨勬瘡涓�琛岋紝闄や簡鏍囬琛� - $('tr').each(function() { - // 鑾峰彇瀹炵洏鏁伴噺鍗曞厓鏍肩殑鍊� - var $cell = $(this).find('td:nth-child(4)'); - var quantity = parseInt($cell.text()); - - // 鍒ゆ柇瀹炵洏鏁伴噺鏄惁涓�0 - if (quantity !== 0) { - // 璁剧疆琛岀殑鑳屾櫙棰滆壊涓洪粍鑹� - $(this).css('background-color', 'yellow'); - } - }); - }); - } + tbody.appendChild(tr); + + + $(function() { + // 灏嗘爣棰樿鐨勮儗鏅鑹茶缃负鐏拌壊 + $('tr:first-child th').css('background-color', 'gray'); + + // 閬嶅巻琛ㄦ牸鐨勬瘡涓�琛岋紝闄や簡鏍囬琛� + $('tr').each(function() { + // 鑾峰彇瀹炵洏鏁伴噺鍗曞厓鏍肩殑鍊� + var $cell = $(this).find('td:nth-child(4)'); + var quantity = parseInt($cell.text()); + + // 鍒ゆ柇瀹炵洏鏁伴噺鏄惁涓�0 + if (quantity !== 0) { + // 璁剧疆琛岀殑鑳屾櫙棰滆壊涓洪粍鑹� + $(this).css('background-color', 'yellow'); + } + }); + }); + } }; - //鑾峰彇鐩樼偣鍗� - function fetchData() { - console.log("12"); - $.ajax({ - url: app.API_URL_HEADER + "/WARBABChag/GetGSTAA", - type: "GET", - dataType: "json", - success: function(response) { - if (response.status === 0) { - - var selectElement = document.getElementById('order'); - - selectElement.innerHTML = ""; - var options = response.data.TAA001; - +//鑾峰彇鐩樼偣鍗� +function fetchData() { + console.log("12"); + $.ajax({ + url: app.API_URL_HEADER + "/WARBABChag/GetGSTAA", + type: "GET", + dataType: "json", + success: function(response) { + if (response.status === 0) { + + var selectElement = document.getElementById('order'); + + selectElement.innerHTML = ""; + var options = response.data.TAA001; + + var option = document.createElement("option"); + option.value = ""; + option.text = "璇烽�夋嫨鐩樼偣鍗�"; + selectElement.appendChild(option); + //console.log(options); + for (var i = 0; i < options.length; i++) { + var option = document.createElement("option"); - option.value = ""; - option.text = "璇烽�夋嫨鐩樼偣鍗�"; + option.value = options[i]; + option.text = options[i]; selectElement.appendChild(option); - //console.log(options); - for (var i = 0; i < options.length; i++) { + } + // for (var i = 0; i < options.length; i++) { + // var option = document.createElement("option"); + // option.value = options[i]+'--'+response.data.DFB002[i]; + // option.text = options[i]+'--'+response.data.DFB002[i]; + // selectElement.appendChild(option); + // } - var option = document.createElement("option"); - option.value = options[i]; - option.text = options[i]; - selectElement.appendChild(option); - } - // for (var i = 0; i < options.length; i++) { - // var option = document.createElement("option"); - // option.value = options[i]+'--'+response.data.DFB002[i]; - // option.text = options[i]+'--'+response.data.DFB002[i]; - // selectElement.appendChild(option); - // } - - } else { - alert("鑾峰彇鏁版嵁寮傚父锛�" + response.message); - } - }, - error: function(xhr, type, errorThrown) { - mui.toast("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown)); - alert("鑾峰彇鏁版嵁寮傚父锛�"); - } - }); + } else { + alert("鑾峰彇鏁版嵁寮傚父锛�" + response.message); } + }, + error: function(xhr, type, errorThrown) { + mui.toast("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown)); + alert("鑾峰彇鏁版嵁寮傚父锛�"); + } + }); +} - // 鑾峰彇select鍏冪礌鍜岃緭鍏ユ鍏冪礌 - var selectElement = document.getElementById('order'); - var inputElement = document.getElementById('input'); - - // 缁欒緭鍏ユ娣诲姞input浜嬩欢鐩戝惉 - inputElement.addEventListener('input', function() { - var keyword = inputElement.value.toLowerCase(); // 鑾峰彇杈撳叆妗嗙殑鍊煎苟杞崲涓哄皬鍐� - - // 閬嶅巻select鍏冪礌鐨勯�夐」 - for (var i = 0; i < selectElement.options.length; i++) { - var optionText = selectElement.options[i].text.toLowerCase(); // 鑾峰彇閫夐」鐨勫�煎苟杞崲涓哄皬鍐� - - // 濡傛灉閫夐」鐨勫�煎寘鍚緭鍏ユ鐨勫�硷紝鍒欐樉绀鸿閫夐」锛屽惁鍒欓殣钘忚閫夐」 - if (optionText.includes(keyword)) { - selectElement.options[i].style.display = 'block'; - } else { - selectElement.options[i].style.display = 'none'; - } - } - }); - - //閫夋嫨鐩樼偣鍗曟椂锛岃幏鍙栫洏鐐圭墿鏂欐槑缁� - $(function() { - // 鑾峰彇璁㈠崟閫夋嫨鍏冪礌 - var $orderSelect = $('#order'); - - // 缁戝畾璁㈠崟閫夋嫨鍙樺姩浜嬩欢 - $orderSelect.on('change', function() { - // 鑾峰彇閫変腑鐨勮鍗曞彿 - var orderNumber = $(this).val(); - //console.log(orderNumber); +// 鑾峰彇select鍏冪礌鍜岃緭鍏ユ鍏冪礌 +var selectElement = document.getElementById('order'); +var inputElement = document.getElementById('input'); - // 鍙戦�� AJAX 璇锋眰 - $.ajax({ - url: app.API_URL_HEADER + "/WARBABChag/GetBarInfoTAC", - - data: { - TAA001: $("#order").val(), - }, - DataType: "json", - type: "post", - async: false, - //timeout: 15000, - success: function(data) { - //console.log(JSON.stringify(data)); - if(data.status != 0) { - playerAudio("NG"); - mui.alert(data.message,"","",function(){ - mui("#input")[0].focus(); - }); - return; - } else { - populateTable(data.data); - mui("#MBA001")[0].focus(); - - } - }, - error: function(xhr, type, errorThrown) { - alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown)); - } - }); - }); - }); - - //鍒ゆ柇搴撲綅 - function GetStoreTAA() { - if(event.keyCode == 13) { - //濡傛灉鏈緭鍏ユ潯鐮侊紝璺冲嚭鏂规硶 - if($("#MBA001").val() == "") { - $("#MBA001").focus(); - playerAudio("NG"); - mui.toast("璇峰厛鎵弿搴撲綅!"); - return; - } - - //鐢ㄦ埛ID - var currentSession = app.loadconfig(app.CONFIG_CURRENT_SESSION); - var user_id =currentSession.user_id; //currentSession.user_id; - // var user_id = "admin"; - $.ajax({ - url: app.API_URL_HEADER + "/WARBABChag/GetStoreTAA", - - data: { - MBA001: $("#MBA001").val(), - TAA001: $("#order").val(), - logID: user_id,//Admin //鍏堝啓姝伙紝渚夸簬璋冭瘯 - - }, - DataType: "json", - type: "post", - async: false, - //timeout: 15000, - success: function(data) { - //console.log(JSON.stringify(data)); - if(data.status != 0) { - playerAudio("NG"); - mui.alert(data.message,"","",function(){ - mui("#MBA001")[0].focus(); - $("#MBA001").val(""); - - }); - return; - } else { - matterTable = data.data.matterTable; +// 缁欒緭鍏ユ娣诲姞input浜嬩欢鐩戝惉 +inputElement.addEventListener('input', function() { + var keyword = inputElement.value.toLowerCase(); // 鑾峰彇杈撳叆妗嗙殑鍊煎苟杞崲涓哄皬鍐� - - mui("#DAB001")[0].focus(); - - } - }, - error: function(xhr, type, errorThrown) { - alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown)); - } - }); - } - }; - - - //鑾峰彇鏉$爜淇℃伅 - function GetBarInfoTAA() { - if(event.keyCode == 13) { - //濡傛灉鏈緭鍏ユ潯鐮侊紝璺冲嚭鏂规硶 - if($("#DAB001").val() == "") { - $("#DAB001").focus(); - playerAudio("NG"); - mui.toast("璇峰厛鎵弿鐗╂枡鏉$爜!"); - return; - } - - if($("#MBA001").val() == "") { - $("#DAB001").focus(); - playerAudio("NG"); - mui.toast("璇峰厛鎵弿搴撲綅!"); - return; - } - - //鐢ㄦ埛ID - var currentSession = app.loadconfig(app.CONFIG_CURRENT_SESSION); - var user_id =currentSession.user_id; //currentSession.user_id; - // var user_id = "admin"; - $.ajax({ - url: app.API_URL_HEADER + "/WARBABChag/GetBarInfoTAA", - - data: { - DAB001: $("#DAB001").val(), - TAA001: $("#order").val(), - MBA001: $("#MBA001").val(), - logID: user_id,//Admin //鍏堝啓姝伙紝渚夸簬璋冭瘯 - - }, - DataType: "json", - type: "post", - async: false, - //timeout: 15000, - success: function(data) { - //console.log(JSON.stringify(data)); - if(data.status != 0) { - playerAudio("NG"); - mui.alert(data.message,"","",function(){ - mui("#DAB001")[0].focus(); - $("#DAB001").val(""); - $("#txtSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮 - }); - return; - } else { - matterTable = data.data.matterTable; - $("#txtSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮 - $("#FLSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮 - - $("#txtSL").val(data.data.txtSL);//濉叆鏉$爜鏁伴噺 - $("#SPSL").val(data.data.txtSL);//濉叆鍙戞枡鏁伴噺 - $("#DAB020").val(data.data.DAB020);//濉叆鐗╂枡缂栫爜 + // 閬嶅巻select鍏冪礌鐨勯�夐」 + for (var i = 0; i < selectElement.options.length; i++) { + var optionText = selectElement.options[i].text.toLowerCase(); // 鑾峰彇閫夐」鐨勫�煎苟杞崲涓哄皬鍐� - mui("#SPSL")[0].focus(); - - } - }, - error: function(xhr, type, errorThrown) { - alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown)); - } - }); - - if(document.getElementById('barcheck').checked) - { - confirmQuantity(); + // 濡傛灉閫夐」鐨勫�煎寘鍚緭鍏ユ鐨勫�硷紝鍒欐樉绀鸿閫夐」锛屽惁鍒欓殣钘忚閫夐」 + if (optionText.includes(keyword)) { + selectElement.options[i].style.display = 'block'; + } else { + selectElement.options[i].style.display = 'none'; + } + } +}); + +//閫夋嫨鐩樼偣鍗曟椂锛岃幏鍙栫洏鐐圭墿鏂欐槑缁� +$(function() { + // 鑾峰彇璁㈠崟閫夋嫨鍏冪礌 + var $orderSelect = $('#order'); + + // 缁戝畾璁㈠崟閫夋嫨鍙樺姩浜嬩欢 + $orderSelect.on('change', function() { + // 鑾峰彇閫変腑鐨勮鍗曞彿 + var orderNumber = $(this).val(); + //console.log(orderNumber); + + // 鍙戦�� AJAX 璇锋眰 + $.ajax({ + url: app.API_URL_HEADER + "/WARBABChag/GetBarInfoTAC", + + data: { + TAA001: $("#order").val(), + }, + DataType: "json", + type: "post", + async: false, + //timeout: 15000, + success: function(data) { + //console.log(JSON.stringify(data)); + if (data.status != 0) { + playerAudio("NG"); + mui.alert(data.message, "", "", function() { + mui("#input")[0].focus(); + }); + return; + } else { + populateTable(data.data); + var selectElement = document.getElementById("spici"); + console.log(pici); + // 娓呯┖ <select> 鍏冪礌鐨勭幇鏈夐�夐」 + selectElement.innerHTML = ""; + + // 浠�1寮�濮嬪埌 pici 涓烘鐨勬暟锛屾坊鍔犲埌 <select> 鍏冪礌涓� + for (var i = 1; i <= parseInt(pici); i++) { + // 鍒涘缓涓�涓柊鐨� <option> 鍏冪礌 + var option = document.createElement("option"); + + // 璁剧疆 <option> 鍏冪礌鐨� value 鍜� text 灞炴�� + option.value = i; + option.text = i; + + // 灏� <option> 鍏冪礌娣诲姞鍒� <select> 鍏冪礌涓� + selectElement.appendChild(option); } - - } - }; + selectElement.value = pici; + GetInfopici(); + mui("#MBA001")[0].focus(); + + } + }, + error: function(xhr, type, errorThrown) { + alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown)); + } + }); + }); +}); + +//鍒ゆ柇搴撲綅 +function GetStoreTAA() { + if (event.keyCode == 13) { + //濡傛灉鏈緭鍏ユ潯鐮侊紝璺冲嚭鏂规硶 + if ($("#MBA001").val() == "") { + $("#MBA001").focus(); + playerAudio("NG"); + mui.toast("璇峰厛鎵弿搴撲綅!"); + return; + } + + //鐢ㄦ埛ID + var currentSession = app.loadconfig(app.CONFIG_CURRENT_SESSION); + var user_id = currentSession.user_id; //currentSession.user_id; + // var user_id = "admin"; + $.ajax({ + url: app.API_URL_HEADER + "/WARBABChag/GetStoreTAA", + + data: { + MBA001: $("#MBA001").val(), + TAA001: $("#order").val(), + logID: user_id, //Admin //鍏堝啓姝伙紝渚夸簬璋冭瘯 + + }, + DataType: "json", + type: "post", + async: false, + //timeout: 15000, + success: function(data) { + //console.log(JSON.stringify(data)); + if (data.status != 0) { + playerAudio("NG"); + mui.alert(data.message, "", "", function() { + mui("#MBA001")[0].focus(); + $("#MBA001").val(""); + + }); + return; + } else { + matterTable = data.data.matterTable; - function confirmQuantity() { - - //濡傛灉鏈緭鍏ユ潯鐮侊紝璺冲嚭鏂规硶 - if($("#DAB001").val() == "") { - $("#DAB001").focus(); - playerAudio("NG"); - mui.toast("璇峰厛鎵弿鐗╂枡鏉$爜!"); - return; - } - - if($("#SPSL").val() == "") { - $("#SPSL").focus(); - playerAudio("NG"); - mui.toast("璇峰厛鎵緭鍏ュ疄鐩樻暟閲�!"); - return; - } - //鐢ㄦ埛ID - var currentSession = app.loadconfig(app.CONFIG_CURRENT_SESSION); - var user_id =currentSession.user_id; //currentSession.user_id; - console.log('1'); - // var user_id = "admin"; - $.ajax({ - url: app.API_URL_HEADER + "/WARBABChag/UpdateTAC007", - - data: { - DAB001: $("#DAB001").val(), - TAA001: $("#order").val(), - TAC007: $("#SPSL").val(), - MBA001: $("#MBA001").val(), - logID: user_id,//Admin //鍏堝啓姝伙紝渚夸簬璋冭瘯 - - }, - DataType: "json", - type: "post", - async: false, - //timeout: 15000, - success: function(data) { - //console.log(JSON.stringify(data)); - if(data.status != 0) { - playerAudio("NG"); - mui.alert(data.message,"","",function(){ - mui("#DAB001")[0].focus(); - $("#DAB001").val(""); - $("#txtSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮 - $("#SPSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮 - $("#DAB020").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮 - }); - return; - } else { - matterTable = data.data.matterTable; - $("#txtSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮 - $("#SPSL").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮 - $("#DAB001").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮 - $("#DAB020").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮 - - mui("#DAB001")[0].focus(); - mui.toast(data.message); - - $.ajax({ - url: app.API_URL_HEADER + "/WARBABChag/GetBarInfoTAC", - - data: { - TAA001: $("#order").val(), - }, - DataType: "json", - type: "post", - async: false, - //timeout: 15000, - success: function(data) { - //console.log(JSON.stringify(data)); - if(data.status != 0) { - playerAudio("NG"); - mui.alert(data.message,"","",function(){ - mui("#input")[0].focus(); - }); - return; - } else { - populateTable(data.data); - mui("#DAB001")[0].focus(); - - } - }, - error: function(xhr, type, errorThrown) { - alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown)); - } - }); - - if(document.getElementById('checkdefault').checked) - { - return; - } - $("#MBA001").val("");//鍏堟竻绌轰竴涓嬫暟鎹簮 - } - }, - error: function(xhr, type, errorThrown) { - alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown)); - } - }); - - }; + mui("#DAB001")[0].focus(); - + } + }, + error: function(xhr, type, errorThrown) { + alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown)); + } + }); + } +}; + + +//鑾峰彇鏉$爜淇℃伅 +function GetBarInfoTAA() { + if (event.keyCode == 13) { + //濡傛灉鏈緭鍏ユ潯鐮侊紝璺冲嚭鏂规硶 + if ($("#DAB001").val() == "") { + $("#DAB001").focus(); + playerAudio("NG"); + mui.toast("璇峰厛鎵弿鐗╂枡鏉$爜!"); + return; + } + + if ($("#MBA001").val() == "") { + $("#DAB001").focus(); + playerAudio("NG"); + mui.toast("璇峰厛鎵弿搴撲綅!"); + return; + } + + //鐢ㄦ埛ID + var currentSession = app.loadconfig(app.CONFIG_CURRENT_SESSION); + var user_id = currentSession.user_id; //currentSession.user_id; + // var user_id = "admin"; + $.ajax({ + url: app.API_URL_HEADER + "/WARBABChag/GetBarInfoTAA", + + data: { + DAB001: $("#DAB001").val(), + TAA001: $("#order").val(), + MBA001: $("#MBA001").val(), + logID: user_id, //Admin //鍏堝啓姝伙紝渚夸簬璋冭瘯 + + }, + DataType: "json", + type: "post", + async: false, + //timeout: 15000, + success: function(data) { + //console.log(JSON.stringify(data)); + if (data.status != 0) { + playerAudio("NG"); + mui.alert(data.message, "", "", function() { + mui("#DAB001")[0].focus(); + $("#DAB001").val(""); + $("#txtSL").val(""); //鍏堟竻绌轰竴涓嬫暟鎹簮 + }); + return; + } else { + matterTable = data.data.matterTable; + $("#txtSL").val(""); //鍏堟竻绌轰竴涓嬫暟鎹簮 + $("#FLSL").val(""); //鍏堟竻绌轰竴涓嬫暟鎹簮 + + $("#txtSL").val(data.data.txtSL); //濉叆鏉$爜鏁伴噺 + $("#SPSL").val(data.data.txtSL); //濉叆鍙戞枡鏁伴噺 + $("#DAB020").val(data.data.DAB020); //濉叆鐗╂枡缂栫爜 + + mui("#SPSL")[0].focus(); + + } + }, + error: function(xhr, type, errorThrown) { + alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown)); + } + }); + + if (document.getElementById('barcheck').checked) { + confirmQuantity(); + } + + } +}; + + +function GetInfopici() { + + + //鐢ㄦ埛ID + var currentSession = app.loadconfig(app.CONFIG_CURRENT_SESSION); + var user_id = currentSession.user_id; //currentSession.user_id; + // var user_id = "admin"; + $.ajax({ + url: app.API_URL_HEADER + "/WARBABChag/GetInfopici", + + data: { + DAB001: $("#order").val(), + PICI: $("#spici").val(), + + }, + DataType: "json", + type: "post", + async: false, + //timeout: 15000, + success: function(data) { + //console.log(JSON.stringify(data)); + if (data.status != 0) { + playerAudio("NG"); + mui.alert(data.message, "", "", function() { + + }); + return; + } else { + + $("#info").val(data.data.info); //濉叆姹囨�讳俊鎭� + + + } + }, + error: function(xhr, type, errorThrown) { + alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown)); + } + }); + + if (document.getElementById('barcheck').checked) { + confirmQuantity(); + } + +} + +function huizong() { + + + //鐢ㄦ埛ID + var currentSession = app.loadconfig(app.CONFIG_CURRENT_SESSION); + var user_id = currentSession.user_id; //currentSession.user_id; + // var user_id = "admin"; + $.ajax({ + url: app.API_URL_HEADER + "/WARBABChag/huizong", + + data: { + DAB001: $("#order").val(), + }, + DataType: "json", + type: "post", + async: false, + //timeout: 15000, + success: function(data) { + //console.log(JSON.stringify(data)); + if (data.status != 0) { + playerAudio("NG"); + mui.alert(data.message, "", "", function() { + + }); + return; + } else { +GetInfopici(); + mui.toast("姹囨�绘垚鍔�!"); + + + } + }, + error: function(xhr, type, errorThrown) { + alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown)); + } + }); + + if (document.getElementById('barcheck').checked) { + confirmQuantity(); + } + +} + +function showdetail() { + console.log('133'); + var element = document.getElementById("divdetail"); + var element1 = document.getElementById("info"); + var element2 = document.getElementById("myTable2"); + + if (element.style.display === "none") { + element.style.display = "block"; + } else { + element.style.display = "none"; + } + if (element1.style.display === "none") { + element1.style.display = "block"; + } else { + element1.style.display = "none"; + } + if (element2.style.display === "none") { + element2.style.display = "block"; + } else { + element2.style.display = "none"; + } + +} + + +function confirmQuantity() { + + //濡傛灉鏈緭鍏ユ潯鐮侊紝璺冲嚭鏂规硶 + if ($("#DAB001").val() == "") { + $("#DAB001").focus(); + playerAudio("NG"); + mui.toast("璇峰厛鎵弿鐗╂枡鏉$爜!"); + return; + } + + if ($("#SPSL").val() == "") { + $("#SPSL").focus(); + playerAudio("NG"); + mui.toast("璇峰厛鎵緭鍏ュ疄鐩樻暟閲�!"); + return; + } + //鐢ㄦ埛ID + var currentSession = app.loadconfig(app.CONFIG_CURRENT_SESSION); + var user_id = currentSession.user_id; //currentSession.user_id; + console.log('1'); + // var user_id = "admin"; + $.ajax({ + url: app.API_URL_HEADER + "/WARBABChag/UpdateTAC007", + + data: { + DAB001: $("#DAB001").val(), + TAA001: $("#order").val(), + TAC007: $("#SPSL").val(), + MBA001: $("#MBA001").val(), + logID: user_id, //Admin //鍏堝啓姝伙紝渚夸簬璋冭瘯 + PICI: $("#spici").val(), + + }, + DataType: "json", + type: "post", + async: false, + //timeout: 15000, + success: function(data) { + //console.log(JSON.stringify(data)); + if (data.status != 0) { + playerAudio("NG"); + mui.alert(data.message, "", "", function() { + mui("#DAB001")[0].focus(); + $("#DAB001").val(""); + $("#txtSL").val(""); //鍏堟竻绌轰竴涓嬫暟鎹簮 + $("#SPSL").val(""); //鍏堟竻绌轰竴涓嬫暟鎹簮 + $("#DAB020").val(""); //鍏堟竻绌轰竴涓嬫暟鎹簮 + }); + return; + } else { + matterTable = data.data.matterTable; + $("#txtSL").val(""); //鍏堟竻绌轰竴涓嬫暟鎹簮 + $("#SPSL").val(""); //鍏堟竻绌轰竴涓嬫暟鎹簮 + $("#DAB001").val(""); //鍏堟竻绌轰竴涓嬫暟鎹簮 + $("#DAB020").val(""); //鍏堟竻绌轰竴涓嬫暟鎹簮 + + mui("#DAB001")[0].focus(); + mui.toast(data.message); + + $.ajax({ + url: app.API_URL_HEADER + "/WARBABChag/GetBarInfoTAC", + + data: { + TAA001: $("#order").val(), + }, + DataType: "json", + type: "post", + async: false, + //timeout: 15000, + success: function(data) { + //console.log(JSON.stringify(data)); + if (data.status != 0) { + playerAudio("NG"); + mui.alert(data.message, "", "", function() { + mui("#input")[0].focus(); + }); + return; + } else { + populateTable(data.data); + mui("#DAB001")[0].focus(); + + } + }, + error: function(xhr, type, errorThrown) { + alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown)); + } + }); + + if (document.getElementById('checkdefault').checked) { + return; + } + $("#MBA001").val(""); //鍏堟竻绌轰竴涓嬫暟鎹簮 + } + }, + error: function(xhr, type, errorThrown) { + alert("鑾峰彇鏁版嵁寮傚父锛�" + JSON.stringify(errorThrown)); + } + }); + GetInfopici(); +}; + + /* 褰撻〉闈㈢殑鏂囨湰澶卞幓鐒︾偣鏃讹紝璁╁叾鍐嶆鑾峰彇鐒︾偣 */ diff --git a/js/CangKuManage_js/GS_HBLLD.js b/js/CangKuManage_js/GS_HBLLD.js index a9cf439..e9060aa 100644 --- a/js/CangKuManage_js/GS_HBLLD.js +++ b/js/CangKuManage_js/GS_HBLLD.js @@ -478,7 +478,7 @@ var str = data.data.BARID.toString(); console.log(str); // 灏咮ARID杞崲涓哄瓧绗︿覆骞舵墦鍗拌緭鍑� - $("#DAB001").val($("#DAB001").val()+'-'+str); + $("#DAB001").val($("#DAB001").val()+'-'+str.slice(-4)); printByIds(str); console.log("鎵撳嵃鎴愬姛锛侊紒"); playerAudio("OK"); diff --git a/manifest.json b/manifest.json index 8b89c1e..a8cf436 100644 --- a/manifest.json +++ b/manifest.json @@ -3,7 +3,7 @@ "id" : "H546D0BA6", /*搴旂敤鐨勬爣璇�*/ "name" : "YKD_MES", /*搴旂敤鍚嶇О锛岀▼搴忔闈㈠浘鏍囧悕绉�*/ "version" : { - "name" : "3.58", /*搴旂敤鐗堟湰鍚嶇О*/ + "name" : "3.61", /*搴旂敤鐗堟湰鍚嶇О*/ "code" : "100" }, "description" : "", /*搴旂敤鎻忚堪淇℃伅*/ diff --git a/pages/CangKuManage/CK_XSCK.html b/pages/CangKuManage/CK_XSCK.html index cae6388..755cb09 100644 --- a/pages/CangKuManage/CK_XSCK.html +++ b/pages/CangKuManage/CK_XSCK.html @@ -153,6 +153,7 @@ mui.init(); // 鍒濆鍖� MUI //app.init(); //鍒濆鍖� + mui.plusReady(function() { app.init(); fetchData(); diff --git a/pages/CangKuManage/GS_CKPDD.html b/pages/CangKuManage/GS_CKPDD.html index 8480f5f..96c0b73 100644 --- a/pages/CangKuManage/GS_CKPDD.html +++ b/pages/CangKuManage/GS_CKPDD.html @@ -1,16 +1,16 @@ - <!doctype html> <html> <head> <meta charset="UTF-8"> <title>浠撳簱鐩樼偣</title> - <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" /> + <meta name="viewport" + content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" /> <meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-status-bar-style" content="black"> <!-- <link rel="stylesheet" href="../../lib/base_js/css/common.css" /> --> <script type="text/javascript" src="../../lib/jquery/js/jquery.min.js"></script> - <script type="text/javascript" src="../../lib/easyui/js/jquery.easyui.min.js" ></script> + <script type="text/javascript" src="../../lib/easyui/js/jquery.easyui.min.js"></script> <script src="../../lib/mui/js/mui.min.js"></script> <link href="../../lib/mui/css/mui.min.css" rel="stylesheet" /> <link href="../../lib/mui/css/mui.picker.min.css" rel="stylesheet" /> @@ -19,14 +19,11 @@ <script src="../../lib/mui/js/mui.poppicker.js"></script> <!--<script type="text/SetInputFoucsjavascript" src="../../lib/base_js/js/common.js" ></script>--> <script type="text/javascript" src="../../lib/base_js/js/app.js"></script> - - <script type="text/javascript" src="../../lib/base_js/js/common.js" ></script> - + + <script type="text/javascript" src="../../lib/base_js/js/common.js"></script> + <link rel="stylesheet" href="../../lib/base_js/css/common.css" /> <style> - - - #info { /*鏌ヨ淇℃伅灞炴��*/ background-color: #FFE48D; @@ -36,8 +33,8 @@ </head> <body> - - <div class="mui-input-group mui-content" > + + <div class="mui-input-group mui-content"> <!-- <div class="mui-input-row "> <div style=" float: left; "> <label class="row-title">浜哄憳</label> @@ -47,16 +44,16 @@ <input type="text" id="input" placeholder="杈撳叆鍏抽敭瀛楄繘琛屾煡璇�"> <div class="mui-input-row" id="row001"> <label>鐩樼偣鍗曞彿</label> - <select id="order" class="mui-h5 " style="margin:auto; color:#000;" > + <select id="order" class="mui-h5 " style="margin:auto; color:#000;"> <option value="">璇烽�夋嫨鐩樼偣鍗曞彿</option> </select> - </div> + </div> <div class="mui-input-row" id="div002"> <div style="width:20%;float: left;"> <label style="width: 100%;float: left;">搴撲綅</label> </div> <div style="width: 45%;float: left;"> - <input id="MBA001" type="text" value="" class="text-color" placeholder="璇锋壂鎻忓簱浣�" + <input id="MBA001" type="text" value="" class="text-color" placeholder="璇锋壂鎻忓簱浣�" style="width: 100%;float: left;" onkeypress="GetStoreTAA()" /> </div> <div style="width: 35%;float: left;" class="mui-checkbox mui-left"> @@ -66,33 +63,63 @@ </div> <div class="mui-input-row" id="row001"> <label>鐗╂枡鏉$爜</label> - <input id="DAB001" type="text" value="" class="mui-input-clear text-color" placeholder="璇锋壂鎻忔潯鐮�" onkeypress="GetBarInfoTAA()" /> + <input id="DAB001" type="text" value="" class="mui-input-clear text-color" placeholder="璇锋壂鎻忔潯鐮�" + onkeypress="GetBarInfoTAA()" /> </div> <div class="mui-input-row" id="row001"> <label>鐗╂枡缂栫爜</label> - <input id="DAB020" type="text" value="" class="mui-input-clear text-color" readonly="readonly" /> + <input id="DAB020" type="text" value="" class="mui-input-clear text-color" readonly="readonly" /> </div> <div class="mui-input-row" id="row001"> <label>鏉$爜鏁伴噺</label> - <input id="txtSL" type="text" value="" class="mui-input-clear text-color" readonly="readonly" /> + <input id="txtSL" type="text" value="" class="mui-input-clear text-color" readonly="readonly" /> </div> <div class="mui-input-row" id="row001"> <label>瀹炵洏鏁伴噺</label> <input id="SPSL" type="text" value="" class="mui-input-clear text-color" placeholder="璇疯緭鍏ュ疄鐩樻暟閲�" /> </div> <div class="mui-input-row" id="row001"> - <tr> - <td class="quantity-cell"> - <div class="center-content"> - <div style="width: 50%;float: left;" class="mui-checkbox mui-left"> - <label style="width: 100%;float: left;">榛樿纭</label> - <input id="barcheck" name="checkbox" value="" type="checkbox"> - </div> - <button style="width: 80%;" class="confirm-button" onclick="confirmQuantity()">纭</button> + <tr> + <td class="quantity-cell"> + <div class="center-content"> + <div style="width: 50%;float: left;" class="mui-checkbox mui-left"> + <label style="width: 100%;float: left;">榛樿纭</label> + <input id="barcheck" name="checkbox" value="" type="checkbox"> + </div> + <button style="width: 80%;" class="confirm-button" onclick="confirmQuantity()">纭</button> + </div> + </td> + </tr> + </div> + + <div class="mui-content" id="contentId"> + <div class="mui-input-group"> </div> - </td> - </tr> - </div> + <div class="mui-input-row"> + <ul class="mui-table-view"> + <li class="mui-table-view-cell mui-collapse mui-active"> + <a class="mui-navigate-right font" href="#" style="font-size: 20px; text-align: center;" + onclick="showdetail()">姹囨�绘槑缁�</a> + + <div class="mui-collapse-content" id="collapseId"> + + </div> + </li> + + </ul> + </div> + </div> + <div class="mui-input-row" id="divdetail" style="display:none"> + <div style="width:20%;float: left;"> + <label style="width: 100%;float: left;">鎵规</label> + </div> + <select id="spici" style="width:20%" onchange="GetInfopici()"> + + </select> + <button style="width: 60%;float: right;" class="confirm-button" onclick="huizong()">姹囨��</button> + </div> +<textarea readonly="readonly" id='info' style="height:200px;display:none"></textarea> + <div id="txtInfo"><!--<div class="mui-input-row" style="height: 350px; margin-top: 10px;">--> <div class="link-area" id="div001"> <h4 style="color: #008000; text-align: center;"> @@ -102,81 +129,92 @@ </h4> </div> </div> + + <div class="data-table-container" style="height: 100%; width: 100%;"> - <table class="data-table" id="myTable" style="height: 100%; width: 100%;"> - <!-- 琛ㄦ牸浠g爜 --> - <table class="data-table" id="myTable" style="height:100% width: 100%;;"> - <thead> - <tr> - <th>鏉$爜缂栧彿</th> -<!-- <th>鐗╂枡浠g爜</th> --> - <th>鏉$爜鏁伴噺</th> - <th>浠撲綅</th> - <th>瀹炵洏鏁伴噺</th> - <th>瀹炵洏搴撲綅</th> - </tr> - </thead> - <tbody> - <!-- 琛ㄦ牸鍐呭灏嗛�氳繃 JS 鍔ㄦ�佺敓鎴� --> - </tbody> + <table class="data-table" id="myTable" style="height: 100%; width: 100%;"> + <!-- 琛ㄦ牸浠g爜 --> + <table class="data-table" id="myTable" style="height:100% width: 100%;;"> + <thead> + <tr> + <th>鏉$爜缂栧彿</th> + <!-- <th>鐗╂枡浠g爜</th> --> + <th>鏉$爜鏁伴噺</th> + <th>浠撲綅</th> + <th>瀹炵洏鏁伴噺</th> + <th>瀹炵洏搴撲綅</th> + </tr> + </thead> + <tbody> + <!-- 琛ㄦ牸鍐呭灏嗛�氳繃 JS 鍔ㄦ�佺敓鎴� --> + </tbody> + </table> </table> - </table> </div> </div> - <script type="text/javascript" src="../../js/CangKuManage_js/GS_CKPDD.js" ></script> + <script type="text/javascript" src="../../js/CangKuManage_js/GS_CKPDD.js"></script> - </body> + </body> </html> <style> - /* 娣诲姞琛ㄦ牸鏍峰紡 */ - .data-table { - width: 100%; - border-collapse: collapse; - overflow-x: auto; /* 姘村钩婊氬姩鏉� */ - } - - - .data-table th, - .data-table td { - border: 1px solid #ccc; - padding: 3px; - text-align: left; - word-wrap: break-word; - white-space: pre-wrap; - text-overflow: ellipsis; /* 鏂囨湰鎴柇鍜岀渷鐣ュ彿 */ - overflow: hidden; - font-size: 10px; - } - - /* 濯掍綋鏌ヨ */ - @media (max-width: 768px) { - .data-table { - /* 璋冩暣琛ㄦ牸鏍峰紡浠ラ�傚簲灏忓睆骞� */ - } - } - - option { - font-size: 30px; /* 璋冩暣涓嬫媺閫夐」鐨勫瓧浣撳ぇ灏� */ - padding: 20px; /* 璋冩暣涓嬫媺閫夐」鐨勫唴杈硅窛 */ - } - - .confirm-button { - margin-top: 5px; /* 璁剧疆鎸夐挳涓庢暟閲忔枃鏈殑鍨傜洿璺濈 */ - font-size: 15px; /* 璁剧疆鎸夐挳鐨勫瓧浣撳ぇ灏� */ - padding: 5px 10px; /* 璁剧疆鎸夐挳鐨勫唴杈硅窛 */ - background-color: #f0f0f0; /* 璁剧疆鎸夐挳鐨勮儗鏅鑹� */ - border: none; /* 绉婚櫎鎸夐挳鐨勮竟妗� */ - cursor: pointer; /* 璁剧疆榧犳爣鏍峰紡涓烘墜鍨� */ - width: 150px; - } - - .center-content { - display: flex; - justify-content: center; - align-items: center; - height: 100%; - } - - </style> \ No newline at end of file + /* 娣诲姞琛ㄦ牸鏍峰紡 */ + .data-table { + width: 100%; + border-collapse: collapse; + overflow-x: auto; + /* 姘村钩婊氬姩鏉� */ + } + + + .data-table th, + .data-table td { + border: 1px solid #ccc; + padding: 3px; + text-align: left; + word-wrap: break-word; + white-space: pre-wrap; + text-overflow: ellipsis; + /* 鏂囨湰鎴柇鍜岀渷鐣ュ彿 */ + overflow: hidden; + font-size: 10px; + } + + /* 濯掍綋鏌ヨ */ + @media (max-width: 768px) { + .data-table { + /* 璋冩暣琛ㄦ牸鏍峰紡浠ラ�傚簲灏忓睆骞� */ + } + } + + option { + font-size: 30px; + /* 璋冩暣涓嬫媺閫夐」鐨勫瓧浣撳ぇ灏� */ + padding: 20px; + /* 璋冩暣涓嬫媺閫夐」鐨勫唴杈硅窛 */ + } + + .confirm-button { + margin-top: 5px; + /* 璁剧疆鎸夐挳涓庢暟閲忔枃鏈殑鍨傜洿璺濈 */ + font-size: 15px; + /* 璁剧疆鎸夐挳鐨勫瓧浣撳ぇ灏� */ + padding: 5px 10px; + /* 璁剧疆鎸夐挳鐨勫唴杈硅窛 */ + background-color: #f0f0f0; + /* 璁剧疆鎸夐挳鐨勮儗鏅鑹� */ + border: none; + /* 绉婚櫎鎸夐挳鐨勮竟妗� */ + cursor: pointer; + /* 璁剧疆榧犳爣鏍峰紡涓烘墜鍨� */ + width: 150px; + } + + .center-content { + display: flex; + justify-content: center; + align-items: center; + height: 100%; + } +</style> \ No newline at end of file diff --git a/unpackage/release/H546D0BA6.wgt b/unpackage/release/H546D0BA6.wgt new file mode 100644 index 0000000..1de65d9 --- /dev/null +++ b/unpackage/release/H546D0BA6.wgt Binary files differ -- Gitblit v1.9.3