pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

修改各移动端页面的搜索功能

lwx_dev
erdanergou 3 years ago
parent
7cfbaaf667
commit
517f67df76
6 changed files with 376 additions and 337 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      src/main/resources/templates/pages/depository/table-in_mobile.html
  2. 27
      src/main/resources/templates/pages/depository/table-out_mobile.html
  3. 17
      src/main/resources/templates/pages/group/group-out_mobile.html
  4. 22
      src/main/resources/templates/pages/material/material-out_mobile.html
  5. 21
      src/main/resources/templates/pages/split/split-out_mobile.html
  6. 4
      target/classes/com/dreamchaser/depository_manage/mapper/GroupMapper.xml

26
src/main/resources/templates/pages/depository/table-in_mobile.html
View File

@ -12,17 +12,22 @@
<body> <body>
<div class="layuimini-container"> <div class="layuimini-container">
<div class="layuimini-main"> <div class="layuimini-main">
<fieldset class="table-search-fieldset"> <div class="layui-collapse">
<legend>搜索信息</legend> <div class="layui-colla-item">
<h2 class="layui-colla-title">搜索</h2>
<div class="layui-colla-content">
<div style="margin: 10px 10px 10px 10px"> <div style="margin: 10px 10px 10px 10px">
<form class="layui-form layui-form-pane" action=""> <form class="layui-form layui-form-pane" action="">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">申请时间</label> <label class="layui-form-label">申请时间</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" style="display:inline;width: 101px;" id="startDate" name="startDate" autocomplete="off" placeholder="开始日期" class="layui-input"> <input type="text" style="display:inline;width: 101px;" id="startDate"
name="startDate" autocomplete="off" placeholder="开始日期"
class="layui-input">
- -
<input type="text" style="display:inline;width: 101px;" id="endDate" name="endDate" autocomplete="off" placeholder="结束日期" class="layui-input"> <input type="text" style="display:inline;width: 101px;" id="endDate"
name="endDate" autocomplete="off" placeholder="结束日期" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
@ -45,19 +50,22 @@
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">物料编码</label> <label class="layui-form-label">物料编码</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="mcode" autocomplete="off" class="layui-input" placeholder="请填写物料编码"> <input type="text" name="mcode" autocomplete="off" class="layui-input"
placeholder="请填写物料编码">
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">型号</label> <label class="layui-form-label">型号</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" class="layui-input" id="version" name="version" autocomplete="off" placeholder="请填写物料型号"/> <input type="text" class="layui-input" id="version" name="version"
autocomplete="off" placeholder="请填写物料型号"/>
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">记录编码</label> <label class="layui-form-label">记录编码</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" class="layui-input" id="code" name="code" autocomplete="off" placeholder="请填写申请记录编码"/> <input type="text" class="layui-input" id="code" name="code" autocomplete="off"
placeholder="请填写申请记录编码"/>
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
@ -68,7 +76,9 @@
</div> </div>
</form> </form>
</div> </div>
</fieldset> </div>
</div>
</div>
<ul class="flow-default" id="LAY_applicationIn"></ul> <ul class="flow-default" id="LAY_applicationIn"></ul>

27
src/main/resources/templates/pages/depository/table-out_mobile.html
View File

