From 5e9c87d9524a3a31b7691e61d8da9a757377e9bd Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 20 八月 2025 10:51:09 +0800
Subject: [PATCH] 条码生成转换特殊字符;标准包装添加控制;
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html | 155 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 120 insertions(+), 35 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 0a6d86b..1b35b4a 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,15 +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">鐗╂枡浠g爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
</div>
</div>
<div class="layui-inline">
@@ -120,6 +126,7 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>-->
<button type="button" class="layui-btn layui-btn-sm" id="btn_HideColumn" lay-event="btn-HideColumn"><i class="layui-icon layui-icon-return"></i>闅愯棌鍒楄缃�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鏉$爜鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print-Convenient"><i class="layui-icon layui-icon-print"></i>涓�閿墦鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
</div>
@@ -168,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/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -192,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 = [];
//甯歌鐢ㄦ硶
@@ -308,7 +324,7 @@
sessionStorage["linterid"] = rows.toString();
layer.open({
type: 2
- , area: ['50%', '50%']
+ , area: ['40%', '80%']
, title: '鎵撳嵃妯$増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -317,6 +333,9 @@
, resize: false
})
}
+ break;
+ case 'btn-print-Convenient':
+ convenientPrint();
break;
case 'btn-Delete':
var checkStatus = table.checkStatus('mainTable')
@@ -368,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');
@@ -395,7 +426,7 @@
type: "POST",
url: GetWEBURL() + "GetBarCodeShowList",
async: true,
- data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
+ data: { "HSupIDs": sessionStorage["HSupIDs"], "sqlWhere": sqlWhere },
success: function (data1) {
//ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
//table.reload('mainTable', {
@@ -485,6 +516,8 @@
sqlWhere += " and 鐗╂枡浠g爜 like ^^%" + $("#HNumber").val() + "%^^";
if ($("#HName").val() != "")
sqlWhere += " and 鐗╂枡鍚嶇О like ^^%" + $("#HName").val() + "%^^";
+ if ($("#HSupName").val() != "")
+ sqlWhere += " and 渚涘簲鍟� like ^^%" + $("#HSupName").val() + "%^^";
if ($("#HModel").val() != "")
sqlWhere += " and 瑙勬牸鍨嬪彿 like ^^%" + $("#HModel").val() + "%^^";
//if ($("#HClStatus").val() != "")
@@ -511,6 +544,58 @@
active[type] ? active[type].call(this) : '';
});
+ //涓�閿墦鍗�
+ function convenientPrint() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ var rows = '';
+ var rows2 = '';
+ for (var i = 0; i < data.length; i++) {
+ rows += data[i].HItemID.toString() + ',';
+ rows2 += data[i].鏉$爜缂栧彿.toString() + ',';
+ }
+ rows = rows.substring(rows.length - 1, 0);
+ rows2 = rows2.substring(rows2.length - 1, 0);
+ if (rows == "") {
+ layer.msg("鑷冲皯閫夋嫨涓�琛岃褰曪紒")
+ }
+ else {
+ var url = "linteridSession";
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + url, //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"] },
+ dataType: "json",
+ success: function (data) {
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ }
+ });
+ sessionStorage["linterid"] = rows.toString();
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
+ async: true,
+ data: { "HNumber": 'SRM_POOrderBillList' },
+ //data: { "Value": Value },
+ success: function (result) {
+ if (result.count == 1) {
+ var OpenTmp = result.data[0].妯℃澘鍚嶇О
+ window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + sessionStorage["linterid"].toString() + "&Type=SRM_POOrderBillList" + "&OpenTmp=" + OpenTmp.toString());
+ } else {
+ layer.msg(result.Message);
+ }
+ },
+ error: function (result) {
+ console.log(result);
+ }
+ });
+ }
+ }
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
--
Gitblit v1.9.1