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. 154
      src/main/resources/templates/pages/depository/table-in_mobile.html
  2. 161
      src/main/resources/templates/pages/depository/table-out_mobile.html
  3. 135
      src/main/resources/templates/pages/group/group-out_mobile.html
  4. 136
      src/main/resources/templates/pages/material/material-out_mobile.html
  5. 123
      src/main/resources/templates/pages/split/split-out_mobile.html
  6. 4
      target/classes/com/dreamchaser/depository_manage/mapper/GroupMapper.xml

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

@ -12,63 +12,73 @@
<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">
<div style="margin: 10px 10px 10px 10px"> <h2 class="layui-colla-title">搜索</h2>
<form class="layui-form layui-form-pane" action=""> <div class="layui-colla-content">
<div class="layui-form-item"> <div style="margin: 10px 10px 10px 10px">
<div class="layui-inline"> <form class="layui-form layui-form-pane" action="">
<label class="layui-form-label">申请时间</label> <div class="layui-form-item">
<div class="layui-input-block" > <div class="layui-inline">
<input type="text" style="display:inline;width: 101px;" id="startDate" name="startDate" autocomplete="off" placeholder="开始日期" class="layui-input"> <label class="layui-form-label">申请时间</label>
- <div class="layui-input-block">
<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="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">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">仓库：</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择仓库" class="layui-input"
id="openSonByDepository" readonly onclick="openDepositoryTree(this)"
/>
<input type="text" name="depositoryId" class="layui-input" id="depositoryId"
style="display: none"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">物料名称:</label>
<div class="layui-input-block">
<input id="mname" name="mname" type="text" placeholder="请填写物料名称"
class="layui-input"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">物料编码</label>
<div class="layui-input-block">
<input type="text" name="mcode" autocomplete="off" class="layui-input"
placeholder="请填写物料编码">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">型号</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="version" name="version"
autocomplete="off" placeholder="请填写物料型号"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">记录编码</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="code" name="code" autocomplete="off"
placeholder="请填写申请记录编码"/>
</div>
</div>
<div class="layui-inline">
<button type="submit" class="layui-btn layui-btn-primary" lay-submit
lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
</button>
</div>
</div> </div>
</div> </form>
<div class="layui-inline">
<label class="layui-form-label">仓库：</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择仓库" class="layui-input"
id="openSonByDepository" readonly onclick="openDepositoryTree(this)"
/>
<input type="text" name="depositoryId" class="layui-input" id="depositoryId"
style="display: none"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">物料名称:</label>
<div class="layui-input-block">
<input id="mname" name="mname" type="text" placeholder="请填写物料名称"
class="layui-input" />
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">物料编码</label>
<div class="layui-input-block">
<input type="text" name="mcode" autocomplete="off" class="layui-input" placeholder="请填写物料编码">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">型号</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="version" name="version" autocomplete="off" placeholder="请填写物料型号"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">记录编码</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="code" name="code" autocomplete="off" placeholder="请填写申请记录编码"/>
</div>
</div>
<div class="layui-inline">
<button type="submit" class="layui-btn layui-btn-primary" lay-submit
lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
</button>
</div>
</div> </div>
</form> </div>
</div> </div>
</fieldset> </div>
<ul class="flow-default" id="LAY_applicationIn"></ul> <ul class="flow-default" id="LAY_applicationIn"></ul>
@ -83,7 +93,7 @@
function openDepositoryTree(obj) { function openDepositoryTree(obj) {
} }
function showDetail(){ function showDetail() {
} }
@ -107,14 +117,14 @@
for (let i = 0; i < result.length; i++) { for (let i = 0; i < result.length; i++) {
lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail(' lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail('
+ result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].applicantName+"的入库申请" + '</h2></div>'); + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].applicantName + "的入库申请" + '</h2></div>');
lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">' lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
+'<p style="font-size: large">' + result[i].mname + '</p>' + '<p style="font-size: large">' + result[i].mname + '</p>'
+'<p>' + result[i].mversion + '</p>' + '<p>' + result[i].mversion + '</p>'
+'<p>' + result[i].mbrand + '</p>' + '<p>' + result[i].mbrand + '</p>'
+'<p>' + result[i].quantity+" : "+result[i].airUnit + '</p>' + '<p>' + result[i].quantity + " : " + result[i].airUnit + '</p>'
+ '<p>' +result[i].depositoryName + '</p>' + '<p>' + result[i].depositoryName + '</p>'
+ '<p style="text-align: right">' +result[i].applicantTime + '</p>' + '<p style="text-align: right">' + result[i].applicantTime + '</p>'
+ '</div></div></li>'); + '</div></div></li>');
} }
lis.push('</div>'); lis.push('</div>');
@ -186,7 +196,7 @@
}); });
updateFlow = function(req) { updateFlow = function (req) {
$("#LAY_applicationIn").empty(); $("#LAY_applicationIn").empty();
takingPre = 0; takingPre = 0;
flow.load({ flow.load({
@ -197,8 +207,8 @@
req.page = page; req.page = page;
req.size = size; req.size = size;
$.ajax({ $.ajax({
url:"/depositoryRecord/applicationInView", url: "/depositoryRecord/applicationInView",
type:"get", type: "get",
data: req, data: req,
dataType: "json", dataType: "json",
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
@ -208,14 +218,14 @@
lis.push("<div class='clearfix'>"); lis.push("<div class='clearfix'>");
for (let i = 0; i < result.length; i++) { for (let i = 0; i < result.length; i++) {
lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail(' lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail('
+ result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].applicantName+"的入库申请" + '</h2></div>'); + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].applicantName + "的入库申请" + '</h2></div>');
lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">' lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
+'<p style="font-size: large">' + result[i].mname + '</p>' + '<p style="font-size: large">' + result[i].mname + '</p>'
+'<p>' + result[i].mversion + '</p>' + '<p>' + result[i].mversion + '</p>'
+'<p>' + result[i].mbrand + '</p>' + '<p>' + result[i].mbrand + '</p>'
+'<p>' + result[i].quantity+" : "+result[i].airUnit + '</p>' + '<p>' + result[i].quantity + " : " + result[i].airUnit + '</p>'
+ '<p>' +result[i].depositoryName + '</p>' + '<p>' + result[i].depositoryName + '</p>'
+ '<p style="text-align: right">' +result[i].applicantTime + '</p>' + '<p style="text-align: right">' + result[i].applicantTime + '</p>'
+ '</div></div></li>'); + '</div></div></li>');
} }
lis.push('</div>'); lis.push('</div>');

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

@ -12,68 +12,76 @@
<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">
<div style="margin: 10px 10px 10px 10px"> <h2 class="layui-colla-title">搜索</h2>
<form class="layui-form layui-form-pane" action=""> <div class="layui-colla-content">
<div class="layui-form-item"> <div style="margin: 10px 10px 10px 10px">
<div class="layui-inline"> <form class="layui-form layui-form-pane" action="">
<label class="layui-form-label">申请时间</label> <div class="layui-form-item">
<div class="layui-input-block"> <div class="layui-inline">
<input type="text" style="display:inline;width: 101px;" id="startDate" name="startDate" <label class="layui-form-label">申请时间</label>
autocomplete="off" placeholder="开始日期" class="layui-input"> <div class="layui-input-block">
- <input type="text" style="display:inline;width: 101px;" id="startDate"
<input type="text" style="display:inline;width: 101px;" id="endDate" name="endDate" name="startDate"
autocomplete="off" placeholder="结束日期" class="layui-input"> autocomplete="off" placeholder="开始日期" class="layui-input">
</div> -
</div> <input type="text" style="display:inline;width: 101px;" id="endDate"
<div class="layui-inline"> name="endDate"
<label class="layui-form-label">仓库</label> autocomplete="off" placeholder="结束日期" class="layui-input">
<div class="layui-input-block"> </div>
<input type="text" placeholder="请选择仓库" class="layui-input" id="openSonByDepository" </div>
readonly/> <div class="layui-inline">
<input type="text" name="depositoryId" class="layui-input" id="depositoryId" <label class="layui-form-label">仓库</label>
style="display: none"/> <div class="layui-input-block">
</div> <input type="text" placeholder="请选择仓库" class="layui-input"
</div> id="openSonByDepository"
<div class="layui-inline"> readonly/>
<label class="layui-form-label">记录编码</label> <input type="text" name="depositoryId" class="layui-input" id="depositoryId"
<div class="layui-input-block"> style="display: none"/>
<input type="text" class="layui-input" id="code" name="code" autocomplete="off" </div>
placeholder="请输入申请记录编码"/> </div>
</div> <div class="layui-inline">
</div> <label class="layui-form-label">记录编码</label>
<div class="layui-inline"> <div class="layui-input-block">
<label class="layui-form-label">物料名称:</label> <input type="text" class="layui-input" id="code" name="code" autocomplete="off"
<div class="layui-input-block"> placeholder="请输入申请记录编码"/>
<input id="mname" name="mname" type="text" placeholder="请填写物料名称" </div>
class="layui-input"/> </div>
</div> <div class="layui-inline">
</div> <label class="layui-form-label">物料名称:</label>
<div class="layui-inline"> <div class="layui-input-block">
<label class="layui-form-label">物料编码</label> <input id="mname" name="mname" type="text" placeholder="请填写物料名称"
<div class="layui-input-block"> class="layui-input"/>
<input type="text" name="mcode" autocomplete="off" class="layui-input" </div>
placeholder="请填写物料编码"> </div>
</div> <div class="layui-inline">
</div> <label class="layui-form-label">物料编码</label>
<div class="layui-input-block">
<input type="text" name="mcode" autocomplete="off" class="layui-input"
placeholder="请填写物料编码">
</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" <input type="text" class="layui-input" id="version" name="version"
placeholder="请填写物料型号"/> autocomplete="off"
placeholder="请填写物料型号"/>
</div>
</div>
<div class="layui-inline">
<button type="submit" class="layui-btn layui-btn-primary" lay-submit
lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
</button>
</div>
</div> </div>
</div> </form>
<div class="layui-inline">
<button type="submit" class="layui-btn layui-btn-primary" lay-submit
lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
</button>
</div>
</div> </div>
</form> </div>
</div> </div>
</fieldset> </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;
@ -116,13 +125,13 @@
for (let i = 0; i < result.length; i++) { for (let i = 0; i < result.length; i++) {
lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail(' lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail('
+ result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].applicantName+"的出库申请" + '</h2></div>'); + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].applicantName + "的出库申请" + '</h2></div>');
lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">' lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
+'<p style="font-size: large">' + result[i].mname + '</p>' + '<p style="font-size: large">' + result[i].mname + '</p>'
+'<p>' + result[i].mversion + '</p>' + '<p>' + result[i].mversion + '</p>'
+'<p>' + result[i].mbrand + '</p>' + '<p>' + result[i].mbrand + '</p>'
+ '<p>' +result[i].depositoryName + '</p>' + '<p>' + result[i].depositoryName + '</p>'
+ '<p style="text-align: right">' +result[i].applicantTime + '</p>' + '<p style="text-align: right">' + result[i].applicantTime + '</p>'
+ '</div></div></li>'); + '</div></div></li>');
} }
lis.push('</div>'); lis.push('</div>');
@ -225,7 +234,7 @@
}); });
updateFlow = function(req) { updateFlow = function (req) {
$("#LAY_applicationOut").empty(); $("#LAY_applicationOut").empty();
takingPre = 0; takingPre = 0;
flow.load({ flow.load({
@ -236,8 +245,8 @@
req.page = page; req.page = page;
req.size = size; req.size = size;
$.ajax({ $.ajax({
url:"/depositoryRecord/applicationOutView", url: "/depositoryRecord/applicationOutView",
type:"get", type: "get",
data: req, data: req,
dataType: "json", dataType: "json",
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
@ -247,13 +256,13 @@
for (let i = 0; i < result.length; i++) { for (let i = 0; i < result.length; i++) {
lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail(' lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail('
+ result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].applicantName+"的出库申请" + '</h2></div>'); + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].applicantName + "的出库申请" + '</h2></div>');
lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">' lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
+'<p style="font-size: large">' + result[i].mname + '</p>' + '<p style="font-size: large">' + result[i].mname + '</p>'
+'<p>' + result[i].mversion + '</p>' + '<p>' + result[i].mversion + '</p>'
+'<p>' + result[i].mbrand + '</p>' + '<p>' + result[i].mbrand + '</p>'
+ '<p>' +result[i].depositoryName + '</p>' + '<p>' + result[i].depositoryName + '</p>'
+ '<p style="text-align: right">' +result[i].applicantTime + '</p>' + '<p style="text-align: right">' + result[i].applicantTime + '</p>'
+ '</div></div></li>'); + '</div></div></li>');
} }
lis.push('</div>'); lis.push('</div>');
@ -267,7 +276,7 @@
}); });
}; };
showDetail = function(obj){ showDetail = function (obj) {
var index = layer.open({ var index = layer.open({
title: '出库信息详情', title: '出库信息详情',
type: 2, type: 2,

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

@ -12,56 +12,62 @@
<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">
<div style="margin: 10px 10px 10px 10px"> <h2 class="layui-colla-title">搜索</h2>
<form class="layui-form layui-form-pane" action=""> <div class="layui-colla-content">
<div class="layui-form-item"> <div style="margin: 10px 10px 10px 10px">
<form class="layui-form layui-form-pane" action="">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">创建日期</label>
<div class="layui-input-block"> <div class="layui-inline">
<input type="text" name="createTime" id="date" placeholder="请选择创建日期" <label class="layui-form-label">创建日期</label>
autocomplete="off" class="layui-input"> <div class="layui-input-block">
<input type="text" name="createTime" id="date" placeholder="请选择创建日期"
autocomplete="off" class="layui-input">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">组合名称</label>
<div class="layui-input-block">
<input type="text" name="name" autocomplete="off" class="layui-input"
placeholder="请输入组合名称">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">组合编码</label>
<div class="layui-input-block">
<input type="text" name="code" autocomplete="off" class="layui-input"
placeholder="请输入组合编码">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">状态</label>
<div class="layui-input-block">
<select id="state" name="state">
<option value="" selected>请选择状态</option>
<option value="1">启用</option>
<option value="2">禁用</option>
</select>
</div>
</div>
<div class="layui-inline">
<button type="submit" class="layui-btn layui-btn-primary" lay-submit
lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
</button>
</div>
</div> </div>
</div> </form>
<div class="layui-inline">
<label class="layui-form-label">组合名称</label>
<div class="layui-input-block">
<input type="text" name="name" autocomplete="off" class="layui-input" placeholder="请输入组合名称">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">组合编码</label>
<div class="layui-input-block">
<input type="text" name="code" autocomplete="off" class="layui-input" placeholder="请输入组合编码">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">状态</label>
<div class="layui-input-block">
<select id="state" name="state">
<option value="" selected>请选择状态</option>
<option value="1">启用</option>
<option value="2">禁用</option>
</select>
</div>
</div>
<div class="layui-inline">
<button type="submit" class="layui-btn layui-btn-primary" lay-submit
lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
</button>
</div>
</div> </div>
</form> </div>
</div> </div>
</fieldset> </div>
<ul class="flow-default" id="LAY_group"></ul> <ul class="flow-default" id="LAY_group"></ul>
</div> </div>
</div> </div>
@ -71,9 +77,10 @@
<script src="/static/js/Customize/public.js"></script> <script src="/static/js/Customize/public.js"></script>
<script> <script>
// 用于查看并修改组合中的物料信息 // 用于查看并修改组合中的物料信息
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,
@ -101,10 +108,10 @@
lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail(' lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail('
+ result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].gname + '</h2></div>'); + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].gname + '</h2></div>');
lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">' lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
+'<p style="font-size: large">' + result[i].code + '</p>' + '<p style="font-size: large">' + result[i].code + '</p>'
+'<p>' + Object.keys(result[i].materialSimple).toString() + '</p>' + '<p>' + Object.keys(result[i].materialSimple).toString() + '</p>'
+ '<p>' +result[i].remark + '</p>' + '<p>' + result[i].remark + '</p>'
+ '<p style="text-align: right">' +result[i].createTime + '</p>' + '<p style="text-align: right">' + result[i].createTime + '</p>'
+ '</div></div></li>'); + '</div></div></li>');
} }
lis.push('</div>'); lis.push('</div>');
@ -122,13 +129,13 @@
if (data.code !== '') { if (data.code !== '') {
req.code = data.code; req.code = data.code;
} }
if(data.createTime !== ''){ if (data.createTime !== '') {
req.createTime = data.createTime; req.createTime = data.createTime;
} }
if(data.state !== ''){ if (data.state !== '') {
req.state = data.state; req.state = data.state;
} }
if(data.name !== ''){ if (data.name !== '') {
req.gname = data.name; req.gname = data.name;
} }
@ -136,7 +143,7 @@
return false; return false;
}); });
updateFlow = function(req) { updateFlow = function (req) {
$("#LAY_group").empty(); $("#LAY_group").empty();
takingPre = 0; takingPre = 0;
flow.load({ flow.load({
@ -147,8 +154,8 @@
req.page = page; req.page = page;
req.size = size; req.size = size;
$.ajax({ $.ajax({
url:"/group/findAllGroup", url: "/group/findAllGroup",
type:"get", type: "get",
data: req, data: req,
dataType: "json", dataType: "json",
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
@ -160,10 +167,10 @@
lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail(' lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail('
+ result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].gname + '</h2></div>'); + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].gname + '</h2></div>');
lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">' lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
+'<p style="font-size: large">' + result[i].code + '</p>' + '<p style="font-size: large">' + result[i].code + '</p>'
+'<p>' + Object.keys(result[i].materialSimple).toString() + '</p>' + '<p>' + Object.keys(result[i].materialSimple).toString() + '</p>'
+ '<p>' +result[i].remark + '</p>' + '<p>' + result[i].remark + '</p>'
+ '<p style="text-align: right">' +result[i].createTime + '</p>' + '<p style="text-align: right">' + result[i].createTime + '</p>'
+ '</div></div></li>'); + '</div></div></li>');
} }
lis.push('</div>'); lis.push('</div>');
@ -187,8 +194,8 @@
maxmin: true, maxmin: true,
shadeClose: true, shadeClose: true,
area: ['100%', '100%'], area: ['100%', '100%'],
content: '/group_edit?id='+obj, content: '/group_edit?id=' + obj,
end:function () { end: function () {
} }
}); });
$(window).on("resize", function () { $(window).on("resize", function () {

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

@ -19,62 +19,69 @@
<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">
<div style="margin: 10px 10px 10px 10px"> <h2 class="layui-colla-title">搜索</h2>
<form class="layui-form layui-form-pane" action=""> <div class="layui-colla-content">
<div class="layui-form-item"> <div style="margin: 10px 10px 10px 10px">
<form class="layui-form layui-form-pane" action="">
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">种类</label>
<div class="layui-input-block"> <div class="layui-inline">
<input type="text" placeholder="请选择物料类型" class="layui-input" id="openSonByMateralType" <label class="layui-form-label">种类</label>
readonly/> <div class="layui-input-block">
<input type="text" id="materialTypeId" placeholder="请选择物料类型" name="materialTypeId" <input type="text" placeholder="请选择物料类型" class="layui-input"
class="layui-input" style="display: none"/> id="openSonByMateralType"
</div> readonly/>
</div> <input type="text" id="materialTypeId" placeholder="请选择物料类型"
<div class="layui-inline"> name="materialTypeId"
<label class="layui-form-label">物料名称</label> class="layui-input" style="display: none"/>
<div class="layui-input-block"> </div>
<input type="text" name="mname" autocomplete="off" class="layui-input" </div>
placeholder="请输入物料名称"> <div class="layui-inline">
</div> <label class="layui-form-label">物料名称</label>
</div> <div class="layui-input-block">
<div class="layui-inline"> <input type="text" name="mname" autocomplete="off" class="layui-input"
<label class="layui-form-label">型号</label> placeholder="请输入物料名称">
<div class="layui-input-block"> </div>
<input type="text" class="layui-input" id="version" name="version" autocomplete="off" </div>
placeholder="请输入物料型号"/> <div class="layui-inline">
</div> <label class="layui-form-label">型号</label>
</div> <div class="layui-input-block">
<div class="layui-inline"> <input type="text" class="layui-input" id="version" name="version"
<label class="layui-form-label">物料编码</label> autocomplete="off"
<div class="layui-input-block"> placeholder="请输入物料型号"/>
<input type="text" name="code" autocomplete="off" class="layui-input" </div>
placeholder="请输入物料编码"> </div>
<div class="layui-inline">
<label class="layui-form-label">物料编码</label>
<div class="layui-input-block">
<input type="text" name="code" autocomplete="off" class="layui-input"
placeholder="请输入物料编码">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">状态</label>
<div class="layui-input-block">
<select name="state">
<option value="">请选择状态</option>
<option value="1">启用</option>
<option value="2">禁用</option>
</select>
</div>
</div>
<div class="layui-inline">
<button type="submit" class="layui-btn layui-btn-primary" lay-submit
lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
</button>
</div>
</div> </div>
</div> </form>
<div class="layui-inline">
<label class="layui-form-label">状态</label>
<div class="layui-input-block">
<select name="state">
<option value="">请选择状态</option>
<option value="1">启用</option>
<option value="2">禁用</option>
</select>
</div>
</div>
<div class="layui-inline">
<button type="submit" class="layui-btn layui-btn-primary" lay-submit
lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
</button>
</div>
</div> </div>
</form> </div>
</div> </div>
</fieldset> </div>
<ul class="flow-default" id="LAY_material"></ul> <ul class="flow-default" id="LAY_material"></ul>
@ -110,8 +117,7 @@
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,
table = layui.table, table = layui.table,
@ -156,9 +162,9 @@
lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail(' lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail('
+ result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].mname + '</h2></div>'); + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].mname + '</h2></div>');
lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">' lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
+'<p>' + result[i].code + '</p>' + '<p>' + result[i].code + '</p>'
+'<p>' + result[i].version + '</p>' + '<p>' + result[i].version + '</p>'
+ '<p>' + "品牌："+result[i].brand + '</p>' + '<p>' + "品牌：" + result[i].brand + '</p>'
+ '</div></div></li>'); + '</div></div></li>');
} }
lis.push('</div>'); lis.push('</div>');
@ -171,7 +177,6 @@
}); });
// 监听搜索操作 // 监听搜索操作
form.on('submit(data-search-btn)', function (data) { form.on('submit(data-search-btn)', function (data) {
var req = {}; var req = {};
@ -196,7 +201,7 @@
return false; return false;
}); });
updateFlow = function(req) { updateFlow = function (req) {
$("#LAY_material").empty(); $("#LAY_material").empty();
takingPre = 0; takingPre = 0;
flow.load({ flow.load({
@ -207,8 +212,8 @@
req.page = page; req.page = page;
req.size = size; req.size = size;
$.ajax({ $.ajax({
url:"/material/material", url: "/material/material",
type:"get", type: "get",
data: req, data: req,
dataType: "json", dataType: "json",
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
@ -220,9 +225,9 @@
lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail(' lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail('
+ result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].mname + '</h2></div>'); + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].mname + '</h2></div>');
lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">' lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
+'<p>' + result[i].code + '</p>' + '<p>' + result[i].code + '</p>'
+'<p>' + result[i].version + '</p>' + '<p>' + result[i].version + '</p>'
+ '<p>' + "品牌："+result[i].brand + '</p>' + '<p>' + "品牌：" + result[i].brand + '</p>'
+ '</div></div></li>'); + '</div></div></li>');
} }
lis.push('</div>'); lis.push('</div>');
@ -237,7 +242,6 @@
}; };
showDetail = function (obj) { showDetail = function (obj) {
var index = layer.open({ var index = layer.open({
title: '物料信息详情', title: '物料信息详情',

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

@ -12,53 +12,60 @@
<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">
<div style="margin: 10px 10px 10px 10px"> <h2 class="layui-colla-title">搜索</h2>
<form class="layui-form layui-form-pane" action=""> <div class="layui-colla-content">
<div class="layui-form-item"> <div style="margin: 10px 10px 10px 10px">
<form class="layui-form layui-form-pane" action="">
<div class="layui-inline"> <div class="layui-form-item">
<label class="layui-form-label">物料名称：</label>
<div class="layui-input-block"> <div class="layui-inline">
<input type="text" class="layui-input" id="mname" name="mname" autocomplete="off" placeholder="请输入物料名称"/> <label class="layui-form-label">物料名称：</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="mname" name="mname"
autocomplete="off" placeholder="请输入物料名称"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">物料型号：</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="version" name="version"
autocomplete="off" placeholder="请输入物料型号"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">物料编码：</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="mcode" name="mcode"
autocomplete="off" placeholder="请输入物料编码"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">状态</label>
<div class="layui-input-inline">
<select name="state">
<option value="">请选择状态</option>
<option value="1">启用</option>
<option value="2">禁用</option>
</select>
</div>
</div>
<div class="layui-inline">
<button type="submit" class="layui-btn layui-btn-primary" lay-submit
lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
</button>
</div>
</div> </div>
</div> </form>
<div class="layui-inline">
<label class="layui-form-label">物料型号：</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="version" name="version" autocomplete="off" placeholder="请输入物料型号"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">物料编码：</label>
<div class="layui-input-block">
<input type="text" class="layui-input" id="mcode" name="mcode" autocomplete="off" placeholder="请输入物料编码"/>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">状态</label>
<div class="layui-input-inline">
<select name="state">
<option value="">请选择状态</option>
<option value="1">启用</option>
<option value="2">禁用</option>
</select>
</div>
</div>
<div class="layui-inline">
<button type="submit" class="layui-btn layui-btn-primary" lay-submit
lay-filter="data-search-btn"><i class="layui-icon"></i> 搜 索
</button>
</div>
</div> </div>
</form> </div>
</div> </div>
</fieldset> </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 = {};
@ -113,11 +119,11 @@
lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail(' lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail('
+ result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].mname + '</h2></div>'); + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].mname + '</h2></div>');
lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">' lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
+'<p style="font-size: large">' + result[i].mcode + '</p>' + '<p style="font-size: large">' + result[i].mcode + '</p>'
+'<p>' + result[i].version + '</p>' + '<p>' + result[i].version + '</p>'
+ '<p>' +result[i].brand + '</p>' + '<p>' + result[i].brand + '</p>'
+ '<p>' +"旧单位："+result[i].oldUnit + '</p>' + '<p>' + "旧单位：" + result[i].oldUnit + '</p>'
+ '<p>' +"新单位："+result[i].quantity+" : "+result[i].newUnit + '</p>' + '<p>' + "新单位：" + result[i].quantity + " : " + result[i].newUnit + '</p>'
+ '</div></div></li>'); + '</div></div></li>');
} }
lis.push('</div>'); lis.push('</div>');
@ -129,7 +135,7 @@
} }
}); });
updateFlow = function(req) { updateFlow = function (req) {
$("#LAY_splitInfo").empty(); $("#LAY_splitInfo").empty();
takingPre = 0; takingPre = 0;
flow.load({ flow.load({
@ -140,8 +146,8 @@
req.page = page; req.page = page;
req.size = size; req.size = size;
$.ajax({ $.ajax({
url:"/split/split_out", url: "/split/split_out",
type:"get", type: "get",
data: req, data: req,
dataType: "json", dataType: "json",
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
@ -153,11 +159,11 @@
lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail(' lis.push('<li style="width:100%;margin-top: 10px;float:left;border: 1px solid #9999996e;"><div class="layui-card my-shadow my-card flow1" onclick="showDetail('
+ result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].mname + '</h2></div>'); + result[i].id + ')"><div class="layui-card-header"><h2>' + result[i].mname + '</h2></div>');
lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">' lis.push('<div class="layui-col-md4 my-info" style="margin-left: 15px; color: #999;font-size: 15px;">'
+'<p style="font-size: large">' + result[i].mcode + '</p>' + '<p style="font-size: large">' + result[i].mcode + '</p>'
+'<p>' + result[i].version + '</p>' + '<p>' + result[i].version + '</p>'
+ '<p>' +result[i].brand + '</p>' + '<p>' + result[i].brand + '</p>'
+ '<p>' +"旧单位："+result[i].oldUnit + '</p>' + '<p>' + "旧单位：" + result[i].oldUnit + '</p>'
+ '<p>' +"新单位："+result[i].quantity+" : "+result[i].newUnit + '</p>' + '<p>' + "新单位：" + result[i].quantity + " : " + result[i].newUnit + '</p>'
+ '</div></div></li>'); + '</div></div></li>');
} }
lis.push('</div>'); lis.push('</div>');
@ -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