From 94853e46b9d4911fb4cf00389f00a4b820db5d3c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 21 五月 2025 14:35:46 +0800
Subject: [PATCH] fix: 修正 系统上机日志查询 没有显示默认方案的问题
---
WebTM/views/仓存管理/条码报表/Kf_StockInOutSumQueryReport.html | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 100 insertions(+), 9 deletions(-)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_StockInOutSumQueryReport.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_StockInOutSumQueryReport.html"
index 6ca4f65..c5b62aa 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_StockInOutSumQueryReport.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\346\212\245\350\241\250/Kf_StockInOutSumQueryReport.html"
@@ -76,6 +76,12 @@
<input type="text" class="layui-input" name="HWHName" id="HWHName" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡ID</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HMaterID" id="HMaterID" style="width:190px;">
+ </div>
+ </div>
</div>
</div>
</div>
@@ -104,7 +110,7 @@
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
-
+
//#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -119,26 +125,60 @@
var option = [];
var ins; //鐢ㄤ簬瀵煎嚭excel
var columns = "";
- var HModName = "Kf_MaterOutInReport";
+ var HModName = "Kf_StockInOutSumQueryReport";
var titleData = []; //涓嶉渶瑕佹樉绀虹殑瀛楁
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1鏌ヨ
+ var HMaterID = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鐗╂枡id
+ if (HMaterID != null) {
+ $("#HMaterID").val(HMaterID);
+ //鑾峰彇寮�濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30 * 6), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ } else {
+ //鑾峰彇寮�濮嬫棩鏈熴�佺粨鏉熸棩鏈�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ }
+
//鍒濆鍖栫晫闈�
set_ClearBill();
+ //#region 鐐瑰嚮琛岄�変腑楂樹寒
+ 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;
+ }
+ });
+ })
+ //#endregion
+
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
- //鑾峰彇寮�濮嬫棩鏈熴�佺粨鏉熸棩鏈�
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
//鑾峰彇缁勭粐
Organ();
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ get_Display();
}
//#endregion
@@ -330,12 +370,13 @@
function get_Display() {
var HBeginDate = $("#HBeginDate").val(); //寮�濮嬫棩鏈�
var HEndDate = $("#HEndDate").val(); //缁撴潫鏃ユ湡
+ var HMaterID = $("#HMaterID").val(); //鐗╂枡ID
var HMaterNumber = $("#HMaterNumber").val(); //鐗╂枡缂栫爜
var HMaterName = $("#HMaterName").val(); //鐗╂枡鍚嶇О
var HWHName = $("#HWHName").val(); //浠撳簱
var HModel = $("#HModel").val(); //瑙勬牸鍨嬪彿
- sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HMaterNumber + "','" + HMaterName + "','" + HModel + "','" + HWHName + "'" ;
+ sWhere = "'" + HBeginDate + "','" + HEndDate + "','" + HMaterID + "','" + HMaterNumber + "','" + HMaterName + "','" + HModel + "','" + HWHName + "'" ;
var ajaxLoad = layer.load();
$.ajax({
@@ -344,7 +385,7 @@
async: false, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "sWhere": sWhere },
success: function (data1) {
- if (data1.count == 1) {
+ if (data1.data != null) {
var data = [];
var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
@@ -401,8 +442,57 @@
DisPlay_HideColumn();
layer.close(ajaxLoad);
} else {
+ 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 });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, titleData) > -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 == '鏁伴噺') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
+ }
+ }
+ }
+ }
+ columns = col;
+
+ //璁剧疆璧嬪�煎垪瀹�
+ var colWidth = getColumnsWidth();
+ if (colWidth == "" || colWidth == []) {
+
+ }
+ else {
+ $.each(columns, function (x, m) {
+ m["width"] = colWidth[x];
+ });
+ }
+ option.cols = [columns];
+ option.data = [[]];
+ option.totalRow = true;
+ table.render(option);
layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
+ /*layer.alert(data1.code + data1.Message, { icon: 5 });*/
}
},
error: function () {
@@ -424,6 +514,7 @@
function set_ClearQuery() {
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
+ $("#HMaterID").val(""); //鐗╂枡ID
$("#HMaterNumber").val(""); //鐗╂枡缂栫爜
$("#HMaterName").val(""); //鐗╂枡鍚嶇О
$("#HModel").val(""); //瑙勬牸鍨嬪彿
--
Gitblit v1.9.1