From 2f1e5bde1de562bcc0ee334714b7799d1eec0ea8 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 02 一月 2024 13:45:34 +0800
Subject: [PATCH] 生成条码时修改计算有效期至逻辑，新增生产日期不可为空控制；条码列表改为动态加载，新增列设置按钮；退货单模块；送货单列表新增凯贝修改前备份文件；送货单编辑模块新增选源单功能；采购订单列表备份；excel导入生成送货单添加行合计；
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html | 210 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 160 insertions(+), 50 deletions(-)
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
index 019dd79..5f8f8a8 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
@@ -32,42 +32,53 @@
</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>
- <option value="鏈敓鎴愭潯鐮�">鏈敓鎴愭潯鐮�</option>
- </select>
- </div>
- </div>
- <div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
+ <div class="layui-input-block" style="width:150px;">
<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">
+ <label class="layui-form-label">閲囪喘璁㈠崟鍙�</label>
+ <div class="layui-input-block" style="width:150px;">
<input type="text" class="layui-input" name="HBillNoFrom" id="HBillNoFrom">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閫佽揣鍗曞彿</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HInnerBillNo" id="HInnerBillNo">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block" style="width:120px;">
+ <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="HNumber" id="HNumber">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block" style="width:120px;">
+ <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">
+ <select id="HClStatus" name="HClStatus" lay-filter="">
+ <option value="" selected="">鍏ㄩ儴</option>
+ <option value="鏈鏍�">鏈鏍�</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="HMaterNumber" id="HMaterNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </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>
@@ -75,21 +86,9 @@
</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="HMaterNumber" id="HMaterNumber">
- </div>
- </div>
- <div class="layui-inline">
<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">
- <label class="layui-form-label">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
<div class="layui-inline">
@@ -98,16 +97,28 @@
<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-inline" style="display:none">
+ <label class="layui-form-label">璁㈠崟鐘舵��</label>
<div class="layui-input-block">
- <select id="HClStatus" name="HClStatus" lay-filter="">
- <option value="">鍏ㄩ儴</option>
- <option value="瀹℃牳">瀹℃牳</option>
- <option value="瀹℃牳">鍙嶅鏍�</option>
- <option value="鏈叧闂�" selected="">鏈叧闂�</option>
- <option value="宸插叧闂�">宸插叧闂�</option>
+ <select name="HStatus" id="HStatus" lay-filter="">
+ <option value="" selected="">鍏ㄩ儴</option>
+ <option value="鏈墦鍗�">鏈墦鍗�</option>
+ <option value="鏈埌璐�">鏈埌璐�</option>
+ <option value="宸插埌璐�">宸插埌璐�</option>
+ <option value="鏈敓鎴愭潯鐮�">鏈敓鎴愭潯鐮�</option>
</select>
+ </div>
+ </div>
+ <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="HInnerBillNo" id="HInnerBillNo">
+ </div>
+ </div>
+ <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="HNumber" id="HNumber">
</div>
</div>
</div>
@@ -213,6 +224,8 @@
});
var option = [];
var HModName = "SRM_POInStockBillList";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID", "HParentID", "hmainid","hsubid","F_xbkf_Combo","FSHDD","HPrintId"];
//#region 杩涘叆椤甸潰鏃㈠姞杞�
set_ClearBill();
//#region 姝ら〉闈㈡墍鏈夋柟娉�
@@ -315,7 +328,7 @@
success: function (data1) {
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID", "HParentID", "hmainid", "hsubid", "F_xbkf_Combo", "FSHDD", "HPrintId"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
@@ -389,19 +402,87 @@
///鍔犺浇鏄剧ず鏁版嵁
function get_Display(sqlWhere) {
var wait = layer.load();//閬僵
+ //$.ajax({
+ // type: "POST",
+ // url: GetWEBURL() + "GetPOInStockBill",
+ // async: false,
+ // data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
+ // success: function (result) {
+ // if (result.Message == "鑾峰彇鎴愬姛") {
+ // option.data = result.data;
+ // table.render(option);
+ // layer.close(wait);
+ // } else {
+ // layer.close(wait);
+ // layer.alert(result.Message, { icon: 5 });
+ // }
+ // },
+ // error: function (result) {
+ // layer.close(wait);
+ // layer.alert(result.Message, { icon: 5 });
+ // }
+ //});
+
$.ajax({
type: "POST",
url: GetWEBURL() + "GetPOInStockBill",
- async: false,
+ async: true,
data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
- success: function (result) {
- if (result.Message == "鑾峰彇鎴愬姛") {
- option.data = result.data;
+ success: function (data1) {
+ if (data1.Message == "鑾峰彇鎴愬姛") {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if (data[i].name.indexOf('id') > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ 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 == '鏈彂璐ф暟閲�') {
+ 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 });
+ }
+ }
+ }
+ }
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , totalRow: true
+ , page: true
+ , cellMinWidth: 90
+ , limit: 500
+ , limits: [50, 500, 5000, 20000]
+ }
table.render(option);
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
layer.close(wait);
} else {
layer.close(wait);
- layer.alert(result.Message, { icon: 5 });
+ layer.alert(data1.Message, { icon: 5 });
}
},
error: function (result) {
@@ -443,6 +524,12 @@
sqlWhere += " and 瑙勬牸鍨嬪彿 like ^^%" + $("#HModel").val() + "%^^";
if ($("#HClStatus").val() != "")
sqlWhere += " and 鍗曟嵁鐘舵�� like ^^%" + $("#HClStatus").val() + "%^^";
+ if ($("#HDate1").val() != "") {
+ sqlWhere += " and 鏃ユ湡 >= ^^" + $("#HDate1").val() + "^^";
+ }
+ if ($("#HDate2").val() != "") {
+ sqlWhere += " and 鏃ユ湡 <= ^^" + $("#HDate2").val() + "^^";
+ }
sql = sqlWhere;
_cur_page = 1;
get_Display(sqlWhere);
@@ -587,8 +674,12 @@
case 'btn-print':
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (data.length == 0) {
- layer.msg("璇烽�夋嫨鏁版嵁", { icon: 5 });
+ if (data.length != 1) {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�", { icon: 5 });
+ return;
+ }
+ if (data[0].鍗曟嵁鐘舵�� != '宸插鏍�') {
+ layer.msg("璇峰鏍搁�佽揣鍗曞悗鍦ㄨ繘琛屾墦鍗�( 麓鈼旓笌 鈥糕棓锔巂)", { icon: 5 });
return;
}
//for (var i = 0; i < data.length; i++) {
@@ -642,6 +733,25 @@
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;
+ }
+ });
+ });
});
</script>
</body>
--
Gitblit v1.9.1