From 5b6ea813a122396eb42d90d88688bcd077a41b5d Mon Sep 17 00:00:00 2001 From: YL <YL@LAPTOP-SE03PLUR> Date: 星期二, 31 八月 2021 17:41:40 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI --- WebTM/views/生产管理/质量汇报单/Sc_QualityReportBill.html | 222 +++++++++++++++----------------------------- WebTM/layuiadmin/PubCustom.js | 23 ++++ 2 files changed, 100 insertions(+), 145 deletions(-) diff --git a/WebTM/layuiadmin/PubCustom.js b/WebTM/layuiadmin/PubCustom.js index ec9209f..3237288 100644 --- a/WebTM/layuiadmin/PubCustom.js +++ b/WebTM/layuiadmin/PubCustom.js @@ -50,6 +50,18 @@ return flag; } +function Pub_judgeMorPC() { + var userAgentInfo = navigator.userAgent; + var Agents = new Array("Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"); + var flag = true; + for (var v = 0; v < Agents.length; v++) { + if (userAgentInfo.indexOf(Agents[v]) > 0) { + flag = false; + break; + } + } + return flag; +} /** *澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁 *by zgq @@ -88,6 +100,17 @@ } return vars; } + +function Pub_getUrlVars() { + var vars = [], hash; + var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&'); + for (var i = 0; i < hashes.length; i++) { + hash = hashes[i].split('='); + vars.push(hash[0]); + vars[hash[0]] = hash[1]; + } + return vars; +} //鎺ユ敹鏂瑰紡鏍蜂緥锛� //var params = getUrlVars(); //if (typeof (params[params[0]]) == "undefined") { diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html" index a194601..7909c4f 100644 --- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html" +++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\350\264\250\351\207\217\346\261\207\346\212\245\345\215\225/Sc_QualityReportBill.html" @@ -272,11 +272,9 @@ </div> </div> </div> - <script type="text/html" id="toolbarDemo1"> - <div class="layui-btn-container"> - <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-delete"></i>鍒犺</button> - </div> - </script> + <input type="hidden" name="HReportType" id="HReportType" value="1"> + <input type="hidden" name="HBillType" id="HBillType" value="3717"> + <input type="hidden" name="HSourceBillType" id="HSourceBillType" value="0"> </form> </div> </div> @@ -309,11 +307,12 @@ elem: '#mainTable1' , toolbar: '#toolbarDemo1' , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲� - , height: 'full-270' + , height: 'full-300' , cellMinWidth: 110 + , totalRow: true , cols: [[ //琛ㄥご - { type: 'checkbox' } - , { type: 'numbers', title: '搴忓彿' } + { type: 'checkbox', totalRowText: '鍚堣琛�' } + , { type: 'numbers', title: '搴忓彿', totalRow: true } , { field: 'HBadReasonNumber', title: '涓嶈壇鍘熷洜浠g爜' } , { field: 'HBadReasonHName', title: '涓嶈壇鍘熷洜' } , { field: 'HCheckMan', title: '妫�楠屽憳' } @@ -327,6 +326,7 @@ }; var option2 = { elem: '#mainTable2' + , toolbar: '#toolbarDemo2' , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲� , height: 'full-300' , cellMinWidth: 110 @@ -406,6 +406,7 @@ } }); if (HSouceBillType == 3722) { + $("#HSourceBillType").val(HSouceBillType); //鏍规嵁婧愬崟id鑾峰彇婧愬崟淇℃伅 GetICMOBillValue(linterid); } else { @@ -521,6 +522,70 @@ error: function (err) { layer.close(ajaxLoad); layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + }); + }); + //#endregion + + //#region 閫�鍑烘寜閽� + form.on('submit(Cancel)', function () { + if (OperationType == 1) { + Pub_Close(2); + } else if (OperationType == 2) { + Pub_Close(1); + } + }) + //#endregion + + //#region 琛屽唴浜嬩欢 + table.on('tool(mainTable1)', function (obj) { + var rowData = obj.data; + if (obj.event === 'del') { + layer.confirm('纭畾鍒犻櫎' + rowData.HBadReasonNumber + '鍚楋紵', function (index) { + var ajaxLoad = layer.load(); + //閫昏緫鍒犻櫎鏂规硶 + $.ajax({ + url: GetWEBURL() + '/Sc_QualityReportBill/del_BarCodeDetail', + type: "GET", + data: { "HItemID": rowData.HItemID }, + success: function (result) { + if (result.count == 1) { + get_BarCodeDetail(); + get_BarCodeDetailSum(); + layer.close(ajaxLoad); + } else { + layer.close(ajaxLoad); + layer.alert(result.Message, { icon: 5 }); + } + }, error: function () { + layer.close(ajaxLoad); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); + } + }); + layer.close(index); + }); + } + }); + //#endregion + + + //#region 淇濆瓨鎻愪氦 + form.on('submit(btnSave)', function (data) {//鎻愪氦 + var ajaxLoad = layer.load(); + $.ajax({ + url: GetWEBURL() + '/Sc_QualityReportBill/set_SaveBill', + type: "GET", + data: { "HInterID": $("#HInterID").val() }, + success: function (data1) { + if (data1.count == 1) { + $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true); + layer.close(ajaxLoad); + } else { + layer.close(ajaxLoad); + } + }, error: function () { + layer.close(ajaxLoad); + layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 }); } }); }); @@ -662,8 +727,9 @@ table.render(option1); layer.close(ajaxLoad); } else { + option1.data = []; + table.render(option1); layer.close(ajaxLoad); - layer.alert(data1.code + data1.Message, { icon: 5 }); } }, error: function () { layer.close(ajaxLoad); @@ -686,8 +752,9 @@ table.render(option2); layer.close(ajaxLoad); } else { + option2.data = []; + table.render(option2); layer.close(ajaxLoad); - layer.alert(data1.code + data1.Message, { icon: 5 }); } }, error: function () { layer.close(ajaxLoad); @@ -698,141 +765,6 @@ //#endregion //#endregion - - - - - //琛屽唴浜嬩欢 - table.on('tool(mainTable)', function (obj) { - var data = obj.data; - var rowIndex = $(obj.tr).attr("data-index"); - if (obj.event === 'del') { - layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) { - console.log("绱㈠紩涓�:" + rowIndex); - if (rowIndex === '0') { - layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�'); - } else { - obj.del(); - option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓� - table.reload(option); - layer.close(index); - } - }); - } - }); - - - - //淇濆瓨鎻愪氦 - form.on('submit(btnSave)', function (data) {//鎻愪氦 - if ($("#HICMOInterID").val() == 0) { - layer.msg("璇烽�夋嫨浠诲姟鍗曪紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - return; - } - if ($("#HQty").val() == "" || $("#HQty").val() <= 0) { - layer.msg("鍩烘湰淇℃伅涓祦杞崱鏁伴噺涓嶈兘涓虹┖涓斾笉鑳藉皬浜庣瓑浜�0锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - return; - } - if (!$("#HPlanBeginDate").val()) { - layer.msg("璇烽�夋嫨璁″垝寮�宸ユ棩鏈燂紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - return; - } - if (!$("#HPlanEndDate").val()) { - layer.msg("璇烽�夋嫨璁″垝瀹屽伐鏃ユ湡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - return; - } - var sSubTable = table.cache['mainTable']; - var sMainStr = JSON.stringify(data.field); - var sSubStr = JSON.stringify(table.cache['mainTable']); - var sMainSub = sMainStr + ';' + sSubStr; - var ajaxLoad = layer.load(); - $.ajax({ - type: "POST", - url: GetWEBURL() + "/Sc_ProcessExchangeBill/AddBill", - async: true, - data: { "sMainSub": sMainSub }, - dataType: "json", - success: function (data) { - if (data.count == 1) { - layer.close(ajaxLoad); - layer.msg("鎻愪氦鎴愬姛", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鎸夐挳绂佺敤 - } - else { - layer.close(ajaxLoad); - layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - } - }, - error: function (err) { - layer.close(ajaxLoad); - layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - } - }); - }); - - - - - - //閫夋嫨浜у搧寮圭獥 - form.on('submit(btnSearchMater)', function () { - layer.open({ - type: 2//寮圭獥绫诲瀷 - , skin: 'layui-layer-rim' //鍔犱笂杈规 - , area: ['90%', '90%']//澶у皬 - , title: '鐗╂枡鍒楄〃'//鏍囬 - , shift: 2//寮瑰嚭鍔ㄧ敾 - , content: ['../../PublicPage/PartInformation.html', 'yes'] - , btn: ['纭畾', '鍙栨秷'] - , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 - var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 - var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test" - if (checkStatus.data.length === 0) { - return layer.msg('璇烽�夋嫨鏁版嵁'); - } - $("#HMaterName2").val(checkStatus.data[0].HName); - $("#HMaterName2").val(checkStatus.data[0].HItemID); - $("#HMaterNumber2").val(checkStatus.data[0].HNumber); - $("#HMaterHModel2").val(checkStatus.data[0].HModel); - layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� - } - , btn2: function (index, layero) { } - }) - }); - - - //閫夋嫨鐢熶骇浠诲姟鍗� - form.on('submit(btnSearchICMOBill)', function () { - layer.open({ - type: 2//寮圭獥绫诲瀷 - , skin: 'layui-layer-rim' //鍔犱笂杈规 - , area: ['90%', '90%']//澶у皬 - , title: '鐢熶骇浠诲姟鍗曞垪琛�'//鏍囬 - , shift: 2//寮瑰嚭鍔ㄧ敾 - , content: ['../../../views/Baseset/鍩虹璧勬枡/Sc_ICMOBillListView.html', 'yes'] - , btn: ['纭畾', '鍙栨秷'] - , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟 - var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰 - var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test" - if (checkStatus.data.length === 0) { - return layer.msg('璇烽�夋嫨鏁版嵁'); - } - GetICMOBillValue(checkStatus.data[0].hmainid) - layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁$畻鐨� - } - , btn2: function (index, layero) { } - }) - }); - - - //閫�鍑烘寜閽� - form.on('submit(Cancel)', function () { - if (OperationType == 1) { - Pub_Close(2); - } else if (OperationType == 2) { - Pub_Close(1); - } - }) //浠ヤ笂涓簂ayui妯″潡 -- Gitblit v1.9.1