@ -12,25 +12,30 @@
<body> <body>
<div class="layuimini-container"> <div class="layuimini-container">
<div class="layuimini-main"> <div class="layuimini-main">
<fieldset class="table-search-fieldset"> <div class="layui-collapse">
<legend>搜索信息</legend> <div class="layui-colla-item">
<h2 class="layui-colla-title">搜索</h2>
<div class="layui-colla-content">
<div style="margin: 10px 10px 10px 10px"> <div style="margin: 10px 10px 10px 10px">
<form class="layui-form layui-form-pane" action=""> <form class="layui-form layui-form-pane" action="">
<div class="layui-form-item"> <div class="layui-form-item">
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">申请时间</label> <label class="layui-form-label">申请时间</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" style="display:inline;width: 101px;" id="startDate" name="startDate" <input type="text" style="display:inline;width: 101px;" id="startDate"
name="startDate"
autocomplete="off" placeholder="开始日期" class="layui-input"> autocomplete="off" placeholder="开始日期" class="layui-input">
- -
<input type="text" style="display:inline;width: 101px;" id="endDate" name="endDate" <input type="text" style="display:inline;width: 101px;" id="endDate"
name="endDate"
autocomplete="off" placeholder="结束日期" class="layui-input"> autocomplete="off" placeholder="结束日期" class="layui-input">
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">仓库</label> <label class="layui-form-label">仓库</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" placeholder="请选择仓库" class="layui-input" id="openSonByDepository" <input type="text" placeholder="请选择仓库" class="layui-input"
id="openSonByDepository"
readonly/> readonly/>
<input type="text" name="depositoryId" class="layui-input" id="depositoryId" <input type="text" name="depositoryId" class="layui-input" id="depositoryId"
style="display: none"/> style="display: none"/>
@ -61,7 +66,8 @@
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">型号</label> <label class="layui-form-label">型号</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" class="layui-input" id="version" name="version" autocomplete="off" <input type="text" class="layui-input" id="version" name="version"
autocomplete="off"
placeholder="请填写物料型号"/> placeholder="请填写物料型号"/>
</div> </div>
</div> </div>
@ -73,7 +79,9 @@
</div> </div>
</form> </form>
</div> </div>
</fieldset> </div>
</div>
</div>
<ul class="flow-default" id="LAY_applicationOut"></ul> <ul class="flow-default" id="LAY_applicationOut"></ul>
</div> </div>
@ -94,11 +102,12 @@
function selectMaterialByName(obj) { function selectMaterialByName(obj) {
} }
layui.use(['form', 'flow', 'laydate'], function () { layui.use(['form', 'flow', 'laydate', 'element'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,
flow = layui.flow, flow = layui.flow,
laydate = layui.laydate; laydate = layui.laydate,
element = layui.element;
let takingPre = 0; let takingPre = 0;
let size = 8; let size = 8;

17
src/main/resources/templates/pages/group/group-out_mobile.html
View File

@ -12,8 +12,10 @@
<body> <body>
<div class="layuimini-container"> <div class="layuimini-container">
<div class="layuimini-main"> <div class="layuimini-main">
<fieldset class="table-search-fieldset"> <div class="layui-collapse">
<legend>搜索信息</legend> <div class="layui-colla-item">
<h2 class="layui-colla-title">搜索</h2>
<div class="layui-colla-content">
<div style="margin: 10px 10px 10px 10px"> <div style="margin: 10px 10px 10px 10px">
<form class="layui-form layui-form-pane" action=""> <form class="layui-form layui-form-pane" action="">
<div class="layui-form-item"> <div class="layui-form-item">
@ -30,7 +32,8 @@
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">组合名称</label> <label class="layui-form-label">组合名称</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="name" autocomplete="off" class="layui-input" placeholder="请输入组合名称"> <input type="text" name="name" autocomplete="off" class="layui-input"
placeholder="请输入组合名称">
</div> </div>
</div> </div>
@ -38,7 +41,8 @@
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">组合编码</label> <label class="layui-form-label">组合编码</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="code" autocomplete="off" class="layui-input" placeholder="请输入组合编码"> <input type="text" name="code" autocomplete="off" class="layui-input"
placeholder="请输入组合编码">
</div> </div>
</div> </div>
@ -61,7 +65,9 @@
</div> </div>
</form> </form>
</div> </div>
</fieldset> </div>
</div>
</div>
<ul class="flow-default" id="LAY_group"></ul> <ul class="flow-default" id="LAY_group"></ul>
</div> </div>
</div> </div>
@ -74,6 +80,7 @@
function showDetail() { function showDetail() {
} }
layui.use(['form', 'flow', 'laydate'], function () { layui.use(['form', 'flow', 'laydate'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,

22
src/main/resources/templates/pages/material/material-out_mobile.html
View File

@ -19,8 +19,10 @@
<input style="display:none;" id="display" th:value="${display}"> <input style="display:none;" id="display" th:value="${display}">
<input style="display: none" th:value="${number}" id="number"> <input style="display: none" th:value="${number}" id="number">
<fieldset class="table-search-fieldset"> <div class="layui-collapse">
<legend>搜索信息</legend> <div class="layui-colla-item">
<h2 class="layui-colla-title">搜索</h2>
<div class="layui-colla-content">
<div style="margin: 10px 10px 10px 10px"> <div style="margin: 10px 10px 10px 10px">
<form class="layui-form layui-form-pane" action=""> <form class="layui-form layui-form-pane" action="">
<div class="layui-form-item"> <div class="layui-form-item">
@ -29,9 +31,11 @@
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">种类</label> <label class="layui-form-label">种类</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" placeholder="请选择物料类型" class="layui-input" id="openSonByMateralType" <input type="text" placeholder="请选择物料类型" class="layui-input"
id="openSonByMateralType"
readonly/> readonly/>
<input type="text" id="materialTypeId" placeholder="请选择物料类型" name="materialTypeId" <input type="text" id="materialTypeId" placeholder="请选择物料类型"
name="materialTypeId"
class="layui-input" style="display: none"/> class="layui-input" style="display: none"/>
</div> </div>
</div> </div>
@ -45,7 +49,8 @@
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">型号</label> <label class="layui-form-label">型号</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" class="layui-input" id="version" name="version" autocomplete="off" <input type="text" class="layui-input" id="version" name="version"
autocomplete="off"
placeholder="请输入物料型号"/> placeholder="请输入物料型号"/>
</div> </div>
</div> </div>
@ -74,7 +79,9 @@
</div> </div>
</form> </form>
</div> </div>
</fieldset> </div>
</div>
</div>
<ul class="flow-default" id="LAY_material"></ul> <ul class="flow-default" id="LAY_material"></ul>
@ -110,7 +117,6 @@
let newIndexShade; let newIndexShade;
layui.use(['form', 'table', 'upload', 'flow'], function () { layui.use(['form', 'table', 'upload', 'flow'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,
@ -171,7 +177,6 @@
}); });
// 监听搜索操作 // 监听搜索操作
form.on('submit(data-search-btn)', function (data) { form.on('submit(data-search-btn)', function (data) {
var req = {}; var req = {};
@ -237,7 +242,6 @@
}; };
showDetail = function (obj) { showDetail = function (obj) {
var index = layer.open({ var index = layer.open({
title: '物料信息详情', title: '物料信息详情',

21
src/main/resources/templates/pages/split/split-out_mobile.html
View File

@ -12,8 +12,10 @@
<body> <body>
<div class="layuimini-container"> <div class="layuimini-container">
<div class="layuimini-main"> <div class="layuimini-main">
<fieldset class="table-search-fieldset"> <div class="layui-collapse">
<legend>搜索信息</legend> <div class="layui-colla-item">
<h2 class="layui-colla-title">搜索</h2>
<div class="layui-colla-content">
<div style="margin: 10px 10px 10px 10px"> <div style="margin: 10px 10px 10px 10px">
<form class="layui-form layui-form-pane" action=""> <form class="layui-form layui-form-pane" action="">
<div class="layui-form-item"> <div class="layui-form-item">
@ -21,21 +23,24 @@
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">物料名称：</label> <label class="layui-form-label">物料名称：</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" class="layui-input" id="mname" name="mname" autocomplete="off" placeholder="请输入物料名称"/> <input type="text" class="layui-input" id="mname" name="mname"
autocomplete="off" placeholder="请输入物料名称"/>
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">物料型号：</label> <label class="layui-form-label">物料型号：</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" class="layui-input" id="version" name="version" autocomplete="off" placeholder="请输入物料型号"/> <input type="text" class="layui-input" id="version" name="version"
autocomplete="off" placeholder="请输入物料型号"/>
</div> </div>
</div> </div>
<div class="layui-inline"> <div class="layui-inline">
<label class="layui-form-label">物料编码：</label> <label class="layui-form-label">物料编码：</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" class="layui-input" id="mcode" name="mcode" autocomplete="off" placeholder="请输入物料编码"/> <input type="text" class="layui-input" id="mcode" name="mcode"
autocomplete="off" placeholder="请输入物料编码"/>
</div> </div>
</div> </div>
@ -58,7 +63,9 @@
</div> </div>
</form> </form>
</div> </div>
</fieldset> </div>
</div>
</div>
<ul class="flow-default" id="LAY_splitInfo"></ul> <ul class="flow-default" id="LAY_splitInfo"></ul>
</div> </div>
@ -77,7 +84,6 @@
let size = 8; let size = 8;
// 监听搜索操作 // 监听搜索操作
form.on('submit(data-search-btn)', function (data) { form.on('submit(data-search-btn)', function (data) {
var req = {}; var req = {};
@ -172,7 +178,6 @@
}; };
showDetail = function (obj) { showDetail = function (obj) {
var index = layer.open({ var index = layer.open({
title: '拆单详情', title: '拆单详情',

4
target/classes/com/dreamchaser/depository_manage/mapper/GroupMapper.xml
View File

@ -129,8 +129,12 @@
<if test="state != null and state != ''"> <if test="state != null and state != ''">
and state = #{state} and state = #{state}
</if> </if>
<if test="gname != null and gname != ''">
and gname like concat('%',#{gname},'%')
</if>
</select> </select>
<select id="findGroupById" resultMap="groupInfoMap" parameterType="int"> <select id="findGroupById" resultMap="groupInfoMap" parameterType="int">
select select
<include refid="allColumnsForView"/> <include refid="allColumnsForView"/>

Write Preview
Loading…
Cancel
Save