From 93dca0da863ede36d5d1ccf1ed01f516ed6339fd Mon Sep 17 00:00:00 2001
From: black-goat-me <226547893@qq.com>
Date: 星期四, 25 五月 2023 12:48:35 +0800
Subject: [PATCH] 明细报表时间组件异常问题解决
---
WebTM/views/车间管理/报表分析/Kf_MaterOutEntryReport_Cloth.html | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html"
index f9f62bf..62757c6 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Kf_MaterOutEntryReport_Cloth.html"
@@ -250,8 +250,11 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- var HBeginDate = $("#HBeginDate").val() + ":00:00" ;//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
- var HEndDate = $("#HEndDate").val()+":00:00";//缁撴潫鏃ユ湡
+ var HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ var HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
+
+ //var HBeginDate = $("#HBeginDate").val() + ":00:00" ;//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ //var HEndDate = $("#HEndDate").val()+":00:00";//缁撴潫鏃ユ湡
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
var HBillNo = $("#HBillNo").val(); //鍗曟嵁鍙�
var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
@@ -473,9 +476,19 @@
//蹇�熻繃婊�
function get_FastQuery() {
- var HBeginDate = $("#HBeginDate").val() + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
- var HEndDate = $("#HEndDate").val() + ":00:00";//缁撴潫鏃ユ湡
-
+ var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+
+ if (HBeginDate == '') {
+ HBeginDate = Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ } else {
+ HBeginDate = $("#HBeginDate").val() + ":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
+ }
+ if (HEndDate == '') {
+ HEndDate = Format(new Date(new Date()).setHours(8, 0, 0, 0), "yyyy-MM-dd hh") + ":00:00";//缁撴潫鏃ユ湡
+ } else {
+ HEndDate = $("#HEndDate").val() + ":00:00";//缁撴潫鏃ユ湡
+ }
//var HBeginDate = $("#HBeginDate").val()+":00:00";//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
//var HEndDate = $("#HEndDate").val()+":00:00";//缁撴潫鏃ユ湡
@@ -547,8 +560,8 @@
//闅愯棌鍒楄缃�
function get_HideColumn() {
- var colName = "";
- for (var i = 0; i < option.cols[0].length; i++) {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length; i++) {
colName += option.cols[0][i]["title"] + ",";
}
--
Gitblit v1.9.1