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_POOrderBillList.html | 435 ++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 326 insertions(+), 109 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
index 5ca3aad..e6abb8e 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
@@ -31,26 +31,26 @@
<span>鏇村</span>
</div>
</div>
-
+
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
+ <label class="layui-form-label">璁㈠崟鍗曞彿</label>
+ <div class="layui-input-block" style="width:130px;">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡缂栫爜</label>
- <div class="layui-input-block">
+ <div class="layui-input-block" style="width:130px;">
<input type="text" class="layui-input" name="HShortNumber" id="HShortNumber">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none">
<label class="layui-form-label">鏃х墿鏂欑紪鐮�</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HOldMaterNumber" id="HOldMaterNumber">
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none">
<label class="layui-form-label">鐗╂枡浠g爜</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HNumber" id="HNumber">
@@ -58,11 +58,85 @@
</div>
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block">
+ <div class="layui-input-block" style="width:130px;">
<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" style="width:100px;">
+ <input type="text" class="layui-input" name="HDate1" id="HDate1">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block" style="width:100px;">
+ <input type="text" class="layui-input" name="HDate2" id="HDate2">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">渚涘簲鍟嗗悕绉�</label>
+ <div class="layui-input-block" style="width:130px;">
+ <input type="text" class="layui-input" name="HSupName" id="HSupName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍏抽棴鐘舵��</label>
+ <div class="layui-input-block" style="width:120px">
+ <select id="HClStatus" name="HClStatus" lay-filter="">
+ <option value="">鍏ㄩ儴</option>
+ <option value="鏈叧闂�" selected>鏈叧闂�</option>
+ <option value="宸插叧闂�">宸插叧闂�</option>
+ </select>
+ </div>
+ </div>
+ <!--鐟炵惇,鍑礉-->
+ <div class="layui-inline">
+ <label class="layui-form-label">涓氬姟鐘舵��</label>
+ <div class="layui-input-block" style="width:120px">
+ <select id="HIsClose" name="HIsClose" lay-filter="">
+ <option value="鍏ㄩ儴" selected>鍏ㄩ儴</option>
+ <option value="姝e父">姝e父</option>
+ <option value="涓氬姟鍏抽棴">涓氬姟鍏抽棴</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍐荤粨鐘舵��</label>
+ <div class="layui-input-block" style="width:120px">
+ <select id="HIsFreeze" name="HIsFreeze" lay-filter="">
+ <option value="鍏ㄩ儴" selected>鍏ㄩ儴</option>
+ <option value="姝e父">姝e父</option>
+ <option value="涓氬姟鍐荤粨">涓氬姟鍐荤粨</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瀹屾垚鐘舵��</label>
+ <div class="layui-input-block" style="width:120px">
+ <select name="HFinishStatus" id="HFinishStatus" lay-filter="">
+ <option value="">鍏ㄩ儴</option>
+ <option value="鏈畬鎴�" selected="">鏈畬鎴�</option>
+ <option value="宸插畬鎴�">宸插畬鎴�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">涓氬姟缁堟</label>
+ <div class="layui-input-block">
+ <select id="HIsStop" name="HIsStop" lay-filter="">
+ <option value="鍏ㄩ儴">鍏ㄩ儴</option>
+ <option value="鏄�">鏄�</option>
+ <option value="鍚�" selected>鍚�</option>
+ </select>
+ </div>
+ </div>
<div class="layui-inline">
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -70,31 +144,14 @@
</div>
<div class="layui-colla-content" style="padding-left:82px">
<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">
- <select id="HClStatus" name="HClStatus" lay-filter="">
- <option value="" selected>鍏ㄩ儴</option>
- <option value="鏈叧闂�">鏈叧闂�</option>
- <option value="宸插叧闂�">宸插叧闂�</option>
+ <label class="layui-form-label">鐘舵��</label>
+ <div class="layui-input-block" style="width:120px">
+ <select name="HStatus" id="HStatus" lay-filter="">
+ <option value="" selected="">鍏ㄩ儴</option>
+ <option value="鏈‘璁�">鏈‘璁�</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="HDate1" id="HDate1">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃ユ湡</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HDate2" id="HDate2">
</div>
</div>
<div class="layui-inline">
@@ -130,38 +187,6 @@
</select>
</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>
- <option value="宸查┏鍥�">宸查┏鍥�</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">瀹屾垚鐘舵��</label>
- <div class="layui-input-block">
- <select name="HFinishStatus" id="HFinishStatus" lay-filter="">
- <option value="">鍏ㄩ儴</option>
- <option value="鏈畬鎴�" selected="">鏈畬鎴�</option>
- <option value="宸插畬鎴�">宸插畬鎴�</option>
- </select>
- </div>
- </div>
- <!--鐟炵惇-->
- <div class="layui-inline">
- <label class="layui-form-label">涓氬姟鍏抽棴</label>
- <div class="layui-input-block">
- <select id="HIsClose" name="HIsClose" lay-filter="">
- <option value="鍏ㄩ儴" selected>鍏ㄩ儴</option>
- <option value="鏄�">鏄�</option>
- <option value="鍚�">鍚�</option>
- </select>
- </div>
- </div>
</div>
</div>
</div>
@@ -171,17 +196,21 @@
<table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" id="btn_reload" lay-submit="" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="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" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-report" id="btn_report"><i class="layui-icon layui-icon-close-fill"></i>姹囨姤</button>
- <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" lay-event="btn-barcode"><i class="layui-icon layui-icon-file"></i>鐢熸垚鏉$爜</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-HideColumn"><i class="layui-icon layui-icon-return"></i>闅愯棌鍒楄缃�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="set_dao"><i class="layui-icon layui-icon-form"></i>瀵煎嚭</button>
+ <button type="button" class="layui-btn layui-btn-sm" id="btn_details" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" id="btn_barcode" lay-event="btn-barcode"><i class="layui-icon layui-icon-file"></i>鐢熸垚鏉$爜</button>
+ <button type="button" class="layui-btn layui-btn-sm" id="btn_generate" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" id="btn_backData" lay-event="btn_backData"><i class="layui-icon layui-icon-add-1"></i>杩斿洖鏁版嵁</button>
+ <button type="button" class="layui-btn layui-btn-sm" id="btn_exit" lay-event="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="set_dao" lay-event="set_dao"><i class="layui-icon layui-icon-form"></i>瀵煎嚭</button>
</div>
</script>
</div>
@@ -189,6 +218,8 @@
</div>
</div>
<script src="../../layuiadmin/layui/layui.js" charset="utf-8"></script>
+ <script src="../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
+ <script src="../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
<script src="../../../../Scripts/webConfig.js"></script>
<script>
var _cur_page = 1;
@@ -209,23 +240,10 @@
layer.alert(sMsg, { icon: 5 });
}
var params = getUrlVars();
- var type = params[params[0]];
- switch (type) {
- case "UnConfirm":
- options[1].selected = true;
- sql += " and 鐘舵�� like ^^%鏈‘璁�%^^";
- //$("#HStatus").attr("disabled", true)
- break;
- case "ReConfirm":
- options[2].selected = true;
- sql += " and 鐘舵�� like ^^%宸茬‘璁�%^^";
- sql += " and 鏈叧鑱旀暟閲� > 0";
- break;
- case "ReBack":
- options[3].selected = true;
- sql += " and 鐘舵�� like ^^%宸查┏鍥�%^^";
- break;
- }
+ var type = params[params[0]]; //鎵撳紑鍒楄〃绫诲瀷锛堝叏閮ㄩ噰璐鍗曪紝宸茬‘璁ら噰璐鍗曪紝鏈‘璁ら噰璐鍗�...锛�
+ var HSupName = params[params[1]];//閫佽揣鍗曠紪杈戦〉闈㈤�夋簮鍗曟墦寮�閫佽揣鍗曞垪琛ㄦ椂锛屾妸椤甸潰涓�夋嫨鐨勪緵搴斿晢浼犻�掕繃鏉ュ仛杩囨护锛岄槻閿�
+ var HOrderType = params[params[2]];//閫佽揣鍗曠紪杈戦〉闈㈤�夋簮鍗曟墦寮�閫佽揣鍗曞垪琛ㄦ椂锛屾妸椤甸潰涓�夋嫨鐨勮鍗曠被鍨嬩紶閫掕繃鏉ュ仛杩囨护锛岄槻閿�
+
layui.config({
base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -241,16 +259,64 @@
, excel = layui.excel;
//甯歌鐢ㄦ硶
laydate.render({
- elem: '#HDate1'
+ elem: '#HDate1' //杩囨护鏉′欢寮�濮嬫棩鏈熷垵濮嬪寲
});
laydate.render({
- elem: '#HDate2'
+ elem: '#HDate2' //杩囨护鏉′欢缁撴潫鏃ユ湡鍒濆鍖�
});
+
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "HParentID"];
+ var titleData = ["HItemID", "HParentID", "鍗曚綅", "閲戦"];
var option = [];
var HModName = "SRM_POOrderBillList";
+ var sqlWhere = "";
+
+ //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂囥�� 娉細HBillType 鏄弬鏁板懡鍚嶏紝涓嶆槸鍊�
+ HOrderType = getParams("HOrderType");
+
+ HSupName = getParams("HSupName");
+
//#region 杩涘叆椤甸潰鏃㈠姞杞�
+ switch (type) {
+ case "UnConfirm":
+ options[1].selected = true;
+ sql += " and 鐘舵�� like ^^%鏈‘璁�%^^";
+ //$("#HStatus").attr("disabled", true)
+ break;
+ case "ReConfirm":
+ options[2].selected = true;
+ sql += " and 鐘舵�� like ^^%宸茬‘璁�%^^";
+ sql += " and 鏈叧鑱旀暟閲� > 0";
+ break;
+ case "ReBack":
+ options[3].selected = true;
+ sql += " and 鐘舵�� like ^^%宸查┏鍥�%^^";
+ break;
+ case "AddRow":
+ //$("#HStatus").attr("disabled", "disabled");
+ //$("#HStatus").val('宸茬‘璁�');
+ //$("#HFinishStatus").attr("disabled", "disabled");
+ //form.render('select');
+ //sqlWhere += " and 鐘舵�� like ^^%宸茬‘璁�%^^";
+ //sqlWhere += " and 瀹屾垚鐘舵�� like ^^%" + $("#HFinishStatus").val() + "%^^";
+ //$('#btn_reload').addClass("layui-btn-disabled").attr("visibility", "hidden");
+ //$('#btn_confirm').addClass("layui-btn-disabled").attr("disabled", true);
+ //$('#btn_back').addClass("layui-btn-disabled").attr("disabled", true);
+ //$('#btn_report').addClass("layui-btn-disabled").attr("disabled", true);
+ //$('#btn_details').addClass("layui-btn-disabled").attr("disabled", true);
+ //$('#btn_barcode').addClass("layui-btn-disabled").attr("disabled", true);
+ //$('#btn_generate').addClass("layui-btn-disabled").attr("disabled", true);
+ //$('#set_dao').addClass("layui-btn-disabled").attr("disabled", true);
+ if (HSupName != undefined) {
+ sql += " and 渚涘簲鍟� = ^^" + HSupName + "^^";
+ }
+ if (HOrderType != undefined) {
+ sql += " and 璁㈠崟绫诲瀷 = ^^" + HOrderType + "^^";
+ }
+
+ break;
+ }
+
set_ClearBill();
//#region 姝ら〉闈㈡墍鏈夋柟娉�
function set_ClearBill() {
@@ -373,7 +439,11 @@
//闅愯棌id
//璁剧疆鍒楀
if (dataCols[3] > 0) {
- option.cols[0][i + 1]["width"] = dataCols[3];
+ if (option.cols[0][i + 1]["field"] == '渚涘簲鍟嗕氦鏈熷洖澶�') {
+ option.cols[0][i + 1]["width"] = 120;
+ } else {
+ option.cols[0][i + 1]["width"] = dataCols[3];
+ }
}
//璁剧疆鍐呭瀛椾綋澶у皬
if (data1.data[0].HFontSize != 0) {
@@ -387,7 +457,7 @@
//} else {
// option.cols[0][i + 1]["width"] = "";
//}
-
+
//瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
switch (dataCols[2]) {
case "L":
@@ -433,9 +503,9 @@
var wait = layer.load();//閬僵
$.ajax({
type: "POST",
- url: GetWEBURL() + "GetPOOrderBill",
+ url: GetWEBURL() + "GetPOOrderBill", //H_p_SRM_POOrderBillList
async: true,
- data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
+ data: { "HSupIDs": sessionStorage["HSupIDs"], "sqlWhere": sqlWhere },
success: function (data1) {
if (data1.Message == "鑾峰彇鎴愬姛") {
var data = [];
@@ -462,11 +532,13 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
break;
default:
- if (data[i].name == '璁㈠崟鏁伴噺' || data[i].name == '宸插彂璐ф暟閲�' || data[i].name == '鏈彂璐ф暟閲�') {
+ if (data[i].name == '璁㈠崟鏁伴噺' || data[i].name == '宸插彂璐ф暟閲�' || data[i].name == '鏈彂璐ф暟閲�' || data[i].name == '鍓╀綑鏀舵枡鏁伴噺' || data[i].name == '鏈埌璐ф暟閲�' || data[i].name == '绱鏀舵枡鏁伴噺' || data[i].name == '鍓╀綑鍏ュ簱鏁伴噺' || data[i].name == '鍏ュ簱鏁伴噺' || data[i].name == '鍙彂璐ф暟閲�') {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
+ } else if (data[i].name == '渚涘簲鍟嗕氦鏈熷洖澶�') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: 'HSupSendGoodsDateRemark' });
} else {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
- }
+ }
}
}
}
@@ -517,6 +589,8 @@
sqlWhere += " and 鏃х墿鏂欑紪鐮� like ^^%" + $("#HOldMaterNumber").val() + "%^^";
if ($("#HNumber").val() != "")
sqlWhere += " and 鐗╂枡浠g爜 like ^^%" + $("#HNumber").val() + "%^^";
+ if ($("#HSupName").val() != "")
+ sqlWhere += " and 渚涘簲鍟� like ^^%" + $("#HSupName").val() + "%^^";
if ($("#HName").val() != "")
sqlWhere += " and 鐗╂枡鍚嶇О like ^^%" + $("#HName").val() + "%^^";
if ($("#HModel").val() != "")
@@ -541,13 +615,30 @@
}
/*鐟炵惇*/
if ($("#HIsClose").val() != "") {
- if ($("#HIsClose").val() == "鏄�") {
- sqlWhere += " and 涓氬姟鍏抽棴 = ^^宸插叧闂璣^";
+ if ($("#HIsClose").val() == "姝e父") {
+ sqlWhere += " and 涓氬姟鍏抽棴 = ^^姝e父^^";
}
- else if ($("#HIsClose").val() == "鍚�") {
- sqlWhere += " and 涓氬姟鍏抽棴 = ^^鏈叧闂璣^";
+ else if ($("#HIsClose").val() == "涓氬姟鍏抽棴") {
+ sqlWhere += " and 涓氬姟鍏抽棴 = ^^涓氬姟鍏抽棴^^";
}
}
+ if ($("#HIsFreeze").val() != "") {
+ if ($("#HIsFreeze").val() == "姝e父") {
+ sqlWhere += " and 涓氬姟鍐荤粨 = ^^姝e父^^";
+ }
+ else if ($("#HIsFreeze").val() == "涓氬姟鍐荤粨") {
+ sqlWhere += " and 涓氬姟鍐荤粨 = ^^涓氬姟鍐荤粨^^";
+ }
+ }
+ if ($("#HIsStop").val() != "") {
+ if ($("#HIsStop").val() == "鏄�") {
+ sqlWhere += " and 涓氬姟缁堟 = ^^涓氬姟缁堟^^";
+ }
+ else if ($("#HIsStop").val() == "鍚�") {
+ sqlWhere += " and 涓氬姟缁堟 = ^^姝e父^^";
+ }
+ }
+
var Time = $("#Time").val();
if (Time > 0) {
var dd = new Date();
@@ -579,11 +670,60 @@
sqlWhere += " and 浜よ揣鏃ユ湡 <= ^^" + dt + "^^";
}
}
- sql = sqlWhere;
+
+ sqlWhere = sqlWhere + sql;
//浠庣涓�椤靛紑濮�
_cur_page = 1;
get_Display(sqlWhere);
}
+
+ //鐩戝惉鍗曞厓鏍间簨浠�
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event === 'HSupSendGoodsDateRemark') {
+ layer.prompt({
+ formType: 2
+ , area: ['400px', '50px'] //鑷畾涔夋枃鏈煙瀹介珮
+ , title: '淇敼璁㈠崟鍙蜂负 銆� ' + data.鍗曟嵁鍙� + ' 銆� 锛岀墿鏂欎唬鐮佷负 銆� ' + data.鐗╂枡浠g爜 + ' 銆� 鐨勪緵搴斿晢浜ゆ湡鍥炲'
+ , value: data.渚涘簲鍟嗕氦鏈熷洖澶�
+ }, function (value, index) {
+ layer.close(index);
+ //鏇存柊渚涘簲鍟嗕氦鏈熷洖澶�
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Cg_Poorder/UpdateSupSendGoodsDateRemark",
+ async: false,
+ data: { "HInterID": data.hmainid, "HEntryID": data.hsubid, "HSupSendGoodsDateRemark": value},
+ success: function (result) {
+ if (result.code == 1) {
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ 渚涘簲鍟嗕氦鏈熷洖澶�: value
+ });
+ } else {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ },
+ error: function (result) {
+ layer.alert(result.Message, { icon: 5 });
+ }
+ });
+ });
+ }
+ });
+
+ 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('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
@@ -701,22 +841,36 @@
break;
case 'btn-generate':
var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
+ , data = checkStatus.data;
if (data.length == 0) {
layer.alert("璇烽�夋嫨鏁版嵁", { icon: 5 });
return;
- }
- if (data[0].瀹屾垚鐘舵�� == "宸插畬鎴�") {
- return layer.msg('璁㈠崟宸插畬鎴愶紒')
- }
+ }
ajaxLabelData = data;
//鏍规嵁閫変腑鐨勯噰璐鍗曪紝閲嶆柊浠庨噾铦朵簯鍚屾閲囪喘璁㈠崟鍏宠仈鏁伴噺杩囨潵銆傝�冭檻閲囪喘璁㈠崟鍒犻櫎鍜屽叧闂姸鎬侊紝鍚屾鐘舵��
var ids = "";
var entryids = "";
+ var HBillType = data[0].璁㈠崟绫诲瀷
+ var HSupNumber = data[0].渚涘簲鍟嗕唬鐮�
+ var HErr = "";
+ var HSupErr = "";
$.each(data, function (obj) {
ids += data[obj].hmainid + ",";
entryids += data[obj].hsubid + ",";
+ if (HBillType != data[obj].璁㈠崟绫诲瀷) {
+ HErr += data[obj].璁㈠崟绫诲瀷;
+ }
+ if (HSupNumber != data[obj].渚涘簲鍟嗕唬鐮�) {
+ HSupErr += data[obj].渚涘簲鍟嗕唬鐮�;
+ }
})
+ if (HErr != "") {
+ return layer.msg('閲囪喘璁㈠崟璁㈠崟绫诲瀷涓嶅悓锛屼笉鍏佽鍚堝苟涓嬫帹鐢熸垚閫佽揣鍗曪紒')
+ }
+ if (HSupErr != "") {
+ return layer.msg('渚涘簲鍟嗕笉鍚岋紝涓嶅厑璁稿悎骞朵笅鎺ㄧ敓鎴愰�佽揣鍗曪紒')
+ }
+
ids = ids.substring(0, ids.length - 1);
entryids = entryids.substring(0, entryids.length - 1);
var hasPrivileage = true;
@@ -754,8 +908,10 @@
if (!hasPrivileage) {
return;
}
+
var rows = '';
var HEntry = '';
+ var HOrderRows = '';
for (var i = 0; i < data.length; i++) {
if (data[i]["鐘舵��"] == "宸茬‘璁�") {
rows += data[i].hmainid.toString() + ',' + data[i].hsubid.toString() + ';';
@@ -763,10 +919,18 @@
else {
HEntry += (i + 1) + ',';
}
+
+ if (data[i].瀹屾垚鐘舵�� == "宸插畬鎴�") {
+ HOrderRows += (i + 1) + ',';
+ }
}
if (HEntry != '') {
HEntry = HEntry.substring(0, HEntry.length - 1);
layer.msg("绗�" + HEntry + "琛屾湭纭锛�", { icon: 5 });
+ }
+ else if (HOrderRows != '') {
+ HOrderRows = HOrderRows.substring(0, HOrderRows.length - 1);
+ layer.msg("绗�" + HOrderRows + "琛�,璁㈠崟宸插畬鎴愶紒", { icon: 5 });
}
else {
layer.open({
@@ -776,7 +940,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../views/SRM/SRM_POInStockBill_Edit.html?linterid=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString() + '&lSourceBillType=1102', 'yes']
+ , content: ['../../views/SRM/SRM_POInStockBill_Edit.html?linterid=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString() + '&lSourceBillType=1102' + '&type =add', 'yes']
, resize: false
,end: function () {
get_FastQuery(table, option)
@@ -887,9 +1051,23 @@
var ColName = [];
for (var i = 1; i < option.cols[0].length; i++) {
if (option.cols[0][i]["hide"] != true) {
- ColName.push(option.cols[0][i]["field"]);
+ ColName.push(option.cols[0][i]["field"]);
}
}
+ //鏇挎崲鎹㈣绗�
+ 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, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ if (itemobj === '瑙勬牸鍨嬪彿') {
+ item[itemobj] = item[itemobj].replace(/,/g, '锛�'); // 鏇挎崲鑻辨枃閫楀彿涓轰腑鏂囬�楀彿
+ }
+ }
+ });
//缁戝畾鏁版嵁
var data = excel.filterExportData(option.data, ColName)
@@ -906,8 +1084,47 @@
sheet1: data
}, '閲囪喘璁㈠崟鍒楄〃.xlsx', 'xlsx');
break;
+ case 'btn_backData':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ parent.GetPoorderValue(data);
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.close(index);
+ break;
};
});
+
+ //琛岀洃鍚簨浠�
+ table.on('row(mainTable)', function (obj) {
+ var flag = !obj.tr.find(':checkbox:first').prop('checked');
+ obj.tr.find(':checkbox').prop('checked', flag);
+ if (flag) {
+ obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked'); //璁剧疆澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//鏀瑰彉褰撳墠tr鑳屾櫙棰滆壊鍜屽瓧浣撻鑹�
+ } else {
+ obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//鍙栨秷澶嶉�夋閫変腑鏍峰紡
+ $(obj.tr.selector).attr({ "style": "background:" });//鍙栨秷褰撳墠tr棰滆壊
+ }
+ //mainTable 涓鸿〃鏍糏D 娉ㄦ剰姝ゅ濡傛灉ID涓嶆纭皢瀵艰嚧浣犲湪鐩戝惉澶嶉�夋鏃惰幏鍙栦笉鍒颁綘閫夋嫨鐨勬暟鎹紝鍓嶉潰鐨勫彧鏄坊鍔犳垨鍒犻櫎閫変腑鏈�変腑鏍峰紡浠ュ強璁剧疆鑳屾櫙鑹诧紝瀛椾綋棰滆壊
+ layui.each(table.cache.mainTable, function (i, l) {
+ if (obj.tr.index() == l.LAY_TABLE_INDEX) {
+ l.LAY_CHECKED = flag;
+ }
+ });
+ });
+
+ //灏唘rl鍙傛暟涓殑涓枃涔辩爜閲嶆柊杞崲鎴愪腑鏂�
+ function getParams(key) {
+ var reg = new RegExp("(^|&)" + key + "=([^&]*)(&|$)");
+ //濡傛灉鍦板潃鏍忎腑鍑虹幇涓枃鍒欒繘琛岀紪鐮�
+ var r = encodeURI(window.location.search).substr(1).match(reg);
+ if (r != null) {
+ //灏嗕腑鏂囩紪鐮佺殑瀛楃閲嶆柊鍙樻垚涓枃
+ return decodeURI(unescape(r[2]));
+ }
+ return null;
+ };
+
});
</script>
</body>
--
Gitblit v1.9.1