From 0585bde92f749aa54ce608bdb72eb0dd60c45adf Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 24 十二月 2024 11:03:21 +0800
Subject: [PATCH] #日出入库统计修改年月日都可查询

---
 src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java         |   11 +
 src/main/webapp/static/js/report/inOut.js                       |   72 ++++++++++
 src/main/resources/mapper/ViewInOutMapper.xml                   |  220 +++++++++++++++++++++++++++++++
 src/main/webapp/views/report/viewInOut.html                     |   28 ++-
 src/main/java/com/zy/asrs/controller/ReportQueryController.java |   38 +++++
 5 files changed, 354 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ReportQueryController.java b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
index cd42ffc..0e89236 100644
--- a/src/main/java/com/zy/asrs/controller/ReportQueryController.java
+++ b/src/main/java/com/zy/asrs/controller/ReportQueryController.java
@@ -1,9 +1,11 @@
 package com.zy.asrs.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.core.annotations.ManagerAuth;
 import com.core.common.Cools;
+import com.core.common.DateUtils;
 import com.core.common.R;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.mapper.ReportQueryMapper;
@@ -128,8 +130,27 @@
 		ViewInOutBean bean = new ViewInOutBean();
 		bean.setPageSize(limit);
 		bean.setPageNumber(curr);
-		List<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(bean);
-		int count = reportQueryMapper.getViewInOutCount(bean);
+		if (!Cools.isEmpty(param.get("modi_time"))) {
+			String[] dates = param.get("modi_time").toString().split(RANGE_TIME_LINK);
+			bean.setBegin_date(dates[0]);
+			bean.setEnd_date(dates[1]);
+		}
+		int count = 0;
+		List<ViewInOutBean> list = new ArrayList<>();
+		if (param.get("type") == null || param.get("type").equals(1)) {
+			list = reportQueryMapper.queryViewInOutListDay(bean);
+			count = reportQueryMapper.getViewInOutCountDay(bean);
+		}else if ( param.get("type").equals("2")) {
+			list = reportQueryMapper.queryViewInOutListMonth(bean);
+			count = reportQueryMapper.getViewInOutCountMonth(bean);
+		} else if (param.get("type").equals("3")) {
+			list = reportQueryMapper.queryViewInOutListYear(bean);
+			count = reportQueryMapper.getViewInOutCountYear(bean);
+		}else {
+			list = reportQueryMapper.queryViewInOutList(bean);
+			count = reportQueryMapper.getViewInOutCount(bean);
+		}
+//		List<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(bean);
 		Page<ViewInOutBean> page = new Page<>();
 		page.setRecords(list);
 		page.setTotal(count);
@@ -246,4 +267,17 @@
 		return R.ok(exportSupport(list, fields));
 	}
 
+	private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+		for (Map.Entry<String, Object> entry : map.entrySet()){
+			String val = String.valueOf(entry.getValue());
+			if (val.contains(RANGE_TIME_LINK)){
+				String[] dates = val.split(RANGE_TIME_LINK);
+				wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+				wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+			} else {
+				wrapper.like(entry.getKey(), val);
+			}
+		}
+	}
+
 }
diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
index 6a804db..6665969 100644
--- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java
@@ -11,6 +11,8 @@
 @Mapper
 @Repository
 public interface ReportQueryMapper {
+
+	List<ViewStockUseBean> queryViewStockUseListDate(ViewStockUseBean viewStockUse);
 	
 	//鍒嗛〉鏌ヨ搴撲綅浣跨敤鐜�
 	List<ViewStockUseBean> queryViewStockUseList(ViewStockUseBean viewStockUse);
@@ -43,7 +45,16 @@
 
 	//鍒嗛〉鏌ヨ绔欑偣鍏ュ嚭搴撴鏁扮粺璁�
 	public List<ViewInOutBean> queryViewInOutList(ViewInOutBean viewInOut);
+
+	public List<ViewInOutBean> queryViewInOutListDay(ViewInOutBean viewInOut);
+
+	public List<ViewInOutBean> queryViewInOutListMonth(ViewInOutBean viewInOut);
+
+	public List<ViewInOutBean> queryViewInOutListYear(ViewInOutBean viewInOut);
 	public int getViewInOutCount(ViewInOutBean viewInOut);
+	public int getViewInOutCountDay(ViewInOutBean viewInOut);
+	public int getViewInOutCountMonth(ViewInOutBean viewInOut);
+	public int getViewInOutCountYear(ViewInOutBean viewInOut);
 	//涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭
 	public List<ViewInOutBean> getViewInOutAll(ViewInOutBean viewInOut);
 
diff --git a/src/main/resources/mapper/ViewInOutMapper.xml b/src/main/resources/mapper/ViewInOutMapper.xml
index 8152776..fda9e96 100644
--- a/src/main/resources/mapper/ViewInOutMapper.xml
+++ b/src/main/resources/mapper/ViewInOutMapper.xml
@@ -24,7 +24,27 @@
 <select id="queryViewInOutList" parameterType="com.zy.asrs.entity.ViewInOutBean" resultType="com.zy.asrs.entity.ViewInOutBean">
 select * from ( 
 select *,ROW_NUMBER() OVER(Order by ymd desc) as rowid
- from asr_sta_inout_view
+ from (
+	SELECT     ymd, source_sta_no, SUM(a_1) AS sto_qty, SUM(a_2) AS ret_qty, SUM(a_1) + SUM(a_2) AS total_qty
+	FROM         (SELECT     wrk_no, CONVERT(char(10), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+	FROM          dbo.asr_wrk_mast
+	WHERE      (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts &lt;= 5)
+	UNION ALL
+	SELECT     wrk_no, CONVERT(char(10), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+	FROM         dbo.asr_wrk_mast AS asr_wrk_mast_1
+	WHERE     (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts &lt;= 15)
+	UNION ALL
+	SELECT     wrk_no, CONVERT(char(10), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+	FROM         dbo.asr_wrk_mast_log
+	WHERE     (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts &lt;= 5)
+	UNION ALL
+	SELECT     wrk_no, CONVERT(char(10), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+	FROM         dbo.asr_wrk_mast_log AS asr_wrk_mast_log_1
+	WHERE     (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts &lt;= 15)) AS a
+	WHERE     (ymd IS NOT NULL)
+	GROUP BY source_sta_no, ymd
+
+	) as b
 <where>
 	1=1
  	<include refid="viewInOutConditionSql"></include>
@@ -38,6 +58,117 @@
 </where>
 </select>
 
+	<select id="queryViewInOutListDay" parameterType="com.zy.asrs.entity.ViewInOutBean" resultType="com.zy.asrs.entity.ViewInOutBean">
+		select * from (
+		select *,ROW_NUMBER() OVER(Order by ymd desc) as rowid
+		from (
+		SELECT     ymd, source_sta_no, SUM(a_1) AS sto_qty, SUM(a_2) AS ret_qty, SUM(a_1) + SUM(a_2) AS total_qty
+		FROM         (SELECT     wrk_no, CONVERT(char(10), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+		FROM          dbo.asr_wrk_mast
+		WHERE      (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts &lt;= 5)
+		UNION ALL
+		SELECT     wrk_no, CONVERT(char(10), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+		FROM         dbo.asr_wrk_mast AS asr_wrk_mast_1
+		WHERE     (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts &lt;= 15)
+		UNION ALL
+		SELECT     wrk_no, CONVERT(char(10), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+		FROM         dbo.asr_wrk_mast_log
+		WHERE     (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts &lt;= 5)
+		UNION ALL
+		SELECT     wrk_no, CONVERT(char(10), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+		FROM         dbo.asr_wrk_mast_log AS asr_wrk_mast_log_1
+		WHERE     (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts &lt;= 15)) AS a
+		WHERE     (ymd IS NOT NULL)
+		GROUP BY source_sta_no, ymd
+
+		) as b
+		<where>
+			1=1
+			<include refid="viewInOutConditionSql"></include>
+		</where>
+		) as a
+		<where>
+			rowid between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+			<![CDATA[
+		order by ymd desc
+	]]>
+		</where>
+	</select>
+
+	<select id="queryViewInOutListMonth" parameterType="com.zy.asrs.entity.ViewInOutBean" resultType="com.zy.asrs.entity.ViewInOutBean">
+		select * from (
+		select *,ROW_NUMBER() OVER(Order by ymd desc) as rowid
+		from (
+		SELECT     ymd, source_sta_no, SUM(a_1) AS sto_qty, SUM(a_2) AS ret_qty, SUM(a_1) + SUM(a_2) AS total_qty
+		FROM         (SELECT     wrk_no, CONVERT(char(7), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+		FROM          dbo.asr_wrk_mast
+		WHERE      (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts &lt;= 5)
+		UNION ALL
+		SELECT     wrk_no, CONVERT(char(7), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+		FROM         dbo.asr_wrk_mast AS asr_wrk_mast_1
+		WHERE     (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts &lt;= 15)
+		UNION ALL
+		SELECT     wrk_no, CONVERT(char(7), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+		FROM         dbo.asr_wrk_mast_log
+		WHERE     (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts &lt;= 5)
+		UNION ALL
+		SELECT     wrk_no, CONVERT(char(7), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+		FROM         dbo.asr_wrk_mast_log AS asr_wrk_mast_log_1
+		WHERE     (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts &lt;= 15)) AS a
+		WHERE     (ymd IS NOT NULL)
+		GROUP BY source_sta_no, ymd
+
+		) as b
+		<where>
+			1=1
+			<include refid="viewInOutConditionSql"></include>
+		</where>
+		) as a
+		<where>
+			rowid between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+			<![CDATA[
+		order by ymd desc
+	]]>
+		</where>
+	</select>
+
+	<select id="queryViewInOutListYear" parameterType="com.zy.asrs.entity.ViewInOutBean" resultType="com.zy.asrs.entity.ViewInOutBean">
+		select * from (
+		select *,ROW_NUMBER() OVER(Order by ymd desc) as rowid
+		from (
+		SELECT     ymd, source_sta_no, SUM(a_1) AS sto_qty, SUM(a_2) AS ret_qty, SUM(a_1) + SUM(a_2) AS total_qty
+		FROM         (SELECT     wrk_no, CONVERT(char(4), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+		FROM          dbo.asr_wrk_mast
+		WHERE      (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts &lt;= 5)
+		UNION ALL
+		SELECT     wrk_no, CONVERT(char(4), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+		FROM         dbo.asr_wrk_mast AS asr_wrk_mast_1
+		WHERE     (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts &lt;= 15)
+		UNION ALL
+		SELECT     wrk_no, CONVERT(char(4), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+		FROM         dbo.asr_wrk_mast_log
+		WHERE     (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts &lt;= 5)
+		UNION ALL
+		SELECT     wrk_no, CONVERT(char(4), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+		FROM         dbo.asr_wrk_mast_log AS asr_wrk_mast_log_1
+		WHERE     (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts &lt;= 15)) AS a
+		WHERE     (ymd IS NOT NULL)
+		GROUP BY source_sta_no, ymd
+
+		) as b
+		<where>
+			1=1
+			<include refid="viewInOutConditionSql"></include>
+		</where>
+		) as a
+		<where>
+			rowid between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
+			<![CDATA[
+		order by ymd desc
+	]]>
+		</where>
+	</select>
+
 <select id="getViewInOutCount" parameterType="com.zy.asrs.entity.ViewInOutBean"	resultType="Integer">
 select count(1) from asr_sta_inout_view a
 <where>
@@ -48,6 +179,93 @@
 </where>
 </select>
 
+	<select id="getViewInOutCountDay" parameterType="com.zy.asrs.entity.ViewInOutBean"	resultType="Integer">
+		select count(1) from (
+		SELECT     ymd, source_sta_no, SUM(a_1) AS sto_qty, SUM(a_2) AS ret_qty, SUM(a_1) + SUM(a_2) AS total_qty
+		FROM         (SELECT     wrk_no, CONVERT(char(10), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+		FROM          dbo.asr_wrk_mast
+		WHERE      (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts &lt;= 5)
+		UNION ALL
+		SELECT     wrk_no, CONVERT(char(10), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+		FROM         dbo.asr_wrk_mast AS asr_wrk_mast_1
+		WHERE     (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts &lt;= 15)
+		UNION ALL
+		SELECT     wrk_no, CONVERT(char(10), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+		FROM         dbo.asr_wrk_mast_log
+		WHERE     (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts &lt;= 5)
+		UNION ALL
+		SELECT     wrk_no, CONVERT(char(10), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+		FROM         dbo.asr_wrk_mast_log AS asr_wrk_mast_log_1
+		WHERE     (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts &lt;= 15)) AS a
+		WHERE     (ymd IS NOT NULL)
+		GROUP BY source_sta_no, ymd
+		) as a
+		<where>
+			<![CDATA[
+	1=1
+]]>
+			<include refid="viewInOutConditionSql"></include>
+		</where>
+	</select>
+
+	<select id="getViewInOutCountMonth" parameterType="com.zy.asrs.entity.ViewInOutBean"	resultType="Integer">
+		select count(1) from (
+		SELECT     ymd, source_sta_no, SUM(a_1) AS sto_qty, SUM(a_2) AS ret_qty, SUM(a_1) + SUM(a_2) AS total_qty
+		FROM         (SELECT     wrk_no, CONVERT(char(7), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+		FROM          dbo.asr_wrk_mast
+		WHERE      (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts &lt;= 5)
+		UNION ALL
+		SELECT     wrk_no, CONVERT(char(7), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+		FROM         dbo.asr_wrk_mast AS asr_wrk_mast_1
+		WHERE     (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts &lt;= 15)
+		UNION ALL
+		SELECT     wrk_no, CONVERT(char(7), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+		FROM         dbo.asr_wrk_mast_log
+		WHERE     (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts &lt;= 5)
+		UNION ALL
+		SELECT     wrk_no, CONVERT(char(7), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+		FROM         dbo.asr_wrk_mast_log AS asr_wrk_mast_log_1
+		WHERE     (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts &lt;= 15)) AS a
+		WHERE     (ymd IS NOT NULL)
+		GROUP BY source_sta_no, ymd
+		) as a
+		<where>
+			<![CDATA[
+	1=1
+]]>
+			<include refid="viewInOutConditionSql"></include>
+		</where>
+	</select>
+
+	<select id="getViewInOutCountYear" parameterType="com.zy.asrs.entity.ViewInOutBean"	resultType="Integer">
+		select count(1) from (
+		SELECT     ymd, source_sta_no, SUM(a_1) AS sto_qty, SUM(a_2) AS ret_qty, SUM(a_1) + SUM(a_2) AS total_qty
+		FROM         (SELECT     wrk_no, CONVERT(char(4), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+		FROM          dbo.asr_wrk_mast
+		WHERE      (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts &lt;= 5)
+		UNION ALL
+		SELECT     wrk_no, CONVERT(char(4), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+		FROM         dbo.asr_wrk_mast AS asr_wrk_mast_1
+		WHERE     (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts &lt;= 15)
+		UNION ALL
+		SELECT     wrk_no, CONVERT(char(4), crn_str_time, 120) AS ymd, wrk_sts, source_sta_no, 1 AS a_1, 0 AS a_2
+		FROM         dbo.asr_wrk_mast_log
+		WHERE     (source_sta_no IS NOT NULL) AND (wrk_sts > 1) AND (wrk_sts &lt;= 5)
+		UNION ALL
+		SELECT     wrk_no, CONVERT(char(4), crn_str_time, 120) AS Expr1, wrk_sts, sta_no, 0 AS Expr2, 1 AS Expr3
+		FROM         dbo.asr_wrk_mast_log AS asr_wrk_mast_log_1
+		WHERE     (sta_no IS NOT NULL) AND (wrk_sts >= 14) AND (wrk_sts &lt;= 15)) AS a
+		WHERE     (ymd IS NOT NULL)
+		GROUP BY source_sta_no, ymd
+		) as a
+		<where>
+			<![CDATA[
+	1=1
+]]>
+			<include refid="viewInOutConditionSql"></include>
+		</where>
+	</select>
+
 <!-- 涓嶅垎椤垫煡璇㈡墍鏈変俊鎭紝鐢ㄤ簬excel瀵煎嚭 -->
 <select id="getViewInOutAll" parameterType="com.zy.asrs.entity.ViewInOutBean" resultType="com.zy.asrs.entity.ViewInOutBean">
 select * from asr_sta_inout_view a
diff --git a/src/main/webapp/static/js/report/inOut.js b/src/main/webapp/static/js/report/inOut.js
index e7dff96..a755f60 100644
--- a/src/main/webapp/static/js/report/inOut.js
+++ b/src/main/webapp/static/js/report/inOut.js
@@ -1,4 +1,5 @@
 var pageCurr;
+var type;
 layui.use(['table','laydate', 'form'], function(){
     var table = layui.table;
     var $ = layui.jquery;
@@ -114,7 +115,71 @@
     // 鎼滅储鏍忔悳绱簨浠�
     form.on('submit(search)', function (data) {
         pageCurr = 1;
-        tableReload(false);
+        tableReload(false,false);
+    });
+
+    // 鎼滅储鏍忛噸缃簨浠�
+    form.on('submit(reset)', function (data) {
+        pageCurr = 1;
+        type = 1;
+        clearFormVal($('#search-box'));
+        $('#detlTable').css("display", 'none');
+        tableReload(false,true);
+    });
+
+    // 鏃堕棿閫夋嫨鍣�
+    layDate.render({
+        elem: '#ymd\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#wrkDate\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#ioTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#crnStrTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#crnEndTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#plcStrTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#crnPosTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#refIotime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#modiTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#appeTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#errorTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '#logErrTime\\$',
+        type: 'datetime'
+    });
+    layDate.render({
+        elem: '.layui-laydate-range'
+        ,type: 'datetime'
+        ,range: true
     });
 });
 
@@ -123,11 +188,14 @@
     parent.layer.closeAll();
 });
 
-function tableReload(child) {
+function tableReload(child,isReset) {
     var searchData = {};
     $.each($('#search-box [name]').serializeArray(), function() {
         searchData[this.name] = this.value;
     });
+    if(isReset){
+        searchData["type"] = "1";
+    }
     (child ? parent.tableIns : tableIns).reload({
         where: searchData,
         page: {
diff --git a/src/main/webapp/views/report/viewInOut.html b/src/main/webapp/views/report/viewInOut.html
index 440e00d..e0e6439 100644
--- a/src/main/webapp/views/report/viewInOut.html
+++ b/src/main/webapp/views/report/viewInOut.html
@@ -19,18 +19,26 @@
 
 <!-- 鎼滅储鏍� -->
 <div id="search-box" class="layui-form layui-card-header">
-    <!--<div class="layui-inline">-->
-        <!--<label class="layui-form-label">搴� 浣� 鍙凤細</label>-->
-        <!--<div class="layui-input-inline">-->
-            <!--<input class="layui-input" type="text" name="id" placeholder="璇疯緭鍏�" autocomplete="off">-->
-        <!--</div>-->
-    <!--</div>-->
+    <div class="layui-inline">
+        <div class="layui-input-inline">
+            <select name="type">
+                <option value="1" selected>鏃�</option>
+                <option value="2">鏈�</option>
+                <option value="3">骞�</option>
+            </select>
+        </div>
+    </div>
+    <div class="layui-inline" style="width: 300px">
+        <div class="layui-input-inline">
+            <input class="layui-input layui-laydate-range" name="modi_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+        </div>
+    </div>
 
     <!-- 寰呮坊鍔� -->
-<!--    <div id="data-search-btn" class="layui-btn-container layui-form-item">-->
-<!--        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>-->
-<!--        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>-->
-<!--    </div>-->
+    <div id="data-search-btn" class="layui-btn-container layui-form-item">
+        <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
+        <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
+    </div>
 </div>
 
 <!-- 琛ㄦ牸 -->

--
Gitblit v1.9.1