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/生产管理/日计划报表/ReportPODemandPlanBillList_S.html | 152 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 123 insertions(+), 29 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
index 92eb6d4..9b18112 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/ReportPODemandPlanBillList_S.html"
@@ -5,12 +5,15 @@
<title>鎻愭枡璁″垝鎶ヨ〃</title>
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/ext/soulTable.css" media="all">
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/SetColumn.js"></script>
+ <!--<script src="../../../layuiadmin/soulTable.slim.js"></script>--><!--鏍囬绛涢�変笉鑳藉紩鐢ㄦjs鏂囦欢-->
</head>
<body>
<div class="layui-fluid">
@@ -47,6 +50,8 @@
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnExport" id="btnExport">瀵煎嚭</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="bthHideColumn" id="bthHideColumn">鍒楄缃�</button>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<div class="layui-inline">
@@ -103,7 +108,8 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+ soulTable: '../ext/soulTable',
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable','flow'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -116,8 +122,12 @@
, util = layui.util
, tree = layui.tree
, util = layui.util
+ , soulTable = layui.soulTable
+ , flow = layui.flow
var sWhere = " where 1=1 ";
var option = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ var HModName = "ReportPODemandPlanBillList_S";
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -153,6 +163,18 @@
});
//#endregion
+ //#region 瀵煎嚭鎸夐挳
+ form.on('submit(btnExport)', function (data) {
+ getExportData();
+ });
+ //#endregion
+
+ //#region 鍒楄缃寜閽�
+ form.on('submit(bthHideColumn)', function (data) {
+ get_HideColumnNoPageForPlan(HModName, option, get_FastQuery);
+ });
+ //#endregion
+
//#endregion
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -160,13 +182,16 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栨棩鏈�
- $("#HBEGINDATE").val(Format(new Date(new Date()), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
- $("#HENDDATE").val(Format(new Date($("#HBEGINDATE").val()).setDate(new Date($("#HBEGINDATE").val()).getDate() + 30), "yyyy-MM-dd"));//鑷�
+ $("#HBEGINDATE").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 25), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
+ var HEndDate = Format(new Date().setDate(new Date().getDate() + 25), "yyyy-MM-dd");
+ $("#HENDDATE").val(HEndDate);//鑷�
//鐢熶骇缁勭粐鍔犺浇
Organ();
//蹇�熻繃婊�
get_FastQuery(1);
+
+ ColFilter();
}
//#endregion
@@ -174,36 +199,39 @@
function set_InitGrid() {
var columns = [];
- columns.push({ type: 'checkbox', fixed: 'left' });
- columns.push({ field: '缁勭粐', title: '閲囪喘缁勭粐' });
- columns.push({ field: 'FMATERIALNAME', title: '鐗╂枡鍚嶇О' });
- columns.push({ field: 'FSPECIFICATION', title: '鐗╂枡瑙勬牸' });
- columns.push({ field: 'FNAME', title: '渚涘簲鍟�' });
- columns.push({ field: 'FSUMQTY', title: '鍚堣' });
- columns.push({ field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�' });
- columns.push({ field: 'HSeOrderBillNo', title: '闇�姹傚崟鍙�' });
+ columns.push({ type: 'checkbox', fixed: 'left', sort: true});
+ columns.push({ field: '缁勭粐', title: '閲囪喘缁勭粐', sort: true, filter: true });
+ columns.push({ field: 'FMATERIALNAME', title: '鐗╂枡鍚嶇О', sort: true, filter: true });
+ columns.push({ field: 'FSPECIFICATION', title: '鐗╂枡瑙勬牸', sort: true, filter: true });
+ columns.push({ field: 'FNAME', title: '渚涘簲鍟�', sort: true, filter: true });
+ columns.push({ field: 'FSUMQTY', title: '鍚堣', sort: true, hide: true, filter: true });
+ columns.push({ field: 'HPOOrderBillNo', title: '閲囪喘璁㈠崟鍙�', sort: true, hide: true, filter: true });
+ columns.push({ field: 'HSeOrderBillNo', title: '闇�姹傚崟鍙�', sort: true, hide: true, filter: true });
//columns.push({ field: 'HPOOrderBillRemark', title: '鎽樿' });
//columns.push({ field: 'HPOOrderBillNote', title: '澶囨敞' });
//columns.push({ field: '閲囪喘鍛�', title: '閲囪喘鍛�' });
- columns.push({ field: 'FNUMBER', title: '鐗╂枡缂栫爜' });
- columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅' });
- columns.push({ field: 'TQSUM', title: '鎻愭枡鎷栨湡鏁伴噺' });
+ columns.push({ field: 'FNUMBER', title: '鐗╂枡缂栫爜', sort: true, filter: true });
+ columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅', sort: true, filter: true });
+ columns.push({ field: 'TQSUM', title: '鎻愭枡鎷栨湡鏁伴噺', sort: true, totalRow: true, filter: true });
+ columns.push({ field: 'TQSUM', title: '鎻愭枡鎷栨湡鏁伴噺', sort: true, totalRow: true, filter: true });
+ columns.push({ field: '閫炬湡鎻愭枡鎬诲拰', title: '閫炬湡鎻愭枡鎬诲拰', sort: true, totalRow: true, filter: true });
+ columns.push({ field: '鎻愭枡鎬诲拰', title: '鎻愭枡鎬诲拰', sort: true, totalRow: true, filter: true });
//鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
- var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//寮�濮嬫椂闂�
+ var time1 = Date.parse(new Date());//寮�濮嬫椂闂�
var time2 = Date.parse(new Date($("#HENDDATE").val()));//缁撴潫鏃堕棿
var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24));
//鑾峰彇骞�
- var yyyy = new Date($("#HBEGINDATE").val()).getFullYear();
+ var yyyy = new Date().getFullYear();
//鑾峰彇鏈堜唤
- var MM = new Date($("#HBEGINDATE").val()).getMonth() + 1;
+ var MM = new Date().getMonth() + 1;
//鑾峰彇寮�濮嬫湀浠界殑鏈�澶уぉ鏁�
var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸�
//鑾峰彇寮�濮嬫棩鏈熺殑澶╂暟
- var HBEGINDATE = new Date(new Date($("#HBEGINDATE").val())).getDate(); //鑾峰彇寮�濮嬫棩鏈熷ぉ鏁�
+ var HBEGINDATE = new Date(new Date()).getDate(); //鑾峰彇寮�濮嬫棩鏈熷ぉ鏁�
var k = 0;//鏀堕泦寰幆娆℃暟
for (var j = 0; j <= (Days - k); j++) {
- columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70 })
+ columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true, filter: true })
//璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮�
if (MM == 12 && (HBEGINDATE + j) == 31) {
yyyy += 1;
@@ -220,18 +248,40 @@
j = 0;
}
}
- columns.push({ field: '', title: '鎻愭枡璁″垝鍚堣' });
+ columns.push({
+ field: '鎻愭枡璁″垝鍚堣', title: '鎻愭枡璁″垝鍚堣', filter: true, templet: function (d) {
+ //console.log(d); // 寰楀埌褰撳墠琛屾暟鎹�
+ //console.log(this); // 寰楀埌琛ㄥご褰撳墠鍒楅厤缃」
+ //console.log(d.LAY_NUM);
+ let sum = 0;
+
+ // 閬嶅巻鏁版嵁瀵硅薄鐨勬墍鏈夊睘鎬�
+ for (let key in d) {
+ // 妫�鏌ュ垪鍚嶆槸鍚︾鍚� isValidDate 鏉′欢
+ if (isValidDate(key)) {
+ // 灏� null/undefined 杞负 0
+ sum += d[key] ? parseFloat(d[key]) : 0;
+ }
+ }
+
+ return sum; // 淇濈暀涓や綅灏忔暟
+ }
+ });
option = {
elem: '#mainTable'
- , toolbar: '#toolbarDemo'
+ //, toolbar: '#toolbarDemo'
, height: 'full-50'
, page: true
, cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
+ , limit: 1000
+ , limits: [50, 500,1000, 5000, 20000]
+ , totalRow: true
, loading: false
, cols: [columns]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
};
}
//#endregion
@@ -266,9 +316,12 @@
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"], HBEGINDATE: $("#HBEGINDATE").val(), HENDDATE: $("#HENDDATE").val() },
success: function (result) {
- if (result.count == 1) {
+ if (result.count == 1) {
+
option.data = result.data;
- table.render(option);
+ //鍒楄缃�
+ DisPlay_HideColumnForPlan(HModName, sessionStorage["HUserName"], option);
+ ins = table.render(option);
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
@@ -282,6 +335,23 @@
});
}
+ //#endregion
+
+ //#region 鑾峰彇瀵煎嚭鏁版嵁
+ function getExportData() {
+ data = option.data;
+ 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().replace(/[\r\n]+/g, ''); // 灏嗘崲琛岀鏇挎崲涓虹┖瀛楃涓�
+ }
+ }
+ });
+ table.exportFile(ins.config.id, data, "xls");
+ }
//#endregion
//#region 蹇�熻繃婊�
@@ -354,7 +424,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐗╂枡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Material.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -364,7 +434,7 @@
}
//鑾峰彇鏁版嵁
$("#HMATERIALID").val(checkStatus.data[0].HItemID);
- $("#HMATERIALNAME").val(checkStatus.data[0].HName);
+ $("#HMATERIALNAME").val(checkStatus.data[0].鐗╂枡鍚嶇О);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -379,7 +449,7 @@
, area: ['90%', '90%']//澶у皬
, title: '渚涘簲鍟嗗垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -389,16 +459,40 @@
}
//鑾峰彇鏁版嵁
$("#HSUPPLIERID").val(checkStatus.data[0].HItemID);
- $("#HSUPPLIERNAME").val(checkStatus.data[0].HName);
+ $("#HSUPPLIERNAME").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
})
}
+ //鍒楁槑鏄剧ず涓嬫媺妗�
+ function ColFilter() {
+ var Organization = '<option value="0" selected="selected" ></option>';
+ for (var i = 1; i < option.cols[0].length; i++) {
+ if (option.cols[0][i].hide != true) {
+ Organization += '<option style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
+ }
+ }
+ $("#ColName").empty();
+ $("#ColName").append(Organization);
+ $("#ColName1").empty();
+ $("#ColName1").append(Organization);
+ $("#ColName2").empty();
+ $("#ColName2").append(Organization);
+ form.render('select');
+ }
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
+ function GetHSupNameValue(obj) {
+ $("#HSUPPLIERID").val(obj[0].HItemID);
+ $("#HSUPPLIERNAME").val(obj[0].渚涘簲鍟嗗悕绉�);
+ }
+ function GetGyMaterial(obj) {
+ $("#HMATERIALID").val(obj.HItemID);
+ $("#HMATERIALNAME").val(obj.鐗╂枡鍚嶇О);
+ }
</script>
\ No newline at end of file
--
Gitblit v1.9.1