Browse Source

为出库查询页面添加颜色提醒

lwx_dev
erdanergou 2 years ago
parent
commit
e42a6b6b21
  1. 8
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  2. 6
      src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml
  3. 5
      src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java
  4. 31
      src/main/resources/templates/pages/depository/table-in.html
  5. 67
      src/main/resources/templates/pages/depository/table-out.html
  6. 18
      src/test/java/com/dreamchaser/depository_manage/SomeTest.java
  7. 20
      target/classes/templates/pages/BusinessType/businesstype_out.html
  8. 17
      target/classes/templates/pages/application/form-step-look_back.html
  9. 17
      target/classes/templates/pages/application/form-step-look_minRecordOut.html
  10. 21
      target/classes/templates/pages/constructionunit/constructionunit_out.html
  11. 88
      target/classes/templates/pages/depository/table-in.html
  12. 67
      target/classes/templates/pages/depository/table-out.html
  13. 29
      target/classes/templates/pages/depository/table-stock.html
  14. 52
      target/classes/templates/pages/group/group-out.html
  15. 42
      target/classes/templates/pages/materialtype/materialType_view.html
  16. 41
      target/classes/templates/pages/warehouse/depository-out.html

8
src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java

@ -1121,6 +1121,14 @@ public class DepositoryRecordController {
break;
}
}
// 用于判断是否全审批完成
if ("3".equals(outRecordP.getDepartmentheadPass()) || "3".equals(outRecordP.getDepositoryManagerPass()) || (outRecordP.getBalancePosterPass() != null && "3".equals(outRecordP.getBalancePosterPass()))) {
outRecordP.setAllApproval(false);
} else {
outRecordP.setAllApproval(true);
}
outRecordP.setUseAdminorgName(useAdminorgName);
outRecordP.setDepositoryName(depositoryName.toString());
outRecordP.setQuantity(sumQuantity);

6
src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml

@ -638,8 +638,12 @@
and constructionunitid = #{constructionunitid}
</if>
GROUP BY aorid
<if test="groupByForState != null and groupByForState !=''">
ORDER BY pass DESC, applicantTime desc
</if>
<if test="groupByForState == null or groupByForState == ''">
ORDER BY applicantTime desc
</if>
<if test="begin != null and size != null">
LIMIT #{begin},#{size}
</if>

5
src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java

