From 301c9ba4bfa1af5547d723c2fbdbfb35071dab3b Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期四, 26 九月 2024 21:09:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/zymesSrmLayUi
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html | 278 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 218 insertions(+), 60 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 6b25207..c8aaf66 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,59 @@
</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">
+ <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="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
@@ -75,21 +92,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 +103,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>
@@ -121,12 +138,13 @@
<div class="layui-btn-container">
<!--<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" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="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-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-changebg"><i class="layui-icon layui-icon-form"></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-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>
@@ -213,6 +231,8 @@
});
var option = [];
var HModName = "SRM_POInStockBillList";
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = ["HItemID", "HParentID", "hmainid","hsubid","F_xbkf_Combo","FSHDD","HPrintId"];
//#region 杩涘叆椤甸潰鏃㈠姞杞�
set_ClearBill();
//#region 姝ら〉闈㈡墍鏈夋柟娉�
@@ -226,7 +246,7 @@
}
function set_InitGrid() {
var columns = [
- { checkbox: true/*, fixed: true*/ }
+ { checkbox: true, fixed: 'left', totalRowText: '鍚堣'/*, fixed: true*/ }
, { field: 'sorderid', title: '搴忓彿', width: 80/*, fixed: true*/ }
, { field: 'hmainid', title: 'hmainid', sort: true/*, fixed: true*/, hide: true }
, { field: 'hsubid', title: 'hsubid', sort: true/*, fixed: true*/, hide: true }
@@ -244,10 +264,10 @@
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120, sort: true }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120, sort: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 80, sort: true }
- , { field: '鏁伴噺', title: '璁㈣揣鏁伴噺', width: 100, sort: true }
- , { field: '鏈敓鎴愭潯鐮佹暟閲�', title: '鏈敓鎴愭潯鐮佹暟閲�', width: 100, sort: true }
- , { field: '鍚堟牸鏁伴噺', title: '鍚堟牸鏁伴噺', width: 100, sort: true }
- , { field: '涓嶅悎鏍兼暟閲�', title: '涓嶅悎鏍兼暟閲�', width: 100, sort: true }
+ , { field: '鏁伴噺', title: '璁㈣揣鏁伴噺', width: 100, sort: true, totalRow: true }
+ , { field: '鏈敓鎴愭潯鐮佹暟閲�', title: '鏈敓鎴愭潯鐮佹暟閲�', width: 100, sort: true, totalRow: true }
+ , { field: '鍚堟牸鏁伴噺', title: '鍚堟牸鏁伴噺', width: 100, sort: true, totalRow: true }
+ , { field: '涓嶅悎鏍兼暟閲�', title: '涓嶅悎鏍兼暟閲�', width: 100, sort: true, totalRow: true }
, { field: '鍚◣鍗曚环', title: '鍚◣鍗曚环', width: 100, sort: true, hide: true }
, { field: '閲戦', title: '閲戦', width: 100, sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 150, sort: true }
@@ -315,7 +335,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 +409,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) {
@@ -433,6 +521,8 @@
sqlWhere += " and 閫佽揣鍗曞彿 like ^^%" + $("#HInnerBillNo").val() + "%^^";
if ($("#HOldMaterNumber").val() != "")
sqlWhere += " and 鏃х墿鏂欑紪鐮� like ^^%" + $("#HOldMaterNumber").val() + "%^^";
+ if ($("#HSupName").val() != "")
+ sqlWhere += " and 渚涘簲鍟� like ^^%" + $("#HSupName").val() + "%^^";
if ($("#HMaterNumber").val() != "")
sqlWhere += " and 鐗╂枡缂栫爜 like ^^%" + $("#HMaterNumber").val() + "%^^";
if ($("#HNumber").val() != "")
@@ -443,6 +533,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);
@@ -472,11 +568,13 @@
InterID += data[i].hmainid.toString() + ",";
}
InterID = InterID.substring(0, InterID.length - 1);
+
+ var HBillNo = data[0].鍗曟嵁鍙�;
//閫昏緫瀹℃牳鏂规硶
$.ajax({
type: "GET",
url: GetWEBURL() + "/AuditPOInStockBill",
- data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"], "HBillNo": "" },
+ data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"], "HBillNo": HBillNo },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
@@ -485,7 +583,7 @@
//鍏抽棴褰撳墠frame
layer.close(index);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- get_Display(sqlWhere);
+ get_Display(sql);
});
} else {
@@ -502,7 +600,7 @@
//鑷畾涔夊ご宸ュ叿鏍忓彸渚у浘鏍� - 鎻愮ず
case 'btn-reload':
_cur_page = $(".layui-laypage-em").next().html();
- RoadHBillNo(sql);
+ get_Display(sql);
// });
break;
case 'btn-HideColumn':
@@ -585,8 +683,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++) {
@@ -597,7 +699,7 @@
//}
layer.open({
type: 2
- , area: ['50%', '50%']
+ , area: ['80%', '80%']
, title: '鎵撳嵃妯＄増閫夋嫨'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -609,6 +711,9 @@
//}
})
+ break;
+ case 'btn-print-Convenient':
+ convenientPrint();
break;
case 'btn-generate':
var checkStatus = table.checkStatus('mainTable')
@@ -640,6 +745,59 @@
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;
+ }
+ });
+ });
+
+ //涓�閿墦鍗�
+ function convenientPrint() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (data.length != 1) {
+ layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�", { icon: 5 });
+ return;
+ }
+ if (data[0].鍗曟嵁鐘舵�� != '宸插鏍�') {
+ layer.msg("璇峰鏍搁�佽揣鍗曞悗鍦ㄨ繘琛屾墦鍗�( 麓鈼旓笌 鈥糕棓锔巂)", { icon: 5 });
+ return;
+ }
+
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
+ async: true,
+ data: { "HNumber": 'SRM_POInStockBillList' },
+ //data: { "Value": Value },
+ success: function (result) {
+ if (result.count == 1) {
+ var OpenTmp = result.data[0].妯℃澘鍚嶇О
+ window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + data[0].hmainid.toString() + "&Type=SRM_POInStockBillList" + "&OpenTmp=" + OpenTmp.toString());
+ } else {
+ layer.msg(result.Message);
+ }
+ },
+ error: function (result) {
+ console.log(result);
+ }
+ });
+ }
+
});
</script>
</body>
--
Gitblit v1.9.1