~luxiaotao1123/zy-asrs.git

			@@ -136,12 +136,7 @@

			//------------------日入库明细统计--------------------------------------
			@RequestMapping("/viewWorkInList.action")
			public Map<String,Object> viewWorkInList(@RequestParam(defaultValue = "1")Integer curr,
			@RequestParam(defaultValue = "10")Integer limit,
			@RequestParam Map<String, Object> param){
			ViewWorkInBean bean = new ViewWorkInBean();
			bean.setPageSize(limit);
			bean.setPageNumber(curr);
			public Map<String,Object> viewWorkInList(ViewWorkInBean bean){
			List<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(bean);
			int count = reportQueryMapper.getViewWorkInCount(bean);
			Page<ViewWorkInBean> page = new Page<>();

			@@ -28,8 +28,8 @@
			cellMinWidth: 50,
			cols: [getCol()],
			request: {
			pageName: 'curr',
			pageSize: 'limit'
			pageName: 'pageNumber',
			limitName: 'pageSize'
			},
			parseData: function (res) {
			return {
			@@ -119,6 +119,17 @@
			pageCurr = 1;
			tableReload(false);
			});
			// 搜索栏重置事件
			form.on('submit(reset)', function (data) {
			pageCurr = 1;
			clearFormVal($('#search-box'));
			tableReload(false);
			});
			layDate.render({
			elem: '.layui-laydate-range'
			,type: 'datetime'
			,range: true
			});
			});

			// 关闭动作

			@@ -19,18 +19,25 @@

			<!-- 搜索栏 -->
			<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 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 class="layui-inline">
			<div class="layui-input-inline">
			<input class="layui-input" type="text" name="loc_no" placeholder="库位号" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline">
			<div class="layui-input-inline">
			<input class="layui-input" type="text" name="matnr" placeholder="商品编码" autocomplete="off">
			</div>
			</div>
			<div class="layui-inline" style="width: 300px">
			<div class="layui-input-inline">
			<input class="layui-input layui-laydate-range" name="query_date" 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>

			<!-- 表格 -->

	src/main/java/com/zy/asrs/controller/ReportQueryController.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/js/report/workIn.js	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/report/viewWorkIn.html	31 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史