From 3d38632730ae4d3e787050def49d4bc5094e95ef Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期四, 20 二月 2025 15:06:52 +0800 Subject: [PATCH] 打印模板点击行选择;条码编辑模块添加列合计,保存时特殊字符转换;添康合并生成条码;送货单列表跳转查看条码明细;送货单添加审核、反审核功能; --- WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html | 93 ++++++++++++++++++++++++++++------------------ 1 files changed, 57 insertions(+), 36 deletions(-) diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html index eaa037f..c47f17d 100644 --- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html +++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html @@ -30,22 +30,6 @@ </div> </div> <div class="layui-inline"> - <label class="layui-form-label">鐘舵��</label> - <div class="layui-input-block"> - <select name="HStatus" id="HStatus" lay-filter=""> - <option value="" selected="">鍏ㄩ儴</option> - <option value="鏈墦鍗�">鏈墦鍗�</option> - <option value="宸叉墦鍗�">宸叉墦鍗�</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="HBarCode" id="HBarCode"> - </div> - </div> - <div class="layui-inline"> <label class="layui-form-label">婧愬崟鍗曞彿</label> <div class="layui-input-block"> <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo"> @@ -58,11 +42,23 @@ </div> </div> <div class="layui-inline"> - <label class="layui-form-label">鐗╂枡浠g爜</label> + <label class="layui-form-label">鐗╂枡鍚嶇О</label> <div class="layui-input-block"> - <input type="text" class="layui-input" name="HNumber" id="HNumber"> + <input type="text" class="layui-input" name="HName" id="HName"> </div> </div> + <div class="layui-inline"> + <label class="layui-form-label">瑙勬牸鍨嬪彿</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" name="HModel" id="HModel"> + </div> + </div> + <div class="layui-inline"> + <label class="layui-form-label">渚涘簲鍟�</label> + <div class="layui-input-block"> + <input type="text" class="layui-input" name="HSupName" id="HSupName"> + </div> + </div> <div class="layui-inline"> <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="f_Query"> <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i> @@ -70,21 +66,25 @@ </div> <div class="layui-colla-content" style="padding-left:82px"> <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="HName" id="HName"> + <select name="HStatus" id="HStatus" lay-filter=""> + <option value="" selected="">鍏ㄩ儴</option> + <option value="鏈墦鍗�">鏈墦鍗�</option> + <option value="宸叉墦鍗�">宸叉墦鍗�</option> + </select> </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="HModel" id="HModel"> + <input type="text" class="layui-input" name="HBarCode" id="HBarCode"> </div> </div> <div class="layui-inline"> - <label class="layui-form-label">渚涘簲鍟�</label> + <label class="layui-form-label">鐗╂枡浠g爜</label> <div class="layui-input-block"> - <input type="text" class="layui-input" name="HSupName" id="HSupName"> + <input type="text" class="layui-input" name="HNumber" id="HNumber"> </div> </div> <div class="layui-inline"> @@ -175,16 +175,7 @@ var params = getUrlVars(); var type = params[params[0]]; - switch (type) { - case "UnPrint": - options[1].selected = true; - sql += " and 鐘舵�� like ^^%鏈墦鍗�%^^"; - break; - case "RePrint": - options[2].selected = true; - sql += " and 鐘舵�� like ^^%宸叉墦鍗�%^^"; - break; - } + var HSourceBillNo = params[params[1]]; layui.config({ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰� @@ -199,8 +190,26 @@ , form = layui.form , element = layui.element; + switch (type) { + case "UnPrint": + options[1].selected = true; + sql += " and 鐘舵�� like ^^%鏈墦鍗�%^^"; + break; + case "RePrint": + options[2].selected = true; + sql += " and 鐘舵�� like ^^%宸叉墦鍗�%^^"; + break; + case "check": + if (HSourceBillNo != undefined) { + $("#HSourceBillNo").val(HSourceBillNo); + + sql += " and 婧愬崟鍗曞彿 like ^^%" + HSourceBillNo + "%^^"; + } + break; + } + //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞� - var titleData = ["HItemID", "HParentID", "鍗曟嵁鍙�", "鏃ユ湡", "鏁伴噺", "鐘舵��", "鍗曚綅", "閲戦"]; + var titleData = ["HItemID", "HParentID", "鍗曟嵁鍙�", "鏃ユ湡", "鐘舵��", "鍗曚綅", "閲戦"]; var HModName = "SRM_BarCodeBillList"; var option = []; //甯歌鐢ㄦ硶 @@ -315,7 +324,7 @@ sessionStorage["linterid"] = rows.toString(); layer.open({ type: 2 - , area: ['80%', '80%'] + , area: ['40%', '80%'] , title: '鎵撳嵃妯$増閫夋嫨' , shade: 0.6 //閬僵閫忔槑搴� , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲 @@ -378,6 +387,18 @@ }; }); + table.on('sort(mainTable)', function (obj) { //娉細sort 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��" + table.reload('mainTable', { + initSort: obj //璁板綍鍒濆鎺掑簭锛屽鏋滀笉璁剧殑璇濓紝灏嗘棤娉曟爣璁拌〃澶寸殑鎺掑簭鐘舵�併�� layui 2.1.1 鏂板鍙傛暟 + , where: { //璇锋眰鍙傛暟锛堟敞鎰忥細杩欓噷闈㈢殑鍙傛暟鍙换鎰忓畾涔夛紝骞堕潪涓嬮潰鍥哄畾鐨勬牸寮忥級 + field: obj.field //鎺掑簭瀛楁 鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈� field order + , order: obj.type //鎺掑簭鏂瑰紡 鍦ㄦ帴鍙d綔涓哄弬鏁板瓧娈� field order + } + }); + option.data = layui.table.cache["mainTable"]; + table.render(option); + }); + //琛岀洃鍚簨浠� table.on('row(mainTable)', function (obj) { var flag = !obj.tr.find(':checkbox:first').prop('checked'); -- Gitblit v1.9.1