From 486afcda1174e8791d8e790543ea90ae6f097701 Mon Sep 17 00:00:00 2001 From: zgq <519541279@qq.com> Date: 星期日, 21 二月 2021 18:53:09 +0800 Subject: [PATCH] 找货单 --- WebTM/views/仓存管理/仓库调拨/Cc_LookingForReturnBill.html | 12 WebTM/views/验收入库/其他入库/Kf_OtherInBill_Fast.html | 2 WebTM/views/验收入库/外购入库/Kf_POStockInBill_Fast.html | 4 WebTM/views/home/console.html | 143 +++++++++++--------- WebTM/views/验收入库/委外入库/Kf_EntrustInBill_Fast.html | 4 WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html | 58 ++++--- WebTM/Properties/PublishProfiles/webtm.pubxml.user | 18 +- WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 40 ++--- WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 88 +++++++----- WebTM/views/仓存管理/仓库调拨/Cc_LookingForBill.html | 14 +- 10 files changed, 205 insertions(+), 178 deletions(-) diff --git a/WebTM/Properties/PublishProfiles/webtm.pubxml.user b/WebTM/Properties/PublishProfiles/webtm.pubxml.user index bffc732..dad5446 100644 --- a/WebTM/Properties/PublishProfiles/webtm.pubxml.user +++ b/WebTM/Properties/PublishProfiles/webtm.pubxml.user @@ -742,7 +742,7 @@ <publishTime>01/14/2021 10:06:24</publishTime> </File> <File Include="views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html"> - <publishTime>01/14/2021 10:06:24</publishTime> + <publishTime>02/19/2021 22:45:53</publishTime> </File> <File Include="views/Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html"> <publishTime>01/19/2021 22:26:49</publishTime> @@ -1075,16 +1075,16 @@ <publishTime>11/26/2020 17:27:35</publishTime> </File> <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForBill.html"> - <publishTime>02/18/2021 16:53:38</publishTime> + <publishTime>02/21/2021 13:18:54</publishTime> </File> <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForReturnBill.html"> - <publishTime>02/18/2021 17:18:32</publishTime> + <publishTime>02/20/2021 15:21:20</publishTime> </File> <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_ReturnBill.html"> <publishTime>02/05/2021 14:05:30</publishTime> </File> <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html"> - <publishTime>02/07/2021 14:32:35</publishTime> + <publishTime>02/21/2021 13:15:10</publishTime> </File> <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html"> <publishTime>01/14/2021 10:06:24</publishTime> @@ -1192,7 +1192,7 @@ <publishTime>01/14/2021 10:06:24</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html"> - <publishTime>02/05/2021 10:04:18</publishTime> + <publishTime>02/20/2021 16:27:45</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html"> <publishTime>01/14/2021 10:06:24</publishTime> @@ -1216,7 +1216,7 @@ <publishTime>01/14/2021 10:06:24</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_Fast.html"> - <publishTime>01/14/2021 10:06:24</publishTime> + <publishTime>02/20/2021 15:01:29</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/浜у搧鍏ュ簱/Kf_ProductInBill_FastList.html"> <publishTime>01/14/2021 10:06:24</publishTime> @@ -1231,7 +1231,7 @@ <publishTime>01/14/2021 10:06:24</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html"> - <publishTime>01/14/2021 10:06:24</publishTime> + <publishTime>02/20/2021 14:43:30</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_FastList.html"> <publishTime>01/14/2021 10:06:24</publishTime> @@ -1246,7 +1246,7 @@ <publishTime>03/04/2020 11:43:34</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_Fast.html"> - <publishTime>01/14/2021 10:06:24</publishTime> + <publishTime>02/20/2021 14:48:15</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Kf_POStockInBill_FastList.html"> <publishTime>01/14/2021 10:06:24</publishTime> @@ -1261,7 +1261,7 @@ <publishTime>01/14/2021 10:06:24</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_Fast.html"> - <publishTime>01/14/2021 10:06:24</publishTime> + <publishTime>02/20/2021 14:48:02</publishTime> </File> <File Include="views/楠屾敹鍏ュ簱/濮斿鍏ュ簱/Kf_EntrustInBill_FastList.html"> <publishTime>01/14/2021 10:06:24</publishTime> diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html index 50d8081..ec45b24 100644 --- a/WebTM/views/home/console.html +++ b/WebTM/views/home/console.html @@ -22,7 +22,8 @@ <div class="layui-card-header">蹇嵎鏂瑰紡</div> <div class="layui-card-body"> - <div class="layui-carousel layadmin-carousel layadmin-shortcut"> + <div class="layadmin-shortcut"> + <!--layui-carousel layadmin-carousel--> <!--layadmin-carousel--> <div carousel-item> <ul class="layui-row layui-col-space10"> @@ -68,74 +69,86 @@ <cite>璋冩嫧鍗�</cite> </a> </li> + <li class="layui-col-xs3"> + <a href="../浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForBill.html" target="main_self_frame"> + <i class="layui-icon layui-icon-find-fill"></i> + <cite>涓嬫灦鎵捐揣鍗�</cite> + </a> + </li> + <li class="layui-col-xs3"> + <a href="../浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForReturnBill.html" target="main_self_frame"> + <i class="layui-icon layui-icon-find-fill"></i> + <cite>涓婃灦褰掕繕鍗�</cite> + </a> + </li> <!--<li class="layui-col-xs3"> - <a lay-href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html"> - <i class="layui-icon layui-icon-survey"></i> - <cite>鍏朵粬鍏ュ簱</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a lay-href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html"> - <i class="layui-icon layui-icon-user"></i> - <cite>鍏朵粬鍑哄簱</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a lay-href="set/system/website.html"> - <i class="layui-icon layui-icon-set"></i> - <cite>璁剧疆</cite> - </a> - </li>--> + <a lay-href="楠屾敹鍏ュ簱/鍏朵粬鍏ュ簱/Kf_OtherInBill_Fast.html"> + <i class="layui-icon layui-icon-survey"></i> + <cite>鍏朵粬鍏ュ簱</cite> + </a> + </li> + <li class="layui-col-xs3"> + <a lay-href="棰嗘枡鍙戣揣/鍏朵粬鍑哄簱/Kf_OtherOutBill_Fast.html"> + <i class="layui-icon layui-icon-user"></i> + <cite>鍏朵粬鍑哄簱</cite> + </a> + </li> + <li class="layui-col-xs3"> + <a lay-href="set/system/website.html"> + <i class="layui-icon layui-icon-set"></i> + <cite>璁剧疆</cite> + </a> + </li>--> </ul> <!--<ul class="layui-row layui-col-space10">--> <!--<li class="layui-col-xs3"> - <a lay-href="set/user/info.html"> - <i class="layui-icon layui-icon-set"></i> - <cite>鎴戠殑璧勬枡</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a lay-href="set/user/info.html"> - <i class="layui-icon layui-icon-set"></i> - <cite>鎴戠殑璧勬枡</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a lay-href="set/user/info.html"> - <i class="layui-icon layui-icon-set"></i> - <cite>鎴戠殑璧勬枡</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a lay-href="set/user/info.html"> - <i class="layui-icon layui-icon-set"></i> - <cite>鎴戠殑璧勬枡</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a lay-href="set/user/info.html"> - <i class="layui-icon layui-icon-set"></i> - <cite>鎴戠殑璧勬枡</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a lay-href="set/user/info.html"> - <i class="layui-icon layui-icon-set"></i> - <cite>鎴戠殑璧勬枡</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a lay-href="set/user/info.html"> - <i class="layui-icon layui-icon-set"></i> - <cite>鎴戠殑璧勬枡</cite> - </a> - </li> - <li class="layui-col-xs3"> - <a lay-href="set/user/info.html"> - <i class="layui-icon layui-icon-set"></i> - <cite>鎴戠殑璧勬枡</cite> - </a> - </li>--> + <a lay-href="set/user/info.html"> + <i class="layui-icon layui-icon-set"></i> + <cite>鎴戠殑璧勬枡</cite> + </a> + </li> + <li class="layui-col-xs3"> + <a lay-href="set/user/info.html"> + <i class="layui-icon layui-icon-set"></i> + <cite>鎴戠殑璧勬枡</cite> + </a> + </li> + <li class="layui-col-xs3"> + <a lay-href="set/user/info.html"> + <i class="layui-icon layui-icon-set"></i> + <cite>鎴戠殑璧勬枡</cite> + </a> + </li> + <li class="layui-col-xs3"> + <a lay-href="set/user/info.html"> + <i class="layui-icon layui-icon-set"></i> + <cite>鎴戠殑璧勬枡</cite> + </a> + </li> + <li class="layui-col-xs3"> + <a lay-href="set/user/info.html"> + <i class="layui-icon layui-icon-set"></i> + <cite>鎴戠殑璧勬枡</cite> + </a> + </li> + <li class="layui-col-xs3"> + <a lay-href="set/user/info.html"> + <i class="layui-icon layui-icon-set"></i> + <cite>鎴戠殑璧勬枡</cite> + </a> + </li> + <li class="layui-col-xs3"> + <a lay-href="set/user/info.html"> + <i class="layui-icon layui-icon-set"></i> + <cite>鎴戠殑璧勬枡</cite> + </a> + </li> + <li class="layui-col-xs3"> + <a lay-href="set/user/info.html"> + <i class="layui-icon layui-icon-set"></i> + <cite>鎴戠殑璧勬枡</cite> + </a> + </li>--> <!--</ul>--> </div> diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBill.html" index c35dc4c..aa02308 100644 --- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBill.html" +++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForBill.html" @@ -21,13 +21,13 @@ <div class="layui-form-item" style="padding:15px;margin:0px"> <div class="layui-row"> <div class="layui-col-xs3"> - <label class="layui-form-label" style="width:90px;padding-left:0px;">婧愬崟鍙�</label> + <label class="layui-form-label" style="width:60px;padding-left:0px;">婧愬崟鍙�</label> </div> <div class="layui-col-xs8"> <input type="text" name="HSourceBillNo" id="HSourceBillNo" autocomplete="off" class="layui-input"> </div> <div class="layui-col-xs3"> - <label class="layui-form-label" style="width:90px;padding-left:0px;">瀹炵墿鏉$爜</label> + <label class="layui-form-label" style="width:60px;padding-left:0px;">瀹炵墿鏉$爜</label> </div> <div class="layui-col-xs8"> <input type="text" name="HBarCode" id="HBarCode" autocomplete="off" class="layui-input"> @@ -159,7 +159,7 @@ if (sessionStorage.login != "login") { layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", { icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍'] - }, function () { window.location.href = "user/login.html"; }); + }, function () { window.location.href = "../../user/login.html"; }); } //鍒濆鍩烘湰淇℃伅璧嬪�� @@ -198,14 +198,14 @@ , cols: [[ { type: 'numbers', title: '搴忓彿' } , { field: 'HIsStatus', title: '鏄惁鎵爜' } - , { field: 'HSourceInterID', title: '婧愬崟ID', hide: true } - , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 110 } , { field: 'HMTONo', title: '鎵瑰彿', width: 180 } + , { field: 'HSPID', title: '浠撲綅ID', hide: true } + , { field: 'HSPName', title: '浠撲綅' } , { field: 'HStatus', title: '鍦ㄥ簱鐘舵��', width: 165 } , { field: 'HWhID', title: '浠撳簱ID', hide: true } , { field: 'HWhName', title: '浠撳簱' } - , { field: 'HSPID', title: '浠撲綅ID', hide: true } - , { field: 'HSPName', title: '浠撲綅' } + , { field: 'HSourceInterID', title: '婧愬崟ID', hide: true } + , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 110 } , { field: 'HGroupID', title: '鐝粍ID', hide: true } , { field: 'HGroup', title: '鐝粍' } , { field: 'HSourceID', title: '鐢熶骇璧勬簮ID', hide: true } diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html" index 0446aa0..a9866ea 100644 --- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html" +++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Cc_LookingForReturnBill.html" @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> - <title>褰掕繕鍗�</title> +<title>涓婃灦褰掕繕鍗�</title> <meta name="renderer" content="webkit"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> @@ -191,7 +191,7 @@ if (sessionStorage.login != "login") { layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", { icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍'] - }, function () { window.location.href = "user/login.html"; }); + }, function () { window.location.href = "../../user/login.html"; }); } //鍒濆鍩烘湰淇℃伅璧嬪�� @@ -230,14 +230,14 @@ , cols: [[ { type: 'numbers', title: '搴忓彿' } , { field: 'HIsStatus', title: '鏄惁鎵爜' } - , { field: 'HSourceInterID', title: '婧愬崟ID', hide: true } - , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 110 } , { field: 'HMTONo', title: '鎵瑰彿', width: 180 } + , { field: 'HSPID', title: '浠撲綅ID', hide: true } + , { field: 'HSPName', title: '浠撲綅' } , { field: 'HStatus', title: '鍦ㄥ簱鐘舵��', width: 165 } , { field: 'HWhID', title: '浠撳簱ID', hide: true } , { field: 'HWhName', title: '浠撳簱' } - , { field: 'HSPID', title: '浠撲綅ID', hide: true } - , { field: 'HSPName', title: '浠撲綅' } + , { field: 'HSourceInterID', title: '婧愬崟ID', hide: true } + , { field: 'HSourceBillNo', title: '婧愬崟鍙�', width: 110 } , { field: 'HGroupID', title: '鐝粍ID', hide: true } , { field: 'HGroup', title: '鐝粍' } , { field: 'HSourceID', title: '鐢熶骇璧勬簮ID', hide: true } diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" index 492726a..5f059f3 100644 --- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" +++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBill_Fast.html" @@ -107,7 +107,7 @@ <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input"> </div> <div class="layui-col-xs3"> - <button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button> + <button type="button" id="HSpID-BT" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button> </div> </div> </div> @@ -135,7 +135,7 @@ <input type="hidden" name="HOutStockPlaceID" id="HOutStockPlaceID" lay-verify="HOutStockPlaceID" value="0" autocomplete="off" class="layui-input"> </div> <div class="layui-col-xs3"> - <button type="button" id="HOSpID-BT" lay-submit="" class="layui-btn" lay-filter="HOSpID-BT">...</button> + <button type="button" id="HOSpID-BT" lay-submit="" class="layui-btn" lay-filter="HOSpID-BT" style="display:none">...</button> </div> </div> </div> @@ -291,8 +291,6 @@ $("#HSCWHNAME").val(sessionStorage["HWHName"]); $("#HOutStockPlaceID").val(sessionStorage["HSPID"]); $("#HOutStockPlaceName").val(sessionStorage["HSPName"]); - //$("#HSupID").val(sessionStorage["HSupID"]); - //$("#HSupName").val(sessionStorage["HSupName"]); $("#HDeptID").val(sessionStorage["HDeptID"]); $("#HDeptName").val(sessionStorage["HDept"]); $("#HSecManagerID").val(sessionStorage["HSecManagerID"]); @@ -305,8 +303,12 @@ $("#HBillerID").val(sessionStorage["HBillerID"]); $("#HBillerID").hide(); - //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new - + //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤� + if (sessionStorage.login != "login") { + layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", { + icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍'] + }, function () { window.location.href = "../../user/login.html"; }); + } //鑾峰彇鍙傛暟 function getUrlVars() { @@ -374,14 +376,6 @@ } }); } - - //鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new - - - - - - //鍒ゆ柇鏄惁鏂板 if (linterid == null || linterid == 0) { @@ -691,10 +685,10 @@ if (sQty != "") { $('#HQty').val(""); } - if ($("#HWHNAME").val() == '') { - layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - return false; - } + //if ($("#HWHNAME").val() == '') { + // layer.msg("璋冨叆浠撳簱娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + // return false; + //} if ($("#HWHID").val() == $("#HSCWHID").val() && $("#HStockPlaceID").val() == $("#HOutStockPlaceID").val()) { layer.msg("璋冨叆浠撳簱銆佷粨浣嶄笉鑳藉拰璋冨嚭浠撳簱銆佷粨浣嶉兘鐩稿悓!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); return false; @@ -756,6 +750,7 @@ layer.closeAll("loading"); } }); + var sSubStr = table.cache['wl-table']; } else { layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); @@ -826,7 +821,7 @@ if (event.keyCode == 13) { //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new $.ajax({ - url: GetWEBURL() + "/Web/GetSpName_Json", + url: GetWEBURL() + "/LookingFor/getSpName_Json", type: "GET", data: { "HBarCode": HBarCode }, success: function (result) { @@ -851,14 +846,15 @@ if (event.keyCode == 13) { //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new $.ajax({ - url: GetWEBURL() + "/Web/GetSpName_Json", + url: GetWEBURL() + "/LookingFor/getSpName_Json", type: "GET", data: { "HBarCode": HBarCode }, success: function (result) { if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 $("#HOutStockPlaceName").val(result.data[0].HName); - $("#HSCWHID").val(result.data[0].SCWhID); - $("#HSCWHNAME").val(result.data[0].HSCWHNAME); + $("#HOutStockPlaceID").val(result.data[0].HItemID); + $("#HSCWHNAME").val(result.data[0].HWhName); + $("#HSCWHID").val(result.data[0].HWHID); element.tabChange('tab-POStockInBill', '2'); } else { diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" index e543727..f7b34bd 100644 --- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" +++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\351\224\200\345\224\256\345\207\272\345\272\223/Kf_SellOutBill_Fast.html" @@ -88,7 +88,7 @@ <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input"> </div> <div class="layui-col-xs3"> - <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button> </div> </div> </div> @@ -268,8 +268,12 @@ $("#HBillerID").val(sessionStorage["HBillerID"]); $("#HBillerID").hide(); - - //榛樿甯﹀叆鐨勪粨搴擄紝濡傛灉鍚敤浠撲綅鍒欎粨浣嶆湁鏁堬紝濡傛灉娌℃湁鍚敤鍒欎粨浣嶇伆搴� new + //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤� + if (sessionStorage.login != "login") { + layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", { + icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍'] + }, function () { window.location.href = "../../user/login.html"; }); + } //鑾峰彇鍙傛暟 @@ -370,7 +374,7 @@ , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 } , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 } ]] - , height: 500 + //, height: 500 }) } @@ -436,6 +440,7 @@ } }) }); + form.on('submit(HSupID-BT)', function () {//閫夋嫨瀹㈡埛 layer.open({ type: 2 @@ -567,7 +572,7 @@ , { field: 'HAuxPropID', title: '杈呭姪灞炴��', width: 100 } , { field: 'HMTONo', title: '璁″垝璺熻釜鍙�', width: 100 } ]] - , height: 500 + //, height: 500 }) } else { @@ -588,7 +593,6 @@ var sSourceType = $("#HBillType").val(); if (AllowLoadData(sSubStr) != false)//闈炵┖楠岃瘉 { - layer.load(0); var flage = true; for (var i = 0; i < sSubStr.length; i++) { if (sSubStr[i].HQty == 0) { @@ -599,43 +603,49 @@ layer.confirm('瀹為檯鎵弿鍗锋暟灏忎簬鎵捐揣鍗曟暟閲忥紒鏄惁缁х画鎻愪氦锛�', { btn: ['缁х画', '鍙栨秷'], skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }, function () { - layer.load(1); - $.ajax( - { - type: "POST", - // url: "http://61.130.49.162:9090/WMSAPI///SellOut/set_SaveSellOutBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� - url: GetWEBURL() + "/SellOut/set_SaveSellOutBill_Json", - async: true, - data: { "oMain": sMainStr }, - dataType: "json", - success: function (data) { - if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜� - layer.confirm(data.Message + $("#HBillNo").val(), { - icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'], - btn2: function () { - //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电 - //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥 - parent.location.href = "../../../views/index.html" - }//鍏抽棴 - }, function () { window.location.reload(); });//鏂板 - } - else { - layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - } - layer.closeAll("loading"); - }, - error: function (err) { - layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - } - }); + Saver(sMainStr); }, function () { layer.closeAll("loading"); }); + } else { + Saver(sMainStr); } - return false; } }); + //鎻愪氦鏂规硶璋冪敤鐨刟jax + function Saver(sMainStr) { + layer.load(1); + $.ajax( + { + type: "POST", + // url: "http://61.130.49.162:9090/WMSAPI///SellOut/set_SaveSellOutBill_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚� + url: GetWEBURL() + "/SellOut/set_SaveSellOutBill_Json", + async: true, + data: { "oMain": sMainStr }, + dataType: "json", + success: function (data) { + if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜� + layer.confirm(data.Message + $("#HBillNo").val(), { + icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'], + btn2: function () { + //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电 + //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥 + parent.location.href = "../../../views/index.html" + }//鍏抽棴 + }, function () { window.location.reload(); });//鏂板 + } + else { + layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + layer.closeAll("loading"); + }, + error: function (err) { + layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + }); + } + //鐩戝惉鎻愪氦 form.verify({ numberOrEmpty: function (value, item) { @@ -771,7 +781,7 @@ ]] // , data: [linterid] // , page: true - , height: 500 + //, height: 500 , done: function () { layer.closeAll("loading"); } @@ -793,7 +803,7 @@ if (event.keyCode == 13) { //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new $.ajax({ - url: GetWEBURL() + "/Web/GetSpName_Json", + url: GetWEBURL() + "/LookingFor/getSpName_Json", type: "GET", data: { "HBarCode": HBarCode }, success: function (result) { @@ -933,7 +943,7 @@ ]] // , data: [linterid] // , page: true - , height: 500 + //, height: 500 , done: function () { layer.closeAll("loading"); } diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" index 4e3c566..65db348 100644 --- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" +++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\344\272\247\345\223\201\345\205\245\345\272\223/Kf_ProductInBill_Fast.html" @@ -70,7 +70,7 @@ <label class="layui-form-label" style="width:30px;padding-left:0px;">浠撳簱</label> </div> <div class="layui-col-xs6"> - <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input"> + <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input" readonly> <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" value="0" autocomplete="off" class="layui-input"> </div> <div class="layui-col-xs3"> @@ -88,7 +88,7 @@ <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input"> </div> <div class="layui-col-xs3"> - <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button> </div> </div> </div> @@ -268,6 +268,14 @@ } return vars; } + + //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤� + if (sessionStorage.login != "login") { + layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", { + icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍'] + }, function () { window.location.href = "../../user/login.html"; }); + } + var params = getUrlVars(); var linterid = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜 var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷 @@ -694,28 +702,28 @@ layer.load(3) table.render({ elem: '#wl-table' - //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json' - , url: GetWEBURL1() + '/ProductIn/DisBillEntryList_Webs_Json' - , toolbar: '#toolbarDemo' - , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' } - , cols: [[ - { type: 'radio' } - , { field: 'HQty', title: '鏁伴噺', width: 150 } - , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 } - , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 } - , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 } - , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 } - , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 } - , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 } - , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 } - , { field: 'HBatchNo', title: '鎵规', width: 150 } - ]] - // , data: [linterid] - // , page: true - , height: 500 - , done: function () { - layer.closeAll("loading"); - } + //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json' + , url: GetWEBURL1() + '/ProductIn/DisBillEntryList_Webs_Json' + , toolbar: '#toolbarDemo' + , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' } + , cols: [[ + { type: 'radio' } + , { field: 'HQty', title: '鏁伴噺', width: 150 } + , { field: 'HQtyMust', title: '搴旀敹鏁伴噺', width: 150 } + , { field: 'HMaterNumber', title: '鐗╂枡浠g爜', width: 150 } + , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 } + , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿', width: 150 } + , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�', width: 150 } + , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�', width: 150 } + , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 } + , { field: 'HBatchNo', title: '鎵规', width: 150 } + ]] + // , data: [linterid] + // , page: true + , height: 500 + , done: function () { + layer.closeAll("loading"); + } }); } else { @@ -798,7 +806,7 @@ if (event.keyCode == 13) { //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new $.ajax({ - url: GetWEBURL() + "/Web/GetSpName_Json", + url: GetWEBURL() + "/LookingFor/getSpName_Json", type: "GET", data: { "HBarCode": HBarCode }, success: function (result) { diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" index a269c71..176e6eb 100644 --- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" +++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\205\266\344\273\226\345\205\245\345\272\223/Kf_OtherInBill_Fast.html" @@ -815,7 +815,7 @@ if (event.keyCode == 13) { //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new $.ajax({ - url: GetWEBURL() + "/Web/GetSpName_Json", + url: GetWEBURL() + "/LookingFor/getSpName_Json", type: "GET", data: { "HBarCode": HBarCode }, success: function (result) { diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" index c3da431..fe8ccbc 100644 --- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" +++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBill_Fast.html" @@ -91,7 +91,7 @@ <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input"> </div> <div class="layui-col-xs3"> - <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT">...</button> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button> </div> </div> </div> @@ -898,7 +898,7 @@ if (event.keyCode == 13) { //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new $.ajax({ - url: GetWEBURL() + "/Web/GetSpName_Json", + url: GetWEBURL() + "/LookingFor/getSpName_Json", type: "GET", data: { "HBarCode": HBarCode}, success: function (result) { diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" index c42479d..015dd73 100644 --- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" +++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_Fast.html" @@ -88,7 +88,7 @@ <input type="hidden" name="HStockPlaceID" id="HStockPlaceID" lay-verify="HStockPlaceID" value="0" autocomplete="off" class="layui-input"> </div> <div class="layui-col-xs3"> - <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT_">...</button> + <button type="button" lay-submit="" class="layui-btn" lay-filter="HSpID-BT" style="display:none">...</button> </div> </div> </div> @@ -797,7 +797,7 @@ if (event.keyCode == 13) { //鍒ゆ柇鏂囨湰妗嗘槸鍚︽湁鏁版嵁 new $.ajax({ - url: GetWEBURL() + "/Web/GetSpName_Json", + url: GetWEBURL() + "/LookingFor/getSpName_Json", type: "GET", data: { "HBarCode": HBarCode }, success: function (result) { -- Gitblit v1.9.1