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_POInStockBillList_XB.html | 51 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList_XB.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList_XB.html
index b4577c2..49cdf0e 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList_XB.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList_XB.html
@@ -142,14 +142,15 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload" id="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit" id="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details" id="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-changebg" id="btn-changebg"><i class="layui-icon layui-icon-form"></i>鍙樻洿</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print" id="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃閫佽揣鍗�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete" id="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate" id="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚鏉＄爜</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit" id="btn-exit"><i class="layui-icon layui-icon-return"></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" 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="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
</div>
</script>
</div>
@@ -256,6 +257,7 @@
var option = [];
var titleData = ["hmainid", "hsubid", "鍚◣鍗曚环", "閲戦", "鐢熶骇鏃ユ湡", "棰勮鍒拌揣鏃ユ湡", "婧愬崟涓诲唴鐮�", "婧愬崟瀛愬唴鐮�", "婧愬崟绫诲瀷", "閲囪喘璁㈠崟鍙�", "濮斿璁㈠崟鍙�", "鏀舵枡缁勭粐", "閲囪喘缁勭粐", "闇�姹傜粍缁�"];
var HModName = "SRM_POInStockBillList";
+ var ins; //鐢ㄤ簬瀵煎嚭excel
//鍒濆鍖栨棩鏈熼棿闅斻�佸紑濮嬫棩鏈熴�佺粨鏉熸棩鏈�
setSelect_HInitTimeCycle();
//鑻ユ棩鏈熼棿闅斾笉涓� 浠绘剰闂撮殧锛屽垯绂佺敤寮�濮嬫棩鏈熶笌缁撴潫鏃ユ湡鐨勯�夋嫨
@@ -359,15 +361,13 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
var InterID = "";
- if (checkStatus.data.length > 0) {
+ if (checkStatus.data.length > 0 && checkStatus.data.length <= 15) {
for (var i = 0; i < checkStatus.data.length; i++) {
InterID += data[i].hmainid.toString() + ",";
}
InterID = InterID.substring(0, InterID.length - 1);
- var HIsAudit = false;
layer.confirm("纭瀹℃牳閫佽揣鍗曞悧锛�", { title: "瀹℃牳纭" }, function (index) {
layer.close(index);
-
var ajaxLoad = layer.load();
//閫昏緫瀹℃牳鏂规硶
$.ajax({
@@ -388,7 +388,6 @@
});
layer.close(ajaxLoad);
-
//鏌ヨ琛ㄦ牸鏁版嵁
get_FastQuery();
} else {
@@ -400,15 +399,19 @@
layer.close(ajaxLoad);
}
});
- })
+ })
}
else {
- layer.msg('璇烽�夋嫨鏁版嵁锛�');
+ if (checkStatus.data.length >= 1) {
+ layer.msg('鎵归噺瀹℃牳閫佽揣鍗曪紝涓�娆℃�т笉鍏佽瓒呰繃15鍗曪紒');
+ } else {
+ layer.msg('璇烽�夋嫨鏁版嵁锛�');
+ }
}
//鑷畾涔夊ご宸ュ叿鏍忓彸渚у浘鏍� - 鎻愮ず
case 'btn-reload':
_cur_page = $(".layui-laypage-em").next().html();
- RoadHBillNo(sql);
+ get_FastQuery(sql);
// });
break;
@@ -569,6 +572,10 @@
case 'btn-HideColumn':
get_HideColumn();
break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
};
});
@@ -585,7 +592,8 @@
success: function (result) {
ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
option.data = ajaxReturnData;
- table.render(option);
+ //table.render(option);
+ ins = table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
DisPlay_HideColumn();
layer.closeAll("loading");
@@ -639,7 +647,7 @@
sqlWhere += " and 鏁伴噺 = ^^" + $("#HQty").val() + "^^";
}
- sql = sqlWhere;
+ //sql = sqlWhere;
//浠庣涓�椤靛紑濮�
_cur_page = 1;
RoadHBillNo(sqlWhere);
@@ -648,7 +656,7 @@
//#endregion
form.on('submit(f_Query)', function (data) {//鏌ヨ
- var sqlWhere = "";
+ var sqlWhere = sql;
if ($("#HStatus").val() != "")
if ($("#HStatus").val() == "鏈敓鎴愭潯鐮�") {
sqlWhere += " and 鏈敓鎴愭潯鐮佹暟閲� > 0";
@@ -687,7 +695,7 @@
sqlWhere += " and 鏁伴噺 = ^^" + $("#HQty").val() + "^^";
}
- sql = sqlWhere;
+ //sql = sqlWhere;
//浠庣涓�椤靛紑濮�
_cur_page = 1;
RoadHBillNo(sqlWhere);
@@ -811,6 +819,23 @@
return fmt;
}
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ option.data.forEach((item) => {
+ for (let itemobj in item) {
+ if (item[itemobj] == null) {
+ item[itemobj] = "";
+ }
+ if (item[itemobj].length > 0) { // 鍋囪瀛楁鍚嶄负field
+ item[itemobj] = item[itemobj].toString().replaceAll(/[\r\n]+/g, '').replaceAll(',', '锛�').replaceAll(';', '锛�').replaceAll('"', '鈥�').replaceAll('\'', '鈥�'); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+
+ table.exportFile(ins.config.id, option.data, "xls");
+ }
+ //#endregion
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
--
Gitblit v1.9.1