From 5459f57e880c30eb6eef99e7bf091fcd51b8fc26 Mon Sep 17 00:00:00 2001 From: zgq <519541279@qq.com> Date: 星期四, 19 八月 2021 17:32:03 +0800 Subject: [PATCH] 工序进站新增新增按钮 --- WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 2 +- WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 58 +++++++++++++++++++++++++++------------------------------- 2 files changed, 28 insertions(+), 32 deletions(-) diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" index 53af7d6..e94a68c 100644 --- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" +++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" @@ -38,7 +38,7 @@ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;"> <div class="layui-card-header"> <div class="layui-btn-group"> - <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-filter="btnSave">淇濆瓨</button> + <button type="button" id="set_SaveBill" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="btnSave">淇濆瓨</button> <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button> </div> </div> diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" index 8746dfc..635f771 100644 --- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" +++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" @@ -14,7 +14,7 @@ <script src="../../../layuiadmin/Scripts/json2.js"></script> <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script> <script src="../../../layuiadmin/Scripts/webConfig.js"></script> - <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script> + <script src="../../../layuiadmin/PubCustom.js"></script> <!--鑷畾涔夋牱寮�--> <style> .layui-form-item .layui-inline { @@ -30,10 +30,11 @@ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;"> <div class="layui-card-header"> <div class="layui-btn-group"> - <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-filter="Saver">淇濆瓨</button> - <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-filter="set_CheckBill">瀹℃牳</button> - <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-filter="set_AbandonCheck">鍙嶅鏍�</button> - <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-filter="Cancel">閫�鍑�</button> + <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AddNew">鏂板</button> + <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button> + <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_CheckBill">瀹℃牳</button> + <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_AbandonCheck">鍙嶅鏍�</button> + <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Cancel">閫�鍑�</button> </div> </div> <div class="layui-form-item" style="padding-top: 10px;"> @@ -386,27 +387,7 @@ , form = layui.form , upload = layui.upload , element = layui.element; - //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓� - $("#HBarCode").focus(); - /*鍥哄畾浠g爜锛屾瘡寮犲崟鎹兘瑕乥egin*/ - /* 1.鏃犳簮鍗曟柊澧� - * 2.鏈夋簮鍗曟柊澧� - * 3.缂栬緫 - * 4.娴忚 - * 5.鍙樻洿 - */ - //鑾峰彇鍙傛暟 - function 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(); + var params = get_UrlVars(); if (typeof (params[params[0]]) == "undefined") { var OperationType = 1;//鎿嶄綔绫诲瀷 } else { @@ -418,9 +399,8 @@ //鍒ゆ柇鏄惁鏂板 if (OperationType == 1) { - $("#HInterID").val(""); - $("#HBillNo").val(""); //鑾峰彇鏈�澶у崟鎹彿 + var ajaxLoad = layer.load(); $.ajax({ url: GetWEBURL() + "/Web/GetMAXNum", type: "GET", @@ -430,6 +410,11 @@ $("#HInterID").val(d.data[0].HInterID); $("#HBillNo").val(d.data[0].HBillNo); PicUpload(); + layer.close(ajaxLoad); + } + , error: function () { + layer.close(ajaxLoad); + layer.msg("鑾峰彇鍗曟嵁鍙峰け璐ワ紝璇峰埛鏂伴噸璇曪紒"); } }); } @@ -438,6 +423,9 @@ RoadBillMain(linterid); //RoadBillSub(linterid); } + + //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓� + $("#HBarCode").focus(); function RoadBillMain(linterid)//鍔犺浇琛ㄥご { @@ -576,8 +564,8 @@ //娴佽浆鍗℃槸鍚︽壂鎻忔爣璁� var HProcExchBillNoFlag = false; //鍒濆鍩烘湰淇℃伅璧嬪�� - $("#HStationInTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss")); - $("#HDate").val(Format(new Date(), "yyyy-MM-dd")); + $("#HStationInTime").val(Pub_Format(new Date(), "yyyy-MM-dd hh:mm:ss")); + $("#HDate").val(Pub_Format(new Date(), "yyyy-MM-dd")); //$("#HEmpID").val(sessionStorage["Czybm"]); //$("#HEmp").val(sessionStorage["HUserName"]); $("#HMaker").val(sessionStorage["HUserName"]); @@ -682,8 +670,16 @@ }); } + //鏂板 + form.on('submit(set_AddNew)', function () {//鎻愪氦 + layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) { + window.location.reload(); + }); + }) + + //閫�鍑�-鍏抽棴椤甸潰鏂规硶 - $('#Cancel').on('click', function () { + form.on('submit(Cancel)', function () { layer.confirm('鎮ㄧ‘瀹氳閫�鍑哄悧锛�', { icon: 3, title: '鎻愮ず' }, function (index) { parent.layui.admin.events.closeThisTabs(); //鍏抽棴椤电 }); -- Gitblit v1.9.1