From 68ef2632aa52dca92a81250a8d95790d63441303 Mon Sep 17 00:00:00 2001 From: zgq <519541279@qq.com> Date: 星期五, 26 二月 2021 14:45:52 +0800 Subject: [PATCH] 解决销售出库新增问题 --- WebTM/views/仓存管理/仓库调拨/Cc_LookingForReturnBill.html | 19 +- WebTM/views/仓存管理/仓库调拨/Cc_WaitingLookingFor.html | 148 ++++++++++++++++++++++++ WebTM/views/home/console.html | 6 + WebTM/views/仓存管理/仓库调拨/Cc_LookingForBillList.html | 48 ++++++- WebTM/Properties/PublishProfiles/webtm.pubxml.user | 21 ++- WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html | 4 WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html | 8 + WebTM/views/index.html | 1 WebTM/views/仓存管理/仓库调拨/Cc_LookingForBill.html | 85 +++++++++++-- WebTM/WebTM.csproj | 1 10 files changed, 294 insertions(+), 47 deletions(-) diff --git a/WebTM/Properties/PublishProfiles/webtm.pubxml.user b/WebTM/Properties/PublishProfiles/webtm.pubxml.user index cb05182..486d8b2 100644 --- a/WebTM/Properties/PublishProfiles/webtm.pubxml.user +++ b/WebTM/Properties/PublishProfiles/webtm.pubxml.user @@ -13,10 +13,10 @@ <publishTime>01/14/2021 10:06:24</publishTime> </File> <File Include="bin/WebTM.dll"> - <publishTime>02/23/2021 13:25:24</publishTime> + <publishTime>02/24/2021 20:38:29</publishTime> </File> <File Include="bin/WebTM.pdb"> - <publishTime>02/23/2021 13:25:24</publishTime> + <publishTime>02/24/2021 20:38:29</publishTime> </File> <File Include="layuiadmin/config.js"> <publishTime>01/14/2021 10:06:23</publishTime> @@ -943,7 +943,7 @@ <publishTime>01/14/2021 10:06:24</publishTime> </File> <File Include="views/home/console.html"> - <publishTime>02/21/2021 18:52:08</publishTime> + <publishTime>02/24/2021 23:28:50</publishTime> </File> <File Include="views/home/homepage1.html"> <publishTime>01/14/2021 10:06:24</publishTime> @@ -955,7 +955,7 @@ <publishTime>01/14/2021 10:06:24</publishTime> </File> <File Include="views/index.html"> - <publishTime>02/23/2021 14:32:05</publishTime> + <publishTime>02/24/2021 22:41:59</publishTime> </File> <File Include="views/senior/echarts/bar.html"> <publishTime>01/14/2021 10:06:24</publishTime> @@ -1075,13 +1075,13 @@ <publishTime>11/26/2020 17:27:35</publishTime> </File> <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForBill.html"> - <publishTime>02/23/2021 15:15:46</publishTime> + <publishTime>02/24/2021 17:31:17</publishTime> </File> <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForBillList.html"> - <publishTime>02/23/2021 11:58:02</publishTime> + <publishTime>02/25/2021 15:05:22</publishTime> </File> <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForReturnBill.html"> - <publishTime>02/23/2021 14:47:27</publishTime> + <publishTime>02/25/2021 14:27:14</publishTime> </File> <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForReturnBillList.html"> <publishTime>02/23/2021 11:59:48</publishTime> @@ -1089,8 +1089,11 @@ <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_ReturnBill.html"> <publishTime>02/05/2021 14:05:30</publishTime> </File> + <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_WaitingLookingFor.html"> + <publishTime>02/25/2021 14:28:42</publishTime> + </File> <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html"> - <publishTime>02/22/2021 20:38:40</publishTime> + <publishTime>02/25/2021 16:14:07</publishTime> </File> <File Include="views/浠撳瓨绠$悊/浠撳簱璋冩嫧/Kf_MoveStockBill_FastList.html"> <publishTime>01/14/2021 10:06:24</publishTime> @@ -1198,7 +1201,7 @@ <publishTime>01/14/2021 10:06:24</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_Fast.html"> - <publishTime>02/20/2021 16:27:45</publishTime> + <publishTime>02/24/2021 13:22:27</publishTime> </File> <File Include="views/棰嗘枡鍙戣揣/閿�鍞嚭搴�/Kf_SellOutBill_FastList.html"> <publishTime>01/14/2021 10:06:24</publishTime> diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj index 792570c..0e2d8d4 100644 --- a/WebTM/WebTM.csproj +++ b/WebTM/WebTM.csproj @@ -414,6 +414,7 @@ <Content Include="views\user\user\userform.html" /> <Content Include="views\user\璇存槑.txt" /> <Content Include="views\涓嶈壇姹囨姤\Xs_SeOrderPickUp.html" /> + <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Cc_WaitingLookingFor.html" /> <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Cc_LookingForReturnBillList.html" /> <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Cc_LookingForReturnBill.html" /> <Content Include="views\浠撳瓨绠$悊\浠撳簱璋冩嫧\Cc_LookingForBill.html" /> diff --git a/WebTM/views/home/console.html b/WebTM/views/home/console.html index ec45b24..5784b30 100644 --- a/WebTM/views/home/console.html +++ b/WebTM/views/home/console.html @@ -81,6 +81,12 @@ <cite>涓婃灦褰掕繕鍗�</cite> </a> </li> + <li class="layui-col-xs3"> + <a href="../浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_WaitingLookingFor.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> diff --git a/WebTM/views/index.html b/WebTM/views/index.html index bd01786..e0d3cd8 100644 --- a/WebTM/views/index.html +++ b/WebTM/views/index.html @@ -116,6 +116,7 @@ <dd><a href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForReturnBill.html" target="main_self_frame">涓婃灦褰掕繕鍗�</a></dd> <dd><a lay-href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForBillList.html" target="main_self_frame">涓嬫灦鎵捐揣鍗曞垪琛�</a></dd> <dd><a lay-href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_LookingForReturnBillList.html" target="main_self_frame">涓婃灦褰掕繕鍗曞垪琛�</a></dd> + <dd><a href="浠撳瓨绠$悊/浠撳簱璋冩嫧/Cc_WaitingLookingFor.html" target="main_self_frame">寰呭彂鍖烘壘璐�</a></dd> </dl> </dd> </dl> 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 5c90e38..6cf5efd 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" @@ -45,6 +45,7 @@ <ul class="layui-tab-title" lay-filter="tab-all"> <li lay-id="1" style="padding:1px;display:none">琛ㄥご淇℃伅</li> <li lay-id="2" style="padding:1px;" class="layui-this">鏄庣粏淇℃伅</li> + <li lay-id="3" style="padding:1px;">宸叉壂淇℃伅</li> </ul> <div class="layui-tab-content"> <!--琛ㄥご淇℃伅--> @@ -120,6 +121,10 @@ <!--鏄庣粏淇℃伅--> <div class="layui-tab-item layui-show"> <table class="layui-hide" id="bzd-table" lay-filter="bzd-table"></table> + </div> + <!--宸叉壂淇℃伅--> + <div class="layui-tab-item"> + <table class="layui-hide" id="bzd-table2" lay-filter="bzd-table2"></table> </div> </div> </div> @@ -237,9 +242,53 @@ } }; + //涓昏〃鍒楄〃-宸叉壂淇℃伅 + var option2 = { + elem: '#bzd-table2' + //, toolbar: '#toolbarDemo' + , page: true + //, height: 256 + , cellMinWidth: 90 + , limit: 500 + , cols: [[ + { type: 'numbers', title: '搴忓彿' } + , { field: 'HIsStatus', title: '鏄惁鎵爜' } + , { 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: '浠撳簱', width: 130 } + , { 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 } + , { field: 'HSource', title: '鐢熶骇璧勬簮', width: 115, templet: '#sexTpl' } + , { field: 'HQty', title: '鏁伴噺' } + , { field: 'HMaterID', title: '鐗╂枡ID', hide: true } + , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 } + , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜' } + , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' } + , { field: '鍗虫椂搴撳瓨', title: '鍗虫椂搴撳瓨' } + , { field: 'HBarCode', title: '鏉$爜缂栧彿', hide: true } + , { field: 'HInterID', title: '鍗曟嵁ID', hide: true } + , { field: 'HBillNo', title: '鍗曟嵁鍙�' } + , { field: 'HMakerID', title: '鍒跺崟浜篒D', hide: true } + , { field: 'HMaker', title: '鍒跺崟浜�' } + , { field: 'HBillType', title: 'HBillType', hide: true } + ]] + , text: { + none: '鏆傛棤鐩稿叧鏁版嵁锛岃鍏堟壂鎻忓疄鐗╂潯鐮侊紒' //榛樿锛氭棤鏁版嵁銆傛敞锛氳灞炴�т负 layui 2.2.5 寮�濮嬫柊澧� + } + }; + //鍒濆鍔犺浇琛ㄦ牸 option.data = []; table.render(option); + + option2.data = []; + table.render(option2); //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ簮鍗曞彿涓� $("#HSourceBillNo").focus(); @@ -294,9 +343,9 @@ rowFlage += i + 1 + ","; } } - if (rowFlage) { - layer.msg("绗�" + rowFlage + "琛屾暟鎹棤鏉$爜锛岃鍏堢敓鎴愭潯鐮侊紒", { icon: 5, btn: ['鎴戝凡鐭ユ檽'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); - } + //if (rowFlage) { + // layer.msg("绗�" + rowFlage + "琛屾暟鎹棤鏉$爜锛岃鍏堢敓鎴愭潯鐮侊紒", { icon: 5, btn: ['鎴戝凡鐭ユ檽'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + //} $("#HSourceBillNo").attr("readonly", "readonly");//婧愬崟鍙峰彧璇� $("#HSourceBillNo").css("background-color", "#efefef4d"); element.tabChange('tab-LookingForBill', '2'); //璺宠浆椤电 @@ -314,6 +363,7 @@ } }); + var data = new Object(); //鎵疄鐗╂潯鐮� $('#HBarCode').on('keydown', function (event) { var HBarCode = $('#HBarCode').val() @@ -347,8 +397,13 @@ sSubStr[i].HMaker = $("#HMaker").val(); option.data = table.cache["bzd-table"]; table.render(option); - layer.close(index); $('#HBarCode').val(""); + //鍔ㄦ�佽幏鍙栧凡鎵爜璁板綍骞舵坊鍔犲埌宸叉壂淇℃伅涓� + table.cache["bzd-table2"].push(sSubStr[i]); + option2.data = table.cache["bzd-table2"]; + table.render(option2); + element.tabChange('tab-LookingForBill', '3');//璺宠浆椤电 + layer.close(index); layer.msg("鎵爜鎴愬姛锛�", { icon: 1, time: 1000 }); } } @@ -438,18 +493,18 @@ form.on('submit(Saver)', function (data) {//鎻愪氦 //debugger; //var sMainStr = JSON.stringify(data.field); - var tableData = table.cache['bzd-table']; - for (var i = 0; i < tableData.length; i++) { - if (tableData[i].HIsStatus == "鏄�" ) { + var tableData = table.cache['bzd-table2']; + //for (var i = 0; i < tableData.length; i++) { + // if (tableData[i].HIsStatus == "鏄�" ) { - } else { - //绉婚櫎褰撳墠琛� - tableData.splice(i, 1); - i--; - option.data = tableData; - table.render(option); - } - } + // } else { + // //绉婚櫎褰撳墠琛� + // tableData.splice(i, 1); + // i--; + // option.data = tableData; + // table.render(option); + // } + //} var sSubStr = JSON.stringify(tableData); sSubStr = "{\"oSub\": " + sSubStr + "}"; //sSubStr = JSON.stringify(sSubStr); 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_LookingForBillList.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_LookingForBillList.html" index 30516a0..05e4d60 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_LookingForBillList.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_LookingForBillList.html" @@ -21,25 +21,28 @@ <div class="layui-colla-item"> <div class="layui-colla-title layui-inline"> <div class="layui-inline"> - <span></span> + <span>鏇村</span> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label> + <div class="layui-input-block"> + <select name="HBillType" id="HBillType"> + <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option> + <option value="ZHSJ">涓婃灦褰掕繕鍗�</option> + </select> </div> </div> <div class="layui-inline"> <label class="layui-form-label">鍗曟嵁鍙�</label> <div class="layui-input-block"> - <input type="text" class="layui-input" name="WorkCenter" id="WorkCenter"> + <input type="text" class="layui-input" name="HBillNo" id="HBillNo"> </div> </div> <div class="layui-inline"> - <label class="layui-form-label">鐗╂枡</label> + <label class="layui-form-label">婧愬崟鍙�</label> <div class="layui-input-block"> - <input type="text" class="layui-input" name="hnumber" id="hnumber"> - </div> - </div> - <div class="layui-inline"> - <label class="layui-form-label">鍗曟嵁绫诲瀷</label> - <div class="layui-input-block"> - <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO"> + <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo"> </div> </div> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch"> @@ -47,6 +50,31 @@ </button> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button> + <div class="layui-colla-content"> + <div class="layui-inline"> + <div class="layui-inline"> + <span>鍏朵粬鏉′欢></span> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">鍒跺崟浜�</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" name="HCreateBy" id="HCreateBy"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">寮�濮嬫椂闂�</label> + <div class="layui-input-block"> + <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">缁撴潫鏃堕棿</label> + <div class="layui-input-block"> + <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate"> + </div> + </div> + </div> </div> </div> <table class="" id="mainTable" lay-filter="mainTable"></table> 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 2d41dcf..7e19277 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" @@ -237,10 +237,10 @@ , cols: [[ { type: 'numbers', title: '搴忓彿' } , { field: 'HIsStatus', title: '鏄惁鎵爜', hide: true } - , { field: 'HMTONo', title: '鎵瑰彿', width: 180 } + , { field: 'HMTONo', title: '鎵瑰彿' } , { field: 'HSPID', title: '浠撲綅ID', hide: true } , { field: 'HSPName', title: '浠撲綅' } - , { field: 'HStatus', title: '鍦ㄥ簱鐘舵��', width: 165 } + , { field: 'HStatus', title: '鍦ㄥ簱鐘舵��' } , { field: 'HWhID', title: '浠撳簱ID', hide: true } , { field: 'HWhName', title: '浠撳簱', width: 130 } , { field: 'HSourceInterID', title: '婧愬崟ID', hide: true } @@ -276,15 +276,15 @@ , cellMinWidth: 90 , cols: [[ { type: 'numbers', title: '搴忓彿' } - //, { field: 'HIsStatus', title: '鏄惁鎵爜' } - , { field: 'HSourceInterID', title: '婧愬崟ID', hide: true } - , { field: 'HSourceBillNo', title: '婧愬崟鍙�', hide: true } - , { field: 'HMTONo', title: '鎵瑰彿', width: 180 } - , { field: 'HStatus', title: '鍦ㄥ簱鐘舵��', width: 165 } - , { field: 'HWhID', title: '浠撳簱ID', hide: true } - , { field: 'HWhName', title: '浠撳簱', width: 130 } + //, { field: 'HIsStatus', title: '鏄惁鎵爜', hide: true } + , { field: 'HMTONo', title: '鎵瑰彿' } , { field: 'HSPID', title: '浠撲綅ID', hide: true } , { field: 'HSPName', title: '浠撲綅' } + , { field: 'HStatus', title: '鍦ㄥ簱鐘舵��' } + , { field: 'HWhID', title: '浠撳簱ID', hide: true } + , { field: 'HWhName', title: '浠撳簱', width: 130 } + , { 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 } @@ -374,6 +374,7 @@ $("#HSourceBillNo").attr("readonly", "readonly");//婧愬崟鍙峰彧璇� $("#HSourceBillNo").css("background-color", "#efefef4d"); element.tabChange('tab-LookingForBill', '2'); //璺宠浆椤电 + $("#HSPName").focus(); } else { layer.close(index); 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_WaitingLookingFor.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_WaitingLookingFor.html" new file mode 100644 index 0000000..ff399e3 --- /dev/null +++ "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_WaitingLookingFor.html" @@ -0,0 +1,148 @@ +锘�<!DOCTYPE html> +<html xmlns="http://www.w3.org/1999/xhtml"> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> +<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"> + <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all"> + <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all"> +</head> + +<body> + <div class="layui-fluid" style="padding:0"> + <div class="layui-card"> + <div class="layui-card-body" style="padding: 5px; height:800px;"> + <div style="background-color:#0085E8;"> + <span style="color: white;"><i class="layui-icon layui-icon-form"></i>寰呭彂鍖烘壘璐�</span> + </div> + <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:60px;padding-left:0px;">婧愬崟鍙�</label> + </div> + <div class="layui-col-xs8"> + <input type="text" name="HBarCode" id="HBarCode" autocomplete="off" class="layui-input"> + </div> + </div> + </div> + <div class="layui-tab-item layui-show"> + <table class="layui-hide" id="bzd-table" lay-filter="bzd-table"></table> + </div> + <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px"> + <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button> + </div> + </div> + </div> + </div> + <script src="../../../layuiadmin/layui/layui.js"></script> + <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> + layui.config({ + base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰� + }).extend({ + index: 'lib/index' //涓诲叆鍙fā鍧� + }).use(['index', 'form', 'laydate', 'table', 'element'], function () { + var $ = layui.$ + , layer = layui.layer + , table = layui.table + , form = layui.form + + //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤� + //if (sessionStorage.login != "login") { + // layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", { + // icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍'] + // }, function () { window.location.href = "../../user/login.html"; }); + //} + + //涓昏〃鍒楄〃 + var option = { + elem: '#bzd-table' + //, toolbar: '#toolbarDemo' + , page: true + //, height: 256 + //, cellMinWidth: 90 + , cols: [[ + { type: 'numbers', title: '搴忓彿' } + , { field: '鏉$爜缂栧彿', title: '鏉$爜缂栧彿' } + , { field: '鎵瑰彿', title: '鎵瑰彿' } + , { field: '浠撳簱ID', title: '浠撳簱ID', hide: true } + , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О' } + , { field: '浠撳簱缂栫爜', title: '浠撳簱缂栫爜' } + , { field: '浠撲綅ID', title: '浠撲綅ID', hide: true } + , { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', hide: true } + , { field: '浠撲綅缂栫爜', title: '浠撲綅缂栫爜' } + , { field: '鐗╂枡ID', title: '鐗╂枡ID', hide: true } + , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' } + , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜' } + , { field: '婧愬崟鍙�', title: '婧愬崟鍙�' } + ]] + , text: { + none: '鏆傛棤鐩稿叧鏁版嵁锛岃鍏堟壂鎻忓疄鐗╂潯鐮侊紒' //榛樿锛氭棤鏁版嵁銆傛敞锛氳灞炴�т负 layui 2.2.5 寮�濮嬫柊澧� + } + }; + + + //鍒濆鍔犺浇琛ㄦ牸 + option.data = []; + table.render(option); + + + //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ簮鍗曞彿涓� + $("#HBarCode").focus(); + + //鎵疄鐗╂潯鐮� + $('#HBarCode').on('keydown', function (event) { + var HBarCode = $('#HBarCode').val(); + if (event.keyCode == 13) { + if (!HBarCode) { + layer.msg("璇锋壂鎻忔潯鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + return; + } + var index = layer.load(); + $.ajax({ + url: GetWEBURL() + "/LookingFor/GetWaitingLookingFor", + type: "GET", + data: { "HBarCode": HBarCode }, + success: function (result) { + if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝 + var data = result.data; + option.data = data; + table.render(option); + layer.close(index); + } + else { + option.data = []; + table.render(option); + layer.close(index); + layer.msg("姝ゆ潯鐮佹棤璁板綍锛岃鎵弿姝g‘鐨勬潯鐮侊紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + }, + error: function (err) { + layer.close(index); + layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + } + }); + layer.close(index); + $('#HBarCode').val(""); + } + }); + + + + //閫�鍑烘寜閽� + form.on('submit(Cancel)', function () { + parent.location.href = "../../../views/index.html" + //window.close();//鍏抽棴褰撳墠椤� + }) + + // 浠ヤ笂涓簂eyui妯″潡 + }); + + </script> + +</body> +</html> 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 0d02288..266d526 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" @@ -111,7 +111,7 @@ </div> </div> </div> - <div class="layui-form-item" style="padding:0px;margin:0px;display: none;"> + <div class="layui-form-item" style="padding:0px;margin:0px;"> <div class="layui-row"> <div class="layui-col-xs3"> <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撳簱</label> @@ -125,7 +125,7 @@ </div> </div> </div> - <div class="layui-form-item" style="padding:0px;margin:0px;display: none;"> + <div class="layui-form-item" style="padding:0px;margin:0px;"> <div class="layui-row"> <div class="layui-col-xs3"> <label class="layui-form-label" style="width:60px;padding-left:0px;">璋冨嚭浠撲綅</label> 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 f7b34bd..8fe3631 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" @@ -631,7 +631,8 @@ btn2: function () { //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电 //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥 - parent.location.href = "../../../views/index.html" + sessionStorage["SourceFlag"] = false; + parent.location.href = "../../../views/index.html"; }//鍏抽棴 }, function () { window.location.reload(); });//鏂板 } @@ -641,7 +642,7 @@ layer.closeAll("loading"); }, error: function (err) { - layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); + layer.msg("鎺ュ彛璇锋眰澶辫触锛�" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" }); } }); } @@ -793,6 +794,9 @@ layer.msg(result.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: "娓╅Θ鎻愮ず" }); } }); } -- Gitblit v1.9.1