From 474e195d85c5123e965fe4e49437937d3f8a89ec Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 19 十一月 2024 11:12:58 +0800
Subject: [PATCH] 出库条码明细报表：增加日期过滤
---
WebTM/views/应收管理/报表分析/Xs_SellOutCompareToProductReport.html | 144 ++++++++++++++++-------------------------------
1 files changed, 50 insertions(+), 94 deletions(-)
diff --git "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_SellOutCompareToProductReport.html" "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_SellOutCompareToProductReport.html"
index 492ccaf..026681c 100644
--- "a/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_SellOutCompareToProductReport.html"
+++ "b/WebTM/views/\345\272\224\346\224\266\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Xs_SellOutCompareToProductReport.html"
@@ -33,28 +33,22 @@
<span>鏇村</span>
</div>
</div>
- <!--<div class="layui-form layui-inline" style="position:relative;top:10px;">
- <label class="layui-form-label">鏃ユ湡</label>
- <div class="layui-form-item layui-inline">
- <div class="layui-inline">
- <div class="layui-input-inline">
- <input type="text" class="layui-input" id="HBeginDate" style="width:190px;" placeholder="yyyy-MM-dd HH:mm">
- </div>
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" style="width:190px;">
</div>
- <div class="layui-form-item layui-inline">
- <div class="layui-inline">
- <label class="layui-form-label">-</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" id="HEndDate" style="width:190px;" placeholder="yyyy-MM-dd HH:mm">
- </div>
- </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HEndDate" style="width:190px;">
</div>
- </div>-->
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鐢熶骇鍗曞彿</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" value=" " id="HBillNo">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBillNo" value="" id="HBillNo">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -145,32 +139,32 @@
</div>
<!--<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">杩囨护</label>
+ <div class="layui-input-block">
+ <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
+ <option value="0" selected="selected"></option>
+ <option value="=">=</option>
+ <option value=">=">>=</option>
+ <option value=">">></option>
+ <option value="<="><=</option>
+ <option value="<"><</option>
+ <option value="<>"><></option>
+ <option value="7">鍖呭惈</option>
+ <option value="8">宸﹀寘鍚�</option>
+ <option value="9">鍙冲寘鍚�</option>
+ <option value="10">涓嶅寘鍚�</option>
+ </select>
+ </div>
+ <div class="layui-inline">
+ <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
+ </div>
+ </div>-->
</div>
</div>
</div>
@@ -313,21 +307,9 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
- ////鍒濆鍖栨椂闂�
- //laydate.render({
- // elem: '#HBeginDate',
- // type: 'datetime',
- // fullPanel: true
- // , format: 'yyyy-MM-dd HH:mm'
- // , value: HBeginDate_u
- //});
- //laydate.render({
- // elem: '#HEndDate',
- // type: 'datetime',
- // fullPanel: true
- // , format: 'yyyy-MM-dd HH:mm'
- // , value: HEndDate_u
- //});
+ //鏍规嵁鏃ユ湡闂撮殧璁剧疆寮�濮嬫椂闂翠笌缁撴潫鏃堕棿
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery();
@@ -443,31 +425,19 @@
//蹇�熻繃婊�
function get_FastQuery() {
- //var HBeginDate = $("#HBeginDate").val();//涓嬭揪鏃ユ湡 寮�濮嬫棩鏈�
- //var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HBillNo = $("#HBillNo").val(); //鐢熶骇鍗曞彿
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
var HProductName = $("#HProductName").val();//浜у搧鍚嶇О
var HProductModel = $("#HProductModel").val();//浜у搧瑙勬牸
- //if (HBeginDate != "" && HEndDate != "") {
- // sWhere += " and 鏃ユ湡 between ''" + HBeginDate + "'' and ''" + HEndDate + "'' ";
- //} else {
- // sWhere += " and 鏃ユ湡 between ''" + Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm") + "'' and ''" + Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm") + "'' ";
- //}
-
- //if (HProcExchBillNo != "") {
- // sWhere += " and 娴佽浆鍗″彿 =''" + HProcExchBillNo + "''";
- // HBeginDate = HBeginDate_u;
- // HEndDate = HEndDate_u;
- //}
-
- //if (HBeginDate) {
- // sWhere += " and CONVERT(varchar(100),鏃ユ湡, 20) >= ''" + HBeginDate + "''";
- //}
- //if (HEndDate) {
- // sWhere += " and CONVERT(varchar(100),鏃ユ湡, 20) <= ''" + HEndDate + "''";
- //}
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ }
if (HBillNo != "") {
sWhere += " and 鐢熶骇鍗曞彿 like '%" + HBillNo + "%' ";
@@ -575,22 +545,8 @@
//閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
- ////鍒濆鍖栨椂闂�
- //laydate.render({
- // elem: '#HBeginDate',
- // type: 'datetime',
- // fullPanel: true
- // , format: 'yyyy-MM-dd HH:mm'
- // , value: Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 1).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm")
- //});
- //laydate.render({
- // elem: '#HEndDate',
- // type: 'datetime',
- // fullPanel: true
- // , format: 'yyyy-MM-dd HH:mm'
- // , value: Format(new Date(new Date()).setHours(7, 0, 0, 0), "yyyy-MM-dd hh:mm")
- //});
-
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //寮�濮嬫棩鏈�
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撴潫鏃ユ湡
$("#HBillNo").val("");
$("#HMaterNumber").val("");
$("#HProductName").val("");
--
Gitblit v1.9.1