|
|
@ -48,7 +48,9 @@ |
|
|
<table class="table"> |
|
|
<table class="table"> |
|
|
<tbody> |
|
|
<tbody> |
|
|
<tr> |
|
|
<tr> |
|
|
<td id="mcode" th:attr="mcode=${record.getCode()}" th:text="'物料编码：'+${record.getCode()}">物料编码：</td> |
|
|
<td id="mcode" th:attr="mcode=${record.getCode()}" |
|
|
|
|
|
th:text="'物料编码：'+${record.getCode()}">物料编码： |
|
|
|
|
|
</td> |
|
|
<td th:text="'物料名称：'+${record.getMname()}">物料名称：</td> |
|
|
<td th:text="'物料名称：'+${record.getMname()}">物料名称：</td> |
|
|
<td th:text="'规格型号：'+${record.getVersion()}">规格型号：</td> |
|
|
<td th:text="'规格型号：'+${record.getVersion()}">规格型号：</td> |
|
|
<td th:text="'物料材质：'+${record.getTexture()}">物料材质：</td> |
|
|
<td th:text="'物料材质：'+${record.getTexture()}">物料材质：</td> |
|
|
@ -143,10 +145,15 @@ |
|
|
<div class="tab-pane fade" id="applicationOutEchart"> |
|
|
<div class="tab-pane fade" id="applicationOutEchart"> |
|
|
<div class="layui-col-xs4 myEchart"> |
|
|
<div class="layui-col-xs4 myEchart"> |
|
|
<div class="panel panel-warning"> |
|
|
<div class="panel panel-warning"> |
|
|
|
|
|
|
|
|
<div class="panel-body "> |
|
|
<div class="panel-body "> |
|
|
|
|
|
<div class="layui-code-tools"><i class="layui-icon layui-icon-screen-full" data-type="full" title="最大化显示"></i></div> |
|
|
<div id="echarts-line-out" style="height: 500px;width: 500px"> |
|
|
<div id="echarts-line-out" style="height: 500px;width: 500px"> |
|
|
</div> |
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</div> |
|
|
</div> |
|
|
|
|
|
|
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
|
|
|
|
|
|
@ -163,6 +170,7 @@ |
|
|
|
|
|
|
|
|
</div> |
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<script type="text/html" id="currentTableBar"> |
|
|
<script type="text/html" id="currentTableBar"> |
|
|
<div class="layui-clear-space"> |
|
|
<div class="layui-clear-space"> |
|
|
<a class="layui-btn layui-btn-xs" id="applicationIn{{d.id}}" |
|
|
<a class="layui-btn layui-btn-xs" id="applicationIn{{d.id}}" |
|
|
@ -191,7 +199,7 @@ |
|
|
</select> |
|
|
</select> |
|
|
</script> |
|
|
</script> |
|
|
|
|
|
|
|
|
<script type="text/html" id="quantityItem"> |
|
|
<script type="text/html" id="quantityInfoItem"> |
|
|
<span class="layui-badge-rim" id="quantity{{d.id}}" style="margin-right: 10px;">库存数：{{d.materialAndPlaceList[0].inventory}}</span> |
|
|
<span class="layui-badge-rim" id="quantity{{d.id}}" style="margin-right: 10px;">库存数：{{d.materialAndPlaceList[0].inventory}}</span> |
|
|
<span th:style="'display:'+${display == 'block' ? 'inline':'none'}" class="layui-badge-rim" id="amount{{d.id}}" |
|
|
<span th:style="'display:'+${display == 'block' ? 'inline':'none'}" class="layui-badge-rim" id="amount{{d.id}}" |
|
|
style="margin-right: 10px;">总金额：{{d.materialAndPlaceList[0].amount}}</span> |
|
|
style="margin-right: 10px;">总金额：{{d.materialAndPlaceList[0].amount}}</span> |
|
|
@ -202,8 +210,13 @@ |
|
|
<script src="/static/lib/bootstrap-3.4.1-dist/js/bootstrap.min.js" charset="utf-8"></script> |
|
|
<script src="/static/lib/bootstrap-3.4.1-dist/js/bootstrap.min.js" charset="utf-8"></script> |
|
|
<script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script> |
|
|
<script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script> |
|
|
<script src="/static/lib/echarts/echarts.js" charset="utf-8"></script> |
|
|
<script src="/static/lib/echarts/echarts.js" charset="utf-8"></script> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<script> |
|
|
<script> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function updateInventoryRemark() { |
|
|
function updateInventoryRemark() { |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
@ -236,6 +249,8 @@ |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var barCode = []; |
|
|
var barCode = []; |
|
|
var flag = false; |
|
|
var flag = false; |
|
|
layui.use(['form', 'laydate', 'util', 'table'], function () { |
|
|
layui.use(['form', 'laydate', 'util', 'table'], function () { |
|
|
@ -244,6 +259,9 @@ |
|
|
$ = layui.$, |
|
|
$ = layui.$, |
|
|
table = layui.table, |
|
|
table = layui.table, |
|
|
util = layui.util; |
|
|
util = layui.util; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let iremark = $("#iremark").val(); |
|
|
let iremark = $("#iremark").val(); |
|
|
let mid = $("#id").val(); |
|
|
let mid = $("#id").val(); |
|
|
// 选中第一个导航 |
|
|
// 选中第一个导航 |
|
|
@ -292,14 +310,13 @@ |
|
|
cols: [ |
|
|
cols: [ |
|
|
[ |
|
|
[ |
|
|
{type: "checkbox", width: 50}, |
|
|
{type: "checkbox", width: 50}, |
|
|
{field: 'aircode',title: '入库单号', width: 150, templet: '#applicationInCode'}, |
|
|
|
|
|
{field: 'quantity', width: 100, title: '数量', sort: true}, |
|
|
{field: 'quantity', width: 100, title: '数量', sort: true}, |
|
|
{field: 'depositoryName', width: 150, title: '仓库名称'}, |
|
|
{field: 'depositoryName', width: 150, title: '仓库名称'}, |
|
|
{field: 'applicantName', width: 100, title: '提交人'}, |
|
|
{field: 'applicantName', width: 100, title: '提交人'}, |
|
|
{field: 'adminorgName', width: 150, title: '提交人部门'}, |
|
|
{field: 'adminorgName', width: 150, title: '提交人部门'}, |
|
|
{field: 'applicantTime', width: 150, title: '提交时间', sort: true}, |
|
|
{field: 'applicantTime', width: 150, title: '提交时间', sort: true}, |
|
|
{field: 'applyRemark', width: 200, title: '备注'}, |
|
|
{field: 'applyRemark', width: 200, title: '备注'}, |
|
|
{field: 'airstate', width: 200, title: '状态'} |
|
|
{field: 'airstate', width: 180, title: '状态'} |
|
|
] |
|
|
] |
|
|
], |
|
|
], |
|
|
limits: [10, 15, 20, 25, 50, 100], |
|
|
limits: [10, 15, 20, 25, 50, 100], |
|
|
@ -348,7 +365,7 @@ |
|
|
templet: '#unitItemList', |
|
|
templet: '#unitItemList', |
|
|
}, |
|
|
}, |
|
|
{field: 'place', width: 150, title: '所处库位', templet: '#placeItemList'}, |
|
|
{field: 'place', width: 150, title: '所处库位', templet: '#placeItemList'}, |
|
|
{title: '库存数', width: 230, templet: '#quantityItem', align: "center"}, |
|
|
{title: '库存明细', width: 230, templet: '#quantityInfoItem', align: "center"}, |
|
|
{field: 'remark', width: 150, title: '备注'}, |
|
|
{field: 'remark', width: 150, title: '备注'}, |
|
|
{title: '操作', width: 150, toolbar: '#currentTableBar', align: "center"}, |
|
|
{title: '操作', width: 150, toolbar: '#currentTableBar', align: "center"}, |
|
|
|
|
|
|
|
|
@ -365,14 +382,14 @@ |
|
|
}; |
|
|
}; |
|
|
initApplicationOutTable = function () { |
|
|
initApplicationOutTable = function () { |
|
|
let flagForReload = true; |
|
|
let flagForReload = true; |
|
|
|
|
|
|
|
|
let cols = [ |
|
|
let cols = [ |
|
|
{type: "checkbox", width: 50}, |
|
|
{type: "checkbox", width: 50}, |
|
|
{field: "code", title: '申请编码', width: 150, templet: '#applicationOutCode'}, |
|
|
|
|
|
{field: 'quantity', width: 150, title: '数量', sort: true}, |
|
|
|
|
|
{field: 'depositoryName', width: 150, title: '仓库名称'}, |
|
|
{field: 'depositoryName', width: 150, title: '仓库名称'}, |
|
|
{field: 'state', width: 150, title: '流程状态'}, |
|
|
{field: 'quantity', width: 100, title: '数量', sort: true}, |
|
|
|
|
|
{field: 'state', width: 140, title: '流程状态'}, |
|
|
{ |
|
|
{ |
|
|
field: 'pass', title: '是否完成出库', minWidth: 120, templet: function (d) { |
|
|
field: 'pass', title: '完成出库', width: 100, templet: function (d) { |
|
|
if (d.pass === 1) { |
|
|
if (d.pass === 1) { |
|
|
return "是"; |
|
|
return "是"; |
|
|
} else { |
|
|
} else { |
|
|
@ -380,11 +397,11 @@ |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
{field: 'applicantName', width: 150, title: '申请人'}, |
|
|
{field: 'applicantName', width: 100, title: '申请人'}, |
|
|
{field: 'adminorgName', width: 150, title: '申请人部门'}, |
|
|
{field: 'adminorgName', width: 100, title: '申请人部门'}, |
|
|
{field: 'useAdminorgName', width: 150, title: '使用部门'}, |
|
|
{field: 'useAdminorgName', width: 100, title: '使用部门'}, |
|
|
{field: 'constructionUnitName', width: 150, title: '使用单位'}, |
|
|
{field: 'constructionUnitName', width: 100, title: '使用单位'}, |
|
|
{field: 'applicantTime', width: 200, title: '申请时间', sort: true} |
|
|
{field: 'applicantTime', width: 150, title: '申请时间', sort: true} |
|
|
]; |
|
|
]; |
|
|
table.render({ |
|
|
table.render({ |
|
|
elem: "#TableForApplicationOut", |
|
|
elem: "#TableForApplicationOut", |
|
|
@ -412,24 +429,7 @@ |
|
|
}, |
|
|
}, |
|
|
//这里layui和thymeleaf冲突了，要加个空格 |
|
|
//这里layui和thymeleaf冲突了，要加个空格 |
|
|
cols: [ |
|
|
cols: [ |
|
|
[ |
|
|
cols |
|
|
{type: "checkbox", width: 50}, |
|
|
|
|
|
{title: '申请编码', width: 150, templet: '#applicationOutCode'}, |
|
|
|
|
|
{field: 'quantity', width: 150, title: '数量', sort: true}, |
|
|
|
|
|
{field: 'depositoryName', width: 150, title: '仓库名称'}, |
|
|
|
|
|
{field: 'state', width: 150, title: '流程状态'}, |
|
|
|
|
|
{ |
|
|
|
|
|
field: 'pass', title: '是否完成出库', minWidth: 120, templet: function (d) { |
|
|
|
|
|
if (d.pass === 1) { |
|
|
|
|
|
return "是"; |
|
|
|
|
|
} else { |
|
|
|
|
|
return "否"; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
{field: 'applicantName', width: 150, title: '申请人'}, |
|
|
|
|
|
{field: 'applicantTime', width: 200, title: '申请时间', sort: true} |
|
|
|
|
|
] |
|
|
|
|
|
], |
|
|
], |
|
|
limits: [10, 15, 20, 25, 50, 100], |
|
|
limits: [10, 15, 20, 25, 50, 100], |
|
|
limit: 10, |
|
|
limit: 10, |
|
|
@ -440,9 +440,8 @@ |
|
|
if (display !== "none") { |
|
|
if (display !== "none") { |
|
|
if (flagForReload) { |
|
|
if (flagForReload) { |
|
|
flagForReload = false; |
|
|
flagForReload = false; |
|
|
let col = {field: 'price', title: '金额', minWidth: 150, sort: true}; |
|
|
let col = {field: 'price', title: '金额', width: 100, sort: true}; |
|
|
cols.splice(6, 0, col); |
|
|
cols.splice(3, 0, col); |
|
|
// table.reloadData('currentTableId', {cols: [cols]}); |
|
|
|
|
|
table.reload('TableForApplicationOut', {cols: [cols]}); |
|
|
table.reload('TableForApplicationOut', {cols: [cols]}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -502,7 +501,7 @@ |
|
|
|
|
|
|
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
// 数据行点击事件 |
|
|
// 库存表数据行双击击事件 |
|
|
table.on('rowDouble(TableForInventory)', function (obj) { |
|
|
table.on('rowDouble(TableForInventory)', function (obj) { |
|
|
var data = obj.data; // 获取当前行数据 |
|
|
var data = obj.data; // 获取当前行数据 |
|
|
let id = data.id; |
|
|
let id = data.id; |
|
|
@ -511,6 +510,24 @@ |
|
|
initEchart(req); |
|
|
initEchart(req); |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
table.on('rowDouble(TableForApplicationOut)', function (obj) { |
|
|
|
|
|
var data = obj.data; // 获取当前行数据 |
|
|
|
|
|
layer.open({ |
|
|
|
|
|
type: 2, |
|
|
|
|
|
offset: 'r', |
|
|
|
|
|
anim: 'slideLeft', // 从右往左 |
|
|
|
|
|
area: ['40%', '100%'], |
|
|
|
|
|
shade: 0.1, |
|
|
|
|
|
title: "出库记录详情", |
|
|
|
|
|
shadeClose: true, |
|
|
|
|
|
id: 'applicationOutInfoForLeft', |
|
|
|
|
|
content: '/ApplicationOutView?id=' + data.id, |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
form.on('select()', function (data) { |
|
|
form.on('select()', function (data) { |
|
|
var id = data.elem.id; //得到select原始DOM对象id |
|
|
var id = data.elem.id; //得到select原始DOM对象id |
|
|
@ -581,6 +598,7 @@ |
|
|
}, |
|
|
}, |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
updateInventoryRemark = function () { |
|
|
updateInventoryRemark = function () { |
|
|
let newIremark = $("#iremark").val(); |
|
|
let newIremark = $("#iremark").val(); |
|
|
let index = layer.confirm('确认更改备注？', { |
|
|
let index = layer.confirm('确认更改备注？', { |
|
|
|