@ -283,6 +283,11 @@ public class ApplicationOutRecordP {
*/
private Integer flagForAgency;
/**
* 用于标志是否全部审批完成
*/
private Boolean allApproval;
/**
* 2代表是通过开放仓库申请1代表不是

31
src/main/resources/templates/pages/depository/table-in.html

@ -100,7 +100,6 @@
</script>
<script type="text/html" id="currentTableBar">
<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete"
th:style="'display:'+${display}">删除</a>
</script>
@ -253,14 +252,20 @@
title: '入库申请',
type: 2,
shade: 0.2,
offset: 'r',
anim: 'slideLeft',
maxmin: true,
shadeClose: true,
area: ['100%', '100%'],
area: ['30%', '100%'],
content: '/application_in',
end:function () {
table.reloadData('currentTableId', {
url: '/depositoryRecord/applicationInView',
where: req
}, 'data');
}
});
$(window).on("resize", function () {
layer.full(index);
});
} else if (obj.event === 'delete') { // 监听删除操作
var checkStatus = table.checkStatus('currentTableId')
, data = checkStatus.data;
@ -316,21 +321,7 @@
table.on('tool(currentTableFilter)', function (obj) {
let data = obj.data;
if (obj.event === 'detail') {
var index = layer.open({
title: '入库信息详情',
type: 2,
shade: 0.2,
maxmin: true,
shadeClose: true,
area: ['100%', '100%'],
content: '/form_step_look?id=' + data.id,
});
$(window).on("resize", function () {
layer.full(index);
});
return false;
} else if (obj.event === 'delete') {
if (obj.event === 'delete') {
var req = {};
req.id = data.id;
layer.confirm('真的删除么', {icon: 2, title: '提示'}, function (index) {

67
src/main/resources/templates/pages/depository/table-out.html

@ -89,7 +89,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"> 添加</button>
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"> 新建</button>
<button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete" id="delete"
th:style="'display:'+${display}"> 删除
</button>
@ -97,9 +97,7 @@
</script>
<script id="applicationOutCode" type="text/html">
<a id="{{d.id}}" onclick="showDetail(this)">{{d.code}}</a>
</script>
<table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
@ -179,7 +177,7 @@
let cols = [
{type: "checkbox", width: 50},
{field: "code", title: '申请编码', width: 150, templet: '#applicationOutCode'},
{field: "code", title: '申请编码', width: 150,},
{field: 'mname', width: 150, title: '物料名称'},
{field: 'mcode', width: 150, title: '存货编码'},
{field: 'quantity', width: 150, title: '数量', sort: true},
@ -238,7 +236,7 @@
pageName: 'page', //页码的参数名称,默认:page
limitName: 'size' //每页数据量的参数名,默认:limit
},
where: {},
where: {"groupByForState":true},
response: {
statusName: 'status' //规定数据状态的字段名称,默认:code
, statusCode: 200 //规定成功的状态码,默认:0
@ -295,11 +293,44 @@
// table.reloadData('currentTableId', {cols: [cols]});
table.reload('currentTableId', {cols: [cols]});
}
}
$.each(res['data'], function (i, j) {
let allApproval = j["allApproval"];
let pass = j["pass"];
if (pass === 3) {
if (allApproval) {
Layui_SetDataTableRowColor('table', i + 1, '#31bdec');
} else {
Layui_SetDataTableRowColor('table', i + 1, '#ffb800');
}
} else if(pass === 1){
Layui_SetDataTableRowColor('table', i + 1, '#16b777');
}else{
Layui_SetDataTableRowColor('table', i + 1, '#ff211e');
}
})
}
});
// 用于给table行上色的方法
function Layui_SetDataTableRowColor(TabDivId, RowIndex, ColorString) {
try {
var div = $("[lay-id='currentTableId'] tr:eq(" + RowIndex + ")");
if (div != null) //找到对象了
{
// console.log(div);
div.css("color", ColorString);
} else {
console.log('没有找到对象');
}
} catch (e) {
console.log(e.message);
}
}
// 监听搜索操作
form.on('submit(data-search-btn)', function (data) {
var req = {};
@ -350,12 +381,17 @@
type: 2,
shade: 0.2,
maxmin: true,
offset: 'r',
anim: 'slideLeft',
shadeClose: true,
area: ['100%', '100%'],
area: ['30%', '100%'],
content: '/application_out',
});
$(window).on("resize", function () {
layer.full(index);
end: function () {
table.reloadData('currentTableId', {
url: '/depositoryRecord/applicationOutView'
, where: req
}, 'data');
}
});
} else if (obj.event === 'delete') { // 监听删除操作
var checkStatus = table.checkStatus('currentTableId')
@ -438,9 +474,12 @@
}
});
//监听表格复选框选择
table.on('checkbox(currentTableFilter)', function (obj) {
console.log(obj)
table.on('rowDouble(currentTableFilter)', function (obj) {
var data = obj.data; // 获取当前行数据
let id = data.id;
let req = {};
req.id = id;
showDetail(req);
});
showDetail = function (obj) {

18
src/test/java/com/dreamchaser/depository_manage/SomeTest.java

@ -241,17 +241,17 @@ public class SomeTest {
ApprovalInfo approvalInfo = new ApprovalInfo();
approvalInfo.setTemplateId("3WKiKVCzyLv3Y1LaHZxp4DimQEpCdvYP52HsAUtF");
approvalInfo.setSpNo("202307060001");
approvalInfo.setSpNo("202307110005");
// 模拟第一个节点(部门负责人)
List<ApprovalInfo_SpRecord> spRecord_list = new ArrayList<>();
ApprovalInfo_SpRecord asr1 = new ApprovalInfo_SpRecord();
asr1.setSpStatus("2");
asr1.setSpStatus("3");
List<ApprovalInfo_Details> approvalInfo_Details1 = new ArrayList<>();
ApprovalInfo_Details ad1 = new ApprovalInfo_Details();
ad1.setSpStatus("2");
ad1.setSpTime("1688601734000");
ad1.setSpStatus("3");
ad1.setSpTime("1689036202000");
ApprovalInfo_Details_Approver approver1 = new ApprovalInfo_Details_Approver();
approver1.setUserId("WoBenShanLiang_3");
ad1.setApprover(approver1);
@ -260,11 +260,11 @@ public class SomeTest {
// 模拟第二个节点(宋倩倩,平衡岗)
ApprovalInfo_SpRecord asr2 = new ApprovalInfo_SpRecord();
asr2.setSpStatus("2");
asr2.setSpStatus("1");
List<ApprovalInfo_Details> approvalInfo_Details2 = new ArrayList<>();
ApprovalInfo_Details ad2 = new ApprovalInfo_Details();
ad2.setSpStatus("2");
ad2.setSpTime("1688602004000");
ad2.setSpStatus("1");
ad2.setSpTime("0");
ApprovalInfo_Details_Approver approver2 = new ApprovalInfo_Details_Approver();
approver2.setUserId("XinPing");
ad2.setApprover(approver2);
@ -300,11 +300,11 @@ public class SomeTest {
spRecord_list.add(asr1);
spRecord_list.add(asr2);
spRecord_list.add(asr3);
// spRecord_list.add(asr3);
// spRecord_list.add(asr4);
approvalInfo.setSpRecord(spRecord_list);
approvalInfo.setStatuChangeEvent("2");
approvalInfo.setStatuChangeEvent("3");
callback(approvalInfo);

20
target/classes/templates/pages/BusinessType/businesstype_out.html

@ -15,8 +15,10 @@
<div class="layuimini-main">
<fieldset class="table-search-fieldset">
<legend>搜索信息</legend>
<div class="layui-collapse">
<div class="layui-colla-item">
<h2 class="layui-colla-title">搜索</h2>
<div class="layui-colla-content">
<div style="margin: 10px 10px 10px 10px">
<form class="layui-form layui-form-pane" action="">
<div class="layui-form-item">
@ -45,7 +47,9 @@
</div>
</form>
</div>
</fieldset>
</div>
</div>
</div>
<!-- 状态展示-->
@ -99,7 +103,7 @@
"data": res.data //解析数据列表
};
},
height: 'full-255',//固定高度-即固定表头固定第一行首行
height: 'full-60',//固定高度-即固定表头固定第一行首行
request: {
pageName: 'page', //页码的参数名称,默认:page
limitName: 'size' //每页数据量的参数名,默认:limit
@ -124,8 +128,8 @@
{title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"}
]
],
limits: [10, 15, 20, 25, 50, 100],
limit: 10,
limits: [15, 30, 45, 60, 100],
limit: 15,
page: true,
skin: 'line'
});
@ -244,8 +248,7 @@
layer.full(index);
});
return false;
}
else if (obj.event === 'delete') {
} else if (obj.event === 'delete') {
layer.confirm('真的删除么', {icon: 2, title: '提示'}, function (index) {
$.ajax({
@ -347,7 +350,6 @@
});
</script>
</body>

17
target/classes/templates/pages/application/form-step-look_back.html

@ -151,8 +151,6 @@
width: '100%', //设置容器宽度
stepWidth: '750px',
height: '100%',
// number:number,
// position: position,
stepItems: []
});
@ -372,17 +370,16 @@
selectThisMinRecord = function (obj) {
// console.log(obj)
var minId = obj.value;
layer.open({
type: 2,
title: '详情',
skin: 'layui-layer-rim',
maxmin: true,
shadeClose: true, //点击遮罩关闭层
area: ['100%', '100%'],
move: '.layui-layer-title',
fixed: false,
title:"详细信息",
offset: 'b',
anim: 'slideUp', // 从上往下
area: ['100%', '65%'],
shade: 0.1,
shadeClose: true,
id: 'ID-demo-layer-direction-t',
content: '/form_step_lookByminRecordOut?id=' + minId,
});
};

17
target/classes/templates/pages/application/form-step-look_minRecordOut.html

@ -15,30 +15,19 @@
<body>
<div class="layuimini-container">
<div class="layuimini-main">
<div class="layui-fluid">
<div class="layui-card">
<div class="layui-card-body" style="padding-top: 40px;">
<div id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
<div style="margin-top: 30px">
<div>
<button th:style="'display:'+${edisplay}" onclick="modifyPage()" id="editInfo">编辑</button>
<input id="id" type="text" th:value="${recordMinP.getId()}" readonly style="display: none">
<table id="demo" class="layui-table"
style="margin: 0 auto;max-width: 800px;padding-top: 40px;">
style="margin: 0 auto;max-width: 800px">
<colgroup>
<col width="150">
<col width="200">
</colgroup>
<tbody>
<tr>
<td>申请编号</td>
<td>
<input id="applicationOutCode" type="text" th:value="${recordMinP.getCode()}"
readonly style="border-style: none;width: 100%;height: 100%">
</td>
</tr>
<tr>
<td>物料名称</td>
<td>
@ -139,8 +128,6 @@
</div>
</div>
</div>
</div>
</div>
</div>
</div>

21
target/classes/templates/pages/constructionunit/constructionunit_out.html

@ -15,8 +15,10 @@
<div class="layuimini-main">
<fieldset class="table-search-fieldset">
<legend>搜索信息</legend>
<div class="layui-collapse">
<div class="layui-colla-item">
<h2 class="layui-colla-title">搜索</h2>
<div class="layui-colla-content">
<div style="margin: 10px 10px 10px 10px">
<form class="layui-form layui-form-pane" action="">
<div class="layui-form-item">
@ -45,8 +47,9 @@
</div>
</form>
</div>
</fieldset>
</div>
</div>
</div>
<!-- 状态展示-->
<script type="text/html" id="switchTpl">
@ -99,7 +102,7 @@
"data": res.data //解析数据列表
};
},
height: 'full-255',//固定高度-即固定表头固定第一行首行
height: 'full-60',//固定高度-即固定表头固定第一行首行
request: {
pageName: 'page', //页码的参数名称,默认:page
limitName: 'size' //每页数据量的参数名,默认:limit
@ -124,8 +127,8 @@
{title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"}
]
],
limits: [10, 15, 20, 25, 50, 100],
limit: 10,
limits: [ 15, 30, 45, 60, 100],
limit: 15,
page: true,
skin: 'line'
});
@ -244,8 +247,7 @@
layer.full(index);
});
return false;
}
else if (obj.event === 'delete') {
} else if (obj.event === 'delete') {
layer.confirm('真的删除么', {icon: 2, title: '提示'}, function (index) {
$.ajax({
@ -347,7 +349,6 @@
});
</script>
</body>

88
target/classes/templates/pages/depository/table-in.html

@ -15,8 +15,10 @@
<div class="layuimini-main">
<fieldset class="table-search-fieldset">
<legend>搜索信息</legend>
<div class="layui-collapse">
<div class="layui-colla-item">
<h2 class="layui-colla-title">搜索</h2>
<div class="layui-colla-content">
<div style="margin: 10px 10px 10px 10px">
<form class="layui-form layui-form-pane" action="">
<input style="display: none" th:value="${type}" id="selectDepositoryType">
@ -24,9 +26,12 @@
<div class="layui-inline">
<label class="layui-form-label">申请时间</label>
<div class="layui-input-block">
<input type="text" style="display:inline;width: 130px;" id="startDate" name="startDate" autocomplete="off" placeholder="开始日期" class="layui-input">
<input type="text" style="display:inline;width: 130px;" id="startDate"
name="startDate" autocomplete="off" placeholder="开始日期"
class="layui-input">
-
<input type="text" style="display:inline;width: 130px;" id="endDate" name="endDate" autocomplete="off" placeholder="结束日期" class="layui-input">
<input type="text" style="display:inline;width: 130px;" id="endDate"
name="endDate" autocomplete="off" placeholder="结束日期" class="layui-input">
</div>
</div>
<div class="layui-inline">
@ -49,19 +54,22 @@
<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="请填写物料编码">
<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="请填写物料型号"/>
<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="请填写申请记录编码"/>
<input type="text" class="layui-input" id="code" name="code" autocomplete="off"
placeholder="请填写申请记录编码"/>
</div>
</div>
<div class="layui-inline">
@ -72,12 +80,16 @@
</div>
</form>
</div>
</fieldset>
</div>
</div>
</div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"> 添加</button>
<button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete" th:style="'display:'+${display}"> 删除</button>
<button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete"
th:style="'display:'+${display}"> 删除
</button>
</div>
</script>
@ -88,8 +100,8 @@
</script>
<script type="text/html" id="currentTableBar">
<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete" th:style="'display:'+${display}">删除</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete"
th:style="'display:'+${display}">删除</a>
</script>
</div>
@ -102,6 +114,7 @@
function selectMaterialByName(obj) {
}
function showDetail() {
}
@ -151,7 +164,7 @@
"data": res.data //解析数据列表
};
},
height: 'full-255',//固定高度-即固定表头固定第一行首行
height: 'full-60',//固定高度-即固定表头固定第一行首行
request: {
pageName: 'page', //页码的参数名称,默认:page
limitName: 'size' //每页数据量的参数名,默认:limit
@ -185,8 +198,8 @@
{title: '操作', minWidth: 150, toolbar: '#currentTableBar', align: "center"}
]
],
limits: [10, 15, 20, 25, 50,100],
limit: 10,
limits: [ 15, 30, 45, 60, 100],
limit: 15,
page: true,
skin: 'line',
done: function () {
@ -239,14 +252,20 @@
title: '入库申请',
type: 2,
shade: 0.2,
offset: 'r',
anim: 'slideLeft',
maxmin: true,
shadeClose: true,
area: ['100%', '100%'],
area: ['30%', '100%'],
content: '/application_in',
end:function () {
table.reloadData('currentTableId', {
url: '/depositoryRecord/applicationInView',
where: req
}, 'data');
}
});
$(window).on("resize", function () {
layer.full(index);
});
} else if (obj.event === 'delete') { // 监听删除操作
var checkStatus = table.checkStatus('currentTableId')
, data = checkStatus.data;
@ -302,22 +321,7 @@
table.on('tool(currentTableFilter)', function (obj) {
let data = obj.data;
if (obj.event === 'detail') {
var index = layer.open({
title: '入库信息详情',
type: 2,
shade: 0.2,
maxmin: true,
shadeClose: true,
area: ['100%', '100%'],
content: '/form_step_look?id=' + data.id,
});
$(window).on("resize", function () {
layer.full(index);
});
return false;
}
else if (obj.event === 'delete') {
if (obj.event === 'delete') {
var req = {};
req.id = data.id;
layer.confirm('真的删除么', {icon: 2, title: '提示'}, function (index) {
@ -369,19 +373,17 @@
showDetail = function (obj) {
var index = layer.open({
title: '入库信息详情',
layer.open({
type: 2,
shade: 0.2,
maxmin: true,
offset: 'r',
anim: 'slideLeft', // 从右往左
area: ['30%', '100%'],
shade: 0.1,
title: "入库信息详情",
shadeClose: true,
area: ['100%', '100%'],
id: 'applicationOutInfoForLeft',
content: '/form_step_look?id=' + obj.id,
});
$(window).on("resize", function () {
layer.full(index);
});
return false;
};
$('body').on('click', '[data-refresh]', function () {

67
target/classes/templates/pages/depository/table-out.html

@ -89,7 +89,7 @@
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"> 添加</button>
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"> 新建</button>
<button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete" id="delete"
th:style="'display:'+${display}"> 删除
</button>
@ -97,9 +97,7 @@
</script>
<script id="applicationOutCode" type="text/html">
<a id="{{d.id}}" onclick="showDetail(this)">{{d.code}}</a>
</script>
<table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
@ -179,7 +177,7 @@
let cols = [
{type: "checkbox", width: 50},
{field: "code", title: '申请编码', width: 150, templet: '#applicationOutCode'},
{field: "code", title: '申请编码', width: 150,},
{field: 'mname', width: 150, title: '物料名称'},
{field: 'mcode', width: 150, title: '存货编码'},
{field: 'quantity', width: 150, title: '数量', sort: true},
@ -238,7 +236,7 @@
pageName: 'page', //页码的参数名称,默认:page
limitName: 'size' //每页数据量的参数名,默认:limit
},
where: {},
where: {"groupByForState":true},
response: {
statusName: 'status' //规定数据状态的字段名称,默认:code
, statusCode: 200 //规定成功的状态码,默认:0
@ -295,11 +293,44 @@
// table.reloadData('currentTableId', {cols: [cols]});
table.reload('currentTableId', {cols: [cols]});
}
}
$.each(res['data'], function (i, j) {
let allApproval = j["allApproval"];
let pass = j["pass"];
if (pass === 3) {
if (allApproval) {
Layui_SetDataTableRowColor('table', i + 1, '#31bdec');
} else {
Layui_SetDataTableRowColor('table', i + 1, '#ffb800');
}
} else if(pass === 1){
Layui_SetDataTableRowColor('table', i + 1, '#16b777');
}else{
Layui_SetDataTableRowColor('table', i + 1, '#ff211e');
}
})
}
});
// 用于给table行上色的方法
function Layui_SetDataTableRowColor(TabDivId, RowIndex, ColorString) {
try {
var div = $("[lay-id='currentTableId'] tr:eq(" + RowIndex + ")");
if (div != null) //找到对象了
{
// console.log(div);
div.css("color", ColorString);
} else {
console.log('没有找到对象');
}
} catch (e) {
console.log(e.message);
}
}
// 监听搜索操作
form.on('submit(data-search-btn)', function (data) {
var req = {};
@ -350,12 +381,17 @@
type: 2,
shade: 0.2,
maxmin: true,
offset: 'r',
anim: 'slideLeft',
shadeClose: true,
area: ['100%', '100%'],
area: ['30%', '100%'],
content: '/application_out',
});
$(window).on("resize", function () {
layer.full(index);
end: function () {
table.reloadData('currentTableId', {
url: '/depositoryRecord/applicationOutView'
, where: req
}, 'data');
}
});
} else if (obj.event === 'delete') { // 监听删除操作
var checkStatus = table.checkStatus('currentTableId')
@ -438,9 +474,12 @@
}
});
//监听表格复选框选择
table.on('checkbox(currentTableFilter)', function (obj) {
console.log(obj)
table.on('rowDouble(currentTableFilter)', function (obj) {
var data = obj.data; // 获取当前行数据
let id = data.id;
let req = {};
req.id = id;
showDetail(req);
});
showDetail = function (obj) {

29
target/classes/templates/pages/depository/table-stock.html

@ -13,9 +13,10 @@
<body>
<div class="layuimini-container">
<div class="layuimini-main">
<fieldset class="table-search-fieldset">
<legend>搜索信息</legend>
<div class="layui-collapse">
<div class="layui-colla-item">
<h2 class="layui-colla-title">搜索</h2>
<div class="layui-colla-content">
<div style="margin: 10px 10px 10px 10px">
<input style="display: none" th:value="${number}" id="number">
<input style="display: none" th:value="${display}" id="display">
@ -25,7 +26,8 @@
<div class="layui-inline">
<label class="layui-form-label">仓库</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择仓库" class="layui-input" id="openSonByDepository"
<input type="text" placeholder="请选择仓库" class="layui-input"
id="openSonByDepository"
readonly/>
<input type="text" name="depositoryId" class="layui-input" id="depositoryId"
style="display: none"/>
@ -35,9 +37,11 @@
<div class="layui-inline">
<label class="layui-form-label">类型</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择物料类型" class="layui-input" id="openSonByMateralType"
<input type="text" placeholder="请选择物料类型" class="layui-input"
id="openSonByMateralType"
readonly/>
<input type="text" id="materialTypeId" placeholder="请选择物料类型" name="materialTypeId"
<input type="text" id="materialTypeId" placeholder="请选择物料类型"
name="materialTypeId"
class="layui-input" style="display: none"/>
</div>
</div>
@ -58,7 +62,8 @@
<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"
<input type="text" class="layui-input" id="version" name="version"
autocomplete="off"
placeholder="请填写物料型号"/>
</div>
</div>
@ -71,7 +76,9 @@
</div>
</form>
</div>
</fieldset>
</div>
</div>
</div>
<script id="toolbarDemo" type="text/html">
<div class="layui-btn-container">
@ -238,7 +245,7 @@
"data": res.data //解析数据列表
};
},
height: 'full-255',//固定高度-即固定表头固定第一行首行
height: 'full-60',//固定高度-即固定表头固定第一行首行
request: {
pageName: 'page', //页码的参数名称,默认:page
limitName: 'size' //每页数据量的参数名,默认:limit
@ -271,8 +278,8 @@
{title: '操作', minWidth: 250, toolbar: '#currentTableBar', align: "center"}
]
],
limits: [10, 20, 50, 100],
limit: 10,
limits: [15, 30, 45, 100],
limit: 15,
page: true,
skin: 'line',
done: function (res, curr, count) {

52
target/classes/templates/pages/group/group-out.html

@ -17,14 +17,20 @@
<script id="toolbarDemo" type="text/html">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add" th:style="'display:'+${display}">创建</button>
<button class="layui-btn layui-btn-danger layui-btn-sm data-delete-btn" lay-event="delete" th:style="'display:'+${display}">删除</button>
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"
th:style="'display:'+${display}">创建
</button>
<button class="layui-btn layui-btn-danger layui-btn-sm data-delete-btn" lay-event="delete"
th:style="'display:'+${display}">删除
</button>
<button class="layui-btn layui-btn-sm " lay-event="applicationOutAdd">添加</button>
<button class="layui-btn layui-btn-warm layui-btn-sm " lay-event="dispose">处理</button>
</div>
</script>
<fieldset class="table-search-fieldset">
<legend>搜索信息</legend>
<div class="layui-collapse">
<div class="layui-colla-item">
<h2 class="layui-colla-title">搜索</h2>
<div class="layui-colla-content">
<div style="margin: 10px 10px 10px 10px">
<form class="layui-form layui-form-pane" action="">
<div class="layui-form-item">
@ -41,7 +47,8 @@
<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="请输入组合名称">
<input type="text" name="name" autocomplete="off" class="layui-input"
placeholder="请输入组合名称">
</div>
</div>
@ -49,7 +56,8 @@
<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="请输入组合编码">
<input type="text" name="code" autocomplete="off" class="layui-input"
placeholder="请输入组合编码">
</div>
</div>
@ -72,7 +80,9 @@
</div>
</form>
</div>
</fieldset>
</div>
</div>
</div>
<!-- 状态展示-->
@ -88,7 +98,8 @@
<script type="text/html" id="currentTableBar">
<a class="layui-btn layui-btn-normal layui-btn-xs data-count-edit" lay-event="detail">详情</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete" th:style="'display:'+${display}">删除</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" lay-event="delete"
th:style="'display:'+${display}">删除</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}" id="display"
lay-event="realDelete">彻底删除</a>
</script>
@ -104,6 +115,7 @@
function checkSeeGroup() {
}
layui.use(['form', 'table', 'laydate'], function () {
var $ = layui.jquery,
form = layui.form,
@ -127,7 +139,7 @@
"data": res.data //解析数据列表
};
},
height: 'full-255',//固定高度-即固定表头固定第一行首行
height: 'full-60',//固定高度-即固定表头固定第一行首行
request: {
pageName: 'page', //页码的参数名称,默认:page
limitName: 'size' //每页数据量的参数名,默认:limit
@ -154,8 +166,8 @@
{title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"},
]
],
limits: [10, 15, 20, 25, 50, 100],
limit: 10,
limits: [15, 30, 45, 60, 100],
limit: 15,
page: true,
skin: 'line',
done: function (res, curr, count) {
@ -270,8 +282,7 @@
$(window).on("resize", function () {
layer.full(index);
});
}
else if (obj.event === 'delete') {
} else if (obj.event === 'delete') {
var req = {};
req.id = data.id;
layer.confirm('真的删除么', {icon: 2, title: '提示'}, function (index) {
@ -303,8 +314,7 @@
}
})
});
}
else if (obj.event === 'realDelete') { //彻底删除
} else if (obj.event === 'realDelete') { //彻底删除
layer.confirm('该操作将无法挽回', {icon: 2, title: '提示'}, function (index) {
var req = {};
req.id = data.id;
@ -336,8 +346,7 @@
}
})
})
}
else if (obj.event === 'applicationOut'){
} else if (obj.event === 'applicationOut') {
let gid = data.id;
var index1 = layer.open({
@ -352,8 +361,7 @@
$(window).on("resize", function () {
layer.full(index1);
});
}
else if (obj.event === 'applicationIn'){
} else if (obj.event === 'applicationIn') {
let gid = data.id;
var index2 = layer.open({
@ -460,8 +468,7 @@
}
});
}
else if(obj.event === 'delete') {
} else if (obj.event === 'delete') {
var checkStatus = table.checkStatus('currentTableId')
, data = checkStatus.data;
var req = {};
@ -503,8 +510,7 @@
layer.msg("未选中记录,请确认!");
return false;
}
}
else if(obj.event === 'applicationOutAdd'){
} else if (obj.event === 'applicationOutAdd') {
// 如果点击的是添加出库记录
var checkStatus = table.checkStatus('currentTableId')
, data = checkStatus.data;

42
target/classes/templates/pages/materialtype/materialType_view.html

@ -15,8 +15,10 @@
<div class="layuimini-main">
<fieldset class="table-search-fieldset">
<legend>搜索信息</legend>
<div class="layui-collapse">
<div class="layui-colla-item">
<h2 class="layui-colla-title">搜索</h2>
<div class="layui-colla-content">
<div style="margin: 10px 10px 10px 10px">
<form class="layui-form layui-form-pane" action="">
<input id="parentId" style="display: none" th:value="${parentId}">
@ -52,7 +54,9 @@
</div>
</form>
</div>
</fieldset>
</div>
</div>
</div>
<!-- 状态展示-->
@ -133,7 +137,7 @@
"data": res.data //解析数据列表
};
},
height: 'full-255',//固定高度-即固定表头固定第一行首行
height: 'full-60',//固定高度-即固定表头固定第一行首行
request: {
pageName: 'page', //页码的参数名称,默认:page
limitName: 'size' //每页数据量的参数名,默认:limit
@ -160,8 +164,8 @@
{title: '操作', minWidth: 200, toolbar: '#currentTableBar', align: "center"}
]
],
limits: [10, 15, 20, 25, 50, 100],
limit: 10,
limits: [15, 30, 45, 60, 100],
limit: 15,
page: true,
skin: 'line',
done: function () {
@ -209,8 +213,7 @@
$(window).on("resize", function () {
layer.full(index);
});
}
else if (obj.event === 'delete') { // 监听删除操作
} else if (obj.event === 'delete') { // 监听删除操作
var checkStatus = table.checkStatus('currentTableId')
, data = checkStatus.data;
var req = {};
@ -255,8 +258,7 @@
layer.msg("未选中记录,请确认!");
return false;
}
}
else if (obj.event === 'downloadFile') {
} else if (obj.event === 'downloadFile') {
window.open("/download/materialTypeImportDownload", "_self");
}
});
@ -354,7 +356,13 @@
//按钮【按钮一】的回调
if (flagForImport) {
flagForImport = false;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0,shadeClose:true});
let loading2 = layer.open({
type: 3,
shade: [0.25, '#000'],
icon: 2,
speed: 0,
shadeClose: true
});
$.ajax({
url: "/excel/realImportMaterialType",
@ -408,7 +416,6 @@
});
} else {
layer.msg(res.msg)
}
@ -425,8 +432,6 @@
}
closeShowDataMessage = function () {
$("#layui-layer-shade-x" + newIndexShade).remove();
$("#showImportData").hide();
@ -469,8 +474,7 @@
layer.full(index);
});
return false;
}
else if (obj.event === 'delete') {
} else if (obj.event === 'delete') {
var req = {};
req.id = data.oldId;
$.ajax({
@ -614,8 +618,7 @@
}
req["id"] = this.value;
var hasMaterial = false;
if (req["state"] === undefined)
{ //如果禁用
if (req["state"] === undefined) { //如果禁用
$.ajax({
url: "/materialType/findMaterialByMaterialTypeId", // 判断该类型下是否有物品
type: "post",
@ -703,8 +706,7 @@
}
}
})
}
else { // 如果启用
} else { // 如果启用
$.ajax({
url: "/materialType/EditMaterialTypeState",
type: 'post',

41
target/classes/templates/pages/warehouse/depository-out.html

@ -16,8 +16,10 @@
<div class="layuimini-main">
<fieldset class="table-search-fieldset">
<legend>搜索信息</legend>
<div class="layui-collapse">
<div class="layui-colla-item">
<h2 class="layui-colla-title">搜索</h2>
<div class="layui-colla-content">
<div style="margin: 10px 10px 10px 10px">
<form action="" class="layui-form layui-form-pane">
<div class="layui-form-item">
@ -28,7 +30,8 @@
<select name="depositoryId">
<option selected value="">请选择仓库</option>
<option th:each="depository,iterStar:${depositories}"
th:text="${depository?.getDname()}" th:value="${depository?.getId()}">外芯仓库
th:text="${depository?.getDname()}"
th:value="${depository?.getId()}">外芯仓库
</option>
</select>
</div>
@ -57,7 +60,9 @@
</div>
</form>
</div>
</fieldset>
</div>
</div>
</div>
<!-- 状态展示-->
<script id="switchTpl" type="text/html">
@ -76,8 +81,12 @@
<script id="toolbarDemo" type="text/html">
<div class="layui-btn-container">
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add" th:style="'display:'+${display}" id="display"> 添加</button>
<button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete" th:style="'display:'+${display}"> 删除</button>
<button class="layui-btn layui-btn-normal layui-btn-sm data-add-btn" lay-event="add"
th:style="'display:'+${display}" id="display"> 添加
</button>
<button class="layui-btn layui-btn-sm layui-btn-danger data-delete-btn" lay-event="delete"
th:style="'display:'+${display}"> 删除
</button>
</div>
</script>
@ -86,7 +95,8 @@
<script id="currentTableBar" type="text/html">
<a class="layui-btn layui-btn-normal layui-btn-xs data-count-subclass" lay-event="subclass">子仓</a>
<a class="layui-btn layui-btn-xs data-count-edit" lay-event="detail">详情</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}" lay-event="delete">删除</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}"
lay-event="delete">删除</a>
<a class="layui-btn layui-btn-xs layui-btn-danger data-count-delete" th:style="'display:'+${display}"
lay-event="realDelete">彻底删除</a>
</script>
@ -98,6 +108,7 @@
function showDetail() {
}
layui.use(['form', 'table'], function () {
var $ = layui.jquery,
form = layui.form,
@ -114,7 +125,7 @@
"data": res.data //解析数据列表
};
},
height: 'full-165',//固定高度-即固定表头固定第一行首行
height: 'full-60',//固定高度-即固定表头固定第一行首行
request: {
pageName: 'page', //页码的参数名称,默认:page
limitName: 'size' //每页数据量的参数名,默认:limit
@ -147,8 +158,8 @@
{title: '操作', minWidth: 250, toolbar: '#currentTableBar', align: "center"}
]
],
limits: [10, 15, 20, 25, 50,100],
limit: 10,
limits: [13, 26, 39, 52, 100],
limit: 13,
page: true,
skin: 'line',
done: function () {
@ -266,8 +277,7 @@
}
}
});
}
else{
} else {
layer.msg("未选中记录,请确认!");
return false;
}
@ -525,8 +535,7 @@
where: {"parentId": parentId}
});
});
}
else {
} else {
layer.confirm('确定封库?', {
btn: ['确定', '取消']
},
@ -577,8 +586,7 @@
}
}
})
}
else { // 如果启用
} else { // 如果启用
$.ajax({
url: "/repository/EditDepositoryState",
type: 'post',
@ -615,7 +623,6 @@
}
});
showDetail = function (obj) {

Loading…
Cancel
Save