");
@@ -182,26 +179,53 @@
req.version = data.version.trim();
}
+ updateFlow(req);
+ //执行搜索重载
+ return false;
});
- //用于实现物料名称搜索
- selectMaterialByName = function (obj) {
- // 输入code
- var data = obj.value;
- // 获取对应元素
- var req = {};
- layer.open({
- type: 2,
- title: '弹窗内容',
- skin: 'layui-layer-rim',
- maxmin: true,
- shadeClose: true, //点击遮罩关闭层
- area: ['70%', '70%'],
- content: '/getMaterialAll?type=1&mname=""',
- move: '.layui-layer-title',
- fixed: false
+ updateFlow = function(req) {
+ $("#LAY_applicationIn").empty();
+ takingPre = 0;
+ flow.load({
+ elem: '#LAY_applicationIn' //流加载容器
+ , done: function (page, next) { //执行下一页的回调
+ let result = [];
+ let lis = [];
+ req.page = page;
+ req.size = size;
+ $.ajax({
+ url:"/depositoryRecord/applicationInView",
+ type:"get",
+ data: req,
+ dataType: "json",
+ contentType: "application/json;charset=utf-8",
+ success: function (res) {
+
+ result = res.data;
+ lis.push("
");
+ for (let i = 0; i < result.length; i++) {
+ lis.push('
');
+ lis.push('
'
+ +'
' + result[i].mname + '
'
+ +'
' + result[i].mversion + '
'
+ +'
' + result[i].mbrand + '
'
+ +'
' + result[i].quantity+" : "+result[i].airUnit + '
'
+ + '
' +result[i].depositoryName + '
'
+ + '
' +result[i].applicantTime + '
'
+ + '
');
+ }
+ lis.push('
');
+ takingPre += result.length;
+ //执行下一页渲染,第二参数为:满足“加载更多”的条件,即后面仍有分页
+ //pages为Ajax返回的总页数,只有当前页小于总页数的情况下,才会继续出现加载更多
+ next(lis.join(''), takingPre < res.count);
+ }
+ });
+ }
});
};
diff --git a/src/main/resources/templates/pages/depository/table-out_mobile.html b/src/main/resources/templates/pages/depository/table-out_mobile.html
index 63250230..fe3494ea 100644
--- a/src/main/resources/templates/pages/depository/table-out_mobile.html
+++ b/src/main/resources/templates/pages/depository/table-out_mobile.html
@@ -220,16 +220,53 @@
req.version = data.version.trim();
}
//执行搜索重载
- table.reload('currentTableId', {
- url: '/depositoryRecord/applicationOutView',
- page: {
- curr: 1
- }
- , where: req
- }, 'data');
+ updateFlow(req);
return false;
});
+
+ updateFlow = function(req) {
+ $("#LAY_applicationOut").empty();
+ takingPre = 0;
+ flow.load({
+ elem: '#LAY_applicationOut' //流加载容器
+ , done: function (page, next) { //执行下一页的回调
+ let result = [];
+ let lis = [];
+ req.page = page;
+ req.size = size;
+ $.ajax({
+ url:"/depositoryRecord/applicationOutView",
+ type:"get",
+ data: req,
+ dataType: "json",
+ contentType: "application/json;charset=utf-8",
+ success: function (res) {
+ result = res.data;
+ lis.push("
");
+ for (let i = 0; i < result.length; i++) {
+
+ lis.push('
');
+ lis.push('
'
+ +'
' + result[i].mname + '
'
+ +'
' + result[i].mversion + '
'
+ +'
' + result[i].mbrand + '
'
+ + '
' +result[i].depositoryName + '
'
+ + '
' +result[i].applicantTime + '
'
+ + '
');
+ }
+ lis.push('
');
+ takingPre += result.length;
+ //执行下一页渲染,第二参数为:满足“加载更多”的条件,即后面仍有分页
+ //pages为Ajax返回的总页数,只有当前页小于总页数的情况下,才会继续出现加载更多
+ next(lis.join(''), takingPre < res.count);
+ }
+ });
+ }
+ });
+ };
+
showDetail = function(obj){
var index = layer.open({
title: '出库信息详情',
diff --git a/src/main/resources/templates/pages/depository/table-stock_mobile.html b/src/main/resources/templates/pages/depository/table-stock_mobile.html
index 9e1ee363..3c34a9f1 100644
--- a/src/main/resources/templates/pages/depository/table-stock_mobile.html
+++ b/src/main/resources/templates/pages/depository/table-stock_mobile.html
@@ -131,7 +131,6 @@
layui.use(['form', 'upload', 'flow', 'element'], function () {
var $ = layui.jquery,
form = layui.form,
- upload = layui.upload,
flow = layui.flow,
element = layui.element;
diff --git a/src/main/resources/templates/pages/group/group-out_mobile.html b/src/main/resources/templates/pages/group/group-out_mobile.html
index 69b409e3..4230ccee 100644
--- a/src/main/resources/templates/pages/group/group-out_mobile.html
+++ b/src/main/resources/templates/pages/group/group-out_mobile.html
@@ -132,17 +132,51 @@
req.gname = data.name;
}
- //执行搜索重载
- table.reload('currentTableId', {
- url: '/group/findAllGroup',
- page: {
- curr: 1
- },
- where: req
- }, 'data');
+ updateFlow(req);
return false;
});
+ updateFlow = function(req) {
+ $("#LAY_group").empty();
+ takingPre = 0;
+ flow.load({
+ elem: '#LAY_group' //流加载容器
+ , done: function (page, next) { //执行下一页的回调
+ let result;
+ let lis = [];
+ req.page = page;
+ req.size = size;
+ $.ajax({
+ url:"/group/findAllGroup",
+ type:"get",
+ data: req,
+ dataType: "json",
+ contentType: "application/json;charset=utf-8",
+ success: function (res) {
+ result = res.data;
+ lis.push("
");
+ for (let i = 0; i < result.length; i++) {
+
+ lis.push('
');
+ lis.push('
'
+ +'
' + result[i].code + '
'
+ +'
' + Object.keys(result[i].materialSimple).toString() + '
'
+ + '
' +result[i].remark + '
'
+ + '
' +result[i].createTime + '
'
+ + '
');
+ }
+ lis.push('
');
+ takingPre += result.length;
+ //执行下一页渲染,第二参数为:满足“加载更多”的条件,即后面仍有分页
+ //pages为Ajax返回的总页数,只有当前页小于总页数的情况下,才会继续出现加载更多
+ next(lis.join(''), takingPre < res.count);
+ }
+ });
+ }
+ });
+ };
+
//用于查看并修改组合中的物料信息
showDetail = function (obj) {
diff --git a/src/main/resources/templates/pages/material/material-out_mobile.html b/src/main/resources/templates/pages/material/material-out_mobile.html
index 8d0340d4..4d1b00e4 100644
--- a/src/main/resources/templates/pages/material/material-out_mobile.html
+++ b/src/main/resources/templates/pages/material/material-out_mobile.html
@@ -192,10 +192,52 @@
if (data.code !== '') {
req.code = data.code
}
-
+ updateFlow(req);
return false;
});
+ updateFlow = function(req) {
+ $("#LAY_material").empty();
+ takingPre = 0;
+ flow.load({
+ elem: '#LAY_material' //流加载容器
+ , done: function (page, next) { //执行下一页的回调
+ let result;
+ let lis = [];
+ req.page = page;
+ req.size = size;
+ $.ajax({
+ url:"/material/material",
+ type:"get",
+ data: req,
+ dataType: "json",
+ contentType: "application/json;charset=utf-8",
+ success: function (res) {
+ result = res.data;
+ lis.push("
");
+ for (let i = 0; i < result.length; i++) {
+
+ lis.push('
');
+ lis.push('
'
+ +'
' + result[i].code + '
'
+ +'
' + result[i].version + '
'
+ + '
' + "品牌:"+result[i].brand + '
'
+ + '
');
+ }
+ lis.push('
');
+ takingPre += result.length;
+ //执行下一页渲染,第二参数为:满足“加载更多”的条件,即后面仍有分页
+ //pages为Ajax返回的总页数,只有当前页小于总页数的情况下,才会继续出现加载更多
+ next(lis.join(''), takingPre < res.count);
+ }
+ });
+ }
+ });
+ };
+
+
+
showDetail = function (obj) {
var index = layer.open({
title: '物料信息详情',
diff --git a/src/main/resources/templates/pages/split/split-out_mobile.html b/src/main/resources/templates/pages/split/split-out_mobile.html
index 12730166..77ae4511 100644
--- a/src/main/resources/templates/pages/split/split-out_mobile.html
+++ b/src/main/resources/templates/pages/split/split-out_mobile.html
@@ -95,14 +95,7 @@
req.version = data.version
}
- //执行搜索重载
- table.reload('currentTableId', {
- url: '/split/split_out',
- page: {
- curr: 1
- },
- where: req
- }, 'data');
+ updateFlow(req);
return false;
});
@@ -136,6 +129,48 @@
}
});
+ updateFlow = function(req) {
+ $("#LAY_splitInfo").empty();
+ takingPre = 0;
+ flow.load({
+ elem: '#LAY_splitInfo' //流加载容器
+ , done: function (page, next) { //执行下一页的回调
+ let result;
+ let lis = [];
+ req.page = page;
+ req.size = size;
+ $.ajax({
+ url:"/split/split_out",
+ type:"get",
+ data: req,
+ dataType: "json",
+ contentType: "application/json;charset=utf-8",
+ success: function (res) {
+ result = res.data;
+ lis.push("
");
+ for (let i = 0; i < result.length; i++) {
+
+ lis.push('
');
+ lis.push('
'
+ +'
' + result[i].mcode + '
'
+ +'
' + result[i].version + '
'
+ + '
' +result[i].brand + '
'
+ + '
' +"旧单位:"+result[i].oldUnit + '
'
+ + '
' +"新单位:"+result[i].quantity+" : "+result[i].newUnit + '
'
+ + '
');
+ }
+ lis.push('
');
+ takingPre += result.length;
+ //执行下一页渲染,第二参数为:满足“加载更多”的条件,即后面仍有分页
+ //pages为Ajax返回的总页数,只有当前页小于总页数的情况下,才会继续出现加载更多
+ next(lis.join(''), takingPre < res.count);
+ }
+ });
+ }
+ });
+ };
+
showDetail = function (obj) {
diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
index c4045d98..e0ad3769 100644
--- a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
+++ b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
@@ -612,8 +612,9 @@
#{id}
- or applicantId = #{applicantId} )
+ or applicantId = #{applicantId}
+ )
@@ -663,8 +664,9 @@
#{id}
- or applicantId = #{applicantId} )
+ or applicantId = #{applicantId}
+ )