From 00a88abf340904065aa7882c7555fc7b65164f5e Mon Sep 17 00:00:00 2001
From: zhangrg <z18737863051@163.com>
Date: 星期二, 02 一月 2024 17:28:51 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/日计划报表/ReportWorkDemandPlanBillList.html | 88 +++++++++++++++++++++++++++++---------------
1 files changed, 58 insertions(+), 30 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/ReportWorkDemandPlanBillList.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/ReportWorkDemandPlanBillList.html"
index 431f4cc..43fc5e6 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/ReportWorkDemandPlanBillList.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/ReportWorkDemandPlanBillList.html"
@@ -11,7 +11,7 @@
<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/soulTable.slim.js"></script>
</head>
<body>
<div class="layui-fluid">
@@ -90,7 +90,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -103,6 +103,7 @@
, util = layui.util
, tree = layui.tree
, util = layui.util
+ , soulTable = layui.soulTable
var sWhere = "";
var option = [];
//#endregion
@@ -147,12 +148,11 @@
//#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"));
+ $("#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"));//鑷�
//鐢熶骇缁勭粐鍔犺浇
Organ();
- //鍒濆鍖栬〃鏍�
- set_InitGrid();
+
//蹇�熻繃婊�
get_FastQuery(1);
}
@@ -161,29 +161,49 @@
//#region 鍒濆鍖栬〃鏍兼柟娉�
function set_InitGrid() {
var columns = [];
- var myDate = new Date();
- var yyyy = myDate.getFullYear();
- var MM = myDate.getMonth() + 1;
- var dd = myDate.getDate();
- var SumMonth = 31; //鍔ㄦ�佷袱鏈堜箣宸� new Date(yyyy, MM, 0).getDate()
- var MonthCount = new Date(yyyy, MM-1, 0).getDate();
- columns.push({ type: 'checkbox', fixed: 'left' });
- columns.push({ field: '缁勭粐', title: '鐢熶骇缁勭粐' });
- columns.push({ field: '閮ㄩ棬', title: '鐢熶骇杞﹂棿' });
- columns.push({ field: 'FSUMQTY', title: '鍚堣' });
- columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' });
- columns.push({ field: '瑙勬牸鍨嬪彿', title: '鐗╂枡瑙勬牸' });
- columns.push({ field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�' });
- columns.push({ field: 'HSeOrderBillNo', title: '闇�姹傚崟鍙�' });
- columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜' });
- columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅' });
- columns.push({ field: 'TQSUM', title: '瑕佹枡鎷栨湡鏁伴噺' });
- for (var i = 1; i <= (MonthCount - dd); i++) {
- columns.push({ field: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i), 'yyyy-MM-dd'), title: Format(yyyy + '/' + (MM - 1) + '/' + (dd + i), 'MM.dd'), width: 70 })//0
- }
- for (var i = 1; i <= (SumMonth - MonthCount + dd); i++) {
- columns.push({ field: Format(yyyy + '/' + MM + '/' + i, 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + i, 'MM.dd'), width: 70 })//0
+ columns.push({ type: 'checkbox', fixed: 'left', sort: true});
+ columns.push({ field: '缁勭粐', title: '鐢熶骇缁勭粐', sort: true});
+ columns.push({ field: '閮ㄩ棬', title: '鐢熶骇杞﹂棿', sort: true});
+ columns.push({ field: 'FSUMQTY', title: '鍚堣', sort: true});
+ columns.push({ field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', sort: true});
+ columns.push({ field: '瑙勬牸鍨嬪彿', title: '鐗╂枡瑙勬牸', sort: true});
+ columns.push({ field: 'HICMOBillNo', title: '鐢熶骇璁㈠崟鍙�', sort: true});
+ columns.push({ field: 'HSeOrderBillNo', title: '闇�姹傚崟鍙�', sort: true});
+ columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡缂栫爜', sort: true});
+ columns.push({ field: '璁￠噺鍗曚綅鍚嶇О', title: '璁￠噺鍗曚綅', sort: true});
+ columns.push({ field: 'TQSUM', title: '瑕佹枡鎷栨湡鏁伴噺', sort: true});
+ //鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
+ var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//寮�濮嬫椂闂�
+ 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 MM = new Date($("#HBEGINDATE").val()).getMonth() + 1;
+ //鑾峰彇寮�濮嬫湀浠界殑鏈�澶уぉ鏁�
+ var SumMonth = new Date(yyyy, MM, 0).getDate(); //鍔ㄦ�佷袱鏈堜箣宸�
+ //鑾峰彇寮�濮嬫棩鏈熺殑澶╂暟
+ var HBEGINDATE = new Date(new Date($("#HBEGINDATE").val())).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 })
+ //璺ㄥ勾鐨勮瘽 浼氫粠涓�鏈堜竴鍙峰紑濮�
+ if (MM == 12 && (HBEGINDATE + j) == 31) {
+ yyyy += 1;
+ MM = 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ HBEGINDATE = 0;
+ k += j;
+ j = 0;
+ } else if ((HBEGINDATE + j) == SumMonth) { //璺ㄦ湀 鏈堟暟鍔犱竴 澶╂暟浠庝竴寮�濮�
+ HBEGINDATE = 0;
+ MM += 1;
+ SumMonth = new Date(yyyy, MM, 0).getDate();
+ k += j;
+ j = 0;
+ }
}
columns.push({ field: '', title: '璁″垝鏄庣粏_鍚堣' });
@@ -197,6 +217,9 @@
, limits: [50, 500, 5000, 20000]
, loading: false
, cols: [columns]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
};
}
//#endregion
@@ -262,6 +285,9 @@
var HENDDATE = $("#HENDDATE").val();//鑷�
var HMATERIALID = $("#HMATERIALID").val();//鐗╂枡/浜у搧
var HDeptID = $("#HDeptID").val();//鐢熶骇杞﹂棿
+ if (HBEGINDATE > HENDDATE) {
+ return layer.msg("寮�濮嬫棩鏈熶笉鑳藉皬浜庣粨鏉熸棩鏈�!");
+ }
sWhere = {
HORGID: HORGID
@@ -270,6 +296,8 @@
, HMATERIALID: HMATERIALID
, HDeptID: HDeptID
}
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
get_Display(JSON.stringify(sWhere));
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -278,8 +306,8 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
$("#HORGID").val(sessionStorage["OrganizationID"]);//缁勭粐
- $("#HBEGINDATE").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//鎻愭枡鏃ユ湡
- $("#HENDDATE").val(Format(new Date(), "yyyy-MM-dd"));//鑷�
+ $("#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"));//鑷�
$("#HMATERIALID").val("");//鐗╂枡/浜у搧
$("#HMATERIALNAME").val("");
$("#HDeptID").val("");//鐢熶骇杞﹂棿
--
Gitblit v1.9.1