Browse Source

修改系统审批功能

lwx_dev
erdanergou 3 years ago
parent
commit
f7f4896c4b
  1. 6
      src/main/resources/templates/pages/application/application-out_back.html
  2. 138
      src/main/resources/templates/pages/application/application-out_temporaryValue.html
  3. 6
      src/main/resources/templates/pages/applicationForStorageCenter/application-out_temporaryValue.html
  4. 5
      target/classes/templates/pages/application/application-out_min-mobile.html
  5. 2
      target/classes/templates/pages/application/application-out_min.html
  6. 67
      target/classes/templates/pages/application/application-out_temporaryValue.html
  7. 6
      target/classes/templates/pages/applicationForStorageCenter/application-out_temporaryValue.html
  8. 2
      target/classes/templates/pages/company/company_edit.html
  9. 2
      target/classes/templates/pages/warehouse/manager.html

6
src/main/resources/templates/pages/application/application-out_back.html

@ -117,7 +117,6 @@
<div style="font-size: 24px;color: #333;font-weight: 500;margin-top: 30px;">
提交申请成功
</div>
<div style="font-size: 14px;color: #666;margin-top: 20px;">预计审核时间为1天</div>
</div>
<div style="text-align: center;margin-top: 50px;">
<button class="layui-btn next">再申请一次</button>
@ -127,11 +126,6 @@
</div>
</div>
</div>
<hr>
<div style="color: #666;margin-top: 30px;margin-bottom: 40px;padding-left: 30px;">
<h3>说明</h3><br>
申请提交后,24小时内审核完毕
</div>
</div>
</div>

138
src/main/resources/templates/pages/application/application-out_temporaryValue.html

@ -40,6 +40,7 @@
<div class="layuimini-container">
<div class="layuimini-main">
<input th:value="${display}" id="display" style="display: none">
<div class="layui-fluid">
<!-- 出库申请-->
<div class="layui-carousel" id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
@ -121,6 +122,8 @@
form = layui.form,
step = layui.step;
let depositoryDisplay = $("#display").val();
// 用于分步表单加载
step.render({
elem: '#stepForm',
@ -166,6 +169,19 @@
let item = '<option value="' + obj.splitInfoList[i].newUnit + '">' + obj.splitInfoList[i].newUnit + '</option>'
splitInfoList += item;
}
let depositoryList = '';
if (depositoryDisplay !== "none") {
depositoryList = `<div class="layui-form-item" id=` + "depositoryId" + NewIdNumber + `>
<label class="layui-form-label">仓库:</label>
<div class="layui-input-block">
<select id=` + "showDepository" + NewIdNumber + ` name=` + "depositoryId" + NewIdNumber + `>`;
for (let i = 0; i < obj.depositoryList.length; i++) {
let item = '<option value="' + obj.depositoryList[i].id + '">' + obj.depositoryList[i].dname + '</option>';
depositoryList += item;
}
depositoryList += `</select></div></div>`
}
var firstItem = `
<div class="layui-card-body" id=` + "cardItem" + NewIdNumber + `>
<hr>
@ -178,7 +194,7 @@
id="openSonByMaterial" lay-verify="required" onblur="selectMaterialByName(this)"/>
<i class="layui-icon layui-icon-search" style="display: inline" id="selectMaterial" onclick="selectMaterial(this)"></i>
</div>
<input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id=` + "mid" + NewIdNumber +` value="${obj.id}"
<input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id=` + "mid" + NewIdNumber + ` value="${obj.id}"
style="display: none" lay-verify="required" />
</div>
</div>
@ -227,7 +243,10 @@
splitInfoList +
`</select>
</div>
</div>
</div>` +
depositoryList
+ `
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
@ -242,7 +261,11 @@
if (NewIdNumber !== "") {
params.push(NewIdNumber)
}
if (depositoryDisplay === "none") {
$("#stepForm").css("height", height + 390 + 'px');
} else {
$("#stepForm").css("height", height + 435 + 'px');
}
var materialItem = firstItem + lastItem;
$("#btn_sub").prepend(materialItem);
form.render();
@ -330,7 +353,7 @@
addItem = function (obj) {
// 获取父元素id
var parentId = obj.parentNode.id;
if(NewIdNumber === ""){
if (NewIdNumber === "") {
NewIdNumber = 0;
}
NewIdNumber = NewIdNumber + 1;
@ -390,6 +413,14 @@
<div class="layui-input-block">
<select id=` + "unit" + NewIdNumber + ` name=` + "unit" + NewIdNumber + `>
</select>
</div>
</div>
<div class="layui-form-item" id=` + "depositoryId" + NewIdNumber + ` style="display:` + depositoryDisplay + `" >
<label class="layui-form-label">仓库:</label>
<div class="layui-input-block">
<select id=` + "showDepository" + NewIdNumber + ` name=` + "depositoryId" + NewIdNumber + `>
</select>
</div>
</div>
@ -418,7 +449,11 @@
// 获取祖父节点
var reparent = parent.parentNode;
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
$("#stepForm").css("height", height - 387 + 'px');
if (depositoryDisplay === "none") {
$("#stepForm").css("height", height + 390 + 'px');
} else {
$("#stepForm").css("height", height + 435 + 'px');
}
params = remove(params, parentId);
reparent.removeChild(parent);
// 当前节点的id值
@ -426,7 +461,7 @@
$.ajax({
url: "/material/delTemporaryValue",
type: 'post',
data:JSON.stringify({"id":value,"type":"Out"}),
data: JSON.stringify({"id": value, "type": "Out"}),
dataType: 'json',
contentType: "application/json;charset=utf-8"
})
@ -523,6 +558,16 @@
barCode.empty();
}
}
if (depositoryDisplay !== "none") {
$("#showDepository" + idNumber).empty();
let depositoryList = d.depositoryList;
if(depositoryList !== null) {
for (let i = 0; i < depositoryList.length; i++) {
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
}
}
form.render();
}
layer.close(loading2);
}
}
@ -620,6 +665,15 @@
barCode.empty();
}
}
if (depositoryDisplay !== "none") {
$("#showDepository" + idNumber).empty();
let depositoryList = material.depositoryList;
if(depositoryList !== null) {
for (let i = 0; i < depositoryList.length; i++) {
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
}
}
}
form.render();
layer.close(loading2);
}
@ -712,6 +766,16 @@
barCode.empty();
}
}
if (depositoryDisplay !== "none") {
$("#showDepository" + idNumber).empty();
let depositoryList = material.depositoryList;
if(depositoryList !== null){
for (let i = 0; i < depositoryList.length; i++) {
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
}
}
form.render();
}
materialName.value = material.mname;
materialId.value = material.id;
codeValue.value = material.code;
@ -783,6 +847,15 @@
for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
}
if (depositoryDisplay !== "none") {
$("#showDepository" + idNumber).empty();
let depositoryList = data.depositoryList;
if(depositoryList !== null) {
for (let i = 0; i < depositoryList.length; i++) {
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
}
}
}
form.render();
layer.close(loading2);
} else {
@ -897,6 +970,15 @@
$.each(data.splitInfoList, function (index, item) {
$("#unit" + idNumber).append(new Option(item.newUnit, item.newUnit));
});
if (depositoryDisplay !== "none") {
$("#showDepository" + idNumber).empty();
let depositoryList = data.depositoryList;
if(depositoryList !== null) {
for (let i = 0; i < depositoryList.length; i++) {
$("#showDepository" + idNumber).append(new Option(depositoryList[i].dname, depositoryList[i].id));
}
}
}
form.render();
materialName.value = data.mname;
materialId.value = data.id;
@ -926,6 +1008,9 @@
req.quantity = val;
req.unit = unit;
req.placeId = -1;
if (depositoryDisplay !== "none") {
req.depositoryId = $("#showDepository" + id).val();
}
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/MaterialQuantityIsTrue",
@ -992,29 +1077,29 @@
content.css('height', '100%');
iframeChildren.css('height', '100%');
},
end:function () {
let val = $("#"+id).val();
if(val !== ""){
if(id.indexOf("ForGroup") !== -1){
end: function () {
let val = $("#" + id).val();
if (val !== "") {
if (id.indexOf("ForGroup") !== -1) {
// 如果是组合
$("#stepForm2").find('input[id*="project"]').each(function () {
$(this).attr("lay-verify","required")
$(this).attr("lay-verify", "required")
})
}else{
} else {
// 如果是物料
$("#stepForm").find('input[id*="project"]').each(function () {
$(this).attr("lay-verify","required")
$(this).attr("lay-verify", "required")
})
}
}else{
if(id.indexOf("ForGroup") !== -1){
} else {
if (id.indexOf("ForGroup") !== -1) {
// 如果是组合
$("#stepForm2").find('input[id*="project"]').each(function () {
$(this).removeAttr("lay-verify")
})
}else{
} else {
// 如果是物料
$("#stepForm").find('input[id*="project"]').each(function () {
$(this).removeAttr("lay-verify")
@ -1026,10 +1111,22 @@
};
form.on('select()', function (data) {
let unit = data.value;
let id = data.elem.id;
let idNum = id.split("unit")[1];
let mcode = $("#code" + idNum).val();
let unit = "";
let mcode = "";
let depositoryId = "-1";
if (id.indexOf('unit') !== -1) {
unit = data.value;
} else {
// 获取当前选中的仓库id
depositoryId = data.value;
idNum = id.split('showDepository')[1];
unit = $("#unit" + idNum).val();
}
mcode = $("#code" + idNum).val();
if (mcode === "" || mcode === undefined || mcode === null) {
layer.msg("请输入物料的正确编码!", {icon: 0, time: 500}, function () {
$("#quantity" + idNum).val("")
@ -1042,6 +1139,9 @@
req.quantity = val;
req.unit = unit;
req.placeId = -1;
if (depositoryId !== "-1") {
req.depositoryId = depositoryId;
}
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/material/MaterialQuantityIsTrue",
@ -1066,11 +1166,9 @@
}
}
});
$('body').on('click', '[data-refresh]', function () {
location.reload();
})
})
</script>

6
src/main/resources/templates/pages/applicationForStorageCenter/application-out_temporaryValue.html

@ -306,7 +306,13 @@
if (NewIdNumber !== "") {
params.push(NewIdNumber)
}
if(depositoryDisplay === "none"){
$("#stepForm").css("height", height + 390 + 'px');
} else {
$("#stepForm").css("height", height + 435 + 'px');
}
var materialItem = firstItem + lastItem;
$("#btn_sub").prepend(materialItem);
form.render();

5
target/classes/templates/pages/application/application-out_min-mobile.html

@ -12,7 +12,7 @@
<link rel="stylesheet" href="/static/lib/font-awesome-4.7.0/css/font-awesome.min.css" media="all">
</head>
<body>
<a id="refresh" href="javascript:" data-refresh="刷新"><i class="fa fa-refresh"></i></a>
<div class="layui-bg-gray">
<input id="depositoryId" type="text" th:value="${depositoryId}" style="display: none">
@ -31,7 +31,8 @@
<script>
//先声明
function openDetail1(data) {
};
}
layui.use(['form', 'table','flow'], function () {
var $ = layui.jquery,
flow = layui.flow;

2
target/classes/templates/pages/application/application-out_min.html

@ -12,7 +12,7 @@
<link rel="stylesheet" href="/static/lib/font-awesome-4.7.0/css/font-awesome.min.css" media="all">
</head>
<body>
<a id="refresh" href="javascript:" data-refresh="刷新"><i class="fa fa-refresh"></i></a>
<div class="layuimini-container">
<div class="layuimini-main">
<input id="depositoryId" type="text" th:value="${depositoryId}" style="display: none">

67
target/classes/templates/pages/application/application-out_temporaryValue.html

@ -36,10 +36,11 @@
}
</style>
<a id="refresh" href="javascript:" data-refresh="刷新"><i class="fa fa-refresh"></i></a>
<div class="layuimini-container">
<div class="layuimini-main">
<input th:value="${display}" id="display" style="display: none">
<div class="layui-fluid">
<!-- 出库申请-->
<div class="layui-carousel" id="stepForm" lay-filter="stepForm" style="margin: 0 auto;">
@ -121,6 +122,8 @@
form = layui.form,
step = layui.step;
let depositoryDisplay = $("#display").val();
// 用于分步表单加载
step.render({
elem: '#stepForm',
@ -166,6 +169,19 @@
let item = '<option value="' + obj.splitInfoList[i].newUnit + '">' + obj.splitInfoList[i].newUnit + '</option>'
splitInfoList += item;
}
let depositoryList = '';
if (depositoryDisplay !== "none") {
depositoryList = `<div class="layui-form-item" id=` + "depositoryId" + NewIdNumber + `>
<label class="layui-form-label">仓库:</label>
<div class="layui-input-block">
<select id=` + "showDepository" + NewIdNumber + ` name=` + "depositoryId" + NewIdNumber + `>`;
for (let i = 0; i < obj.depositoryList.length; i++) {
let item = '<option value="' + obj.depositoryList[i].id + '">' + obj.depositoryList[i].dname + '</option>';
depositoryList += item;
}
depositoryList += `</select></div></div>`
}
var firstItem = `
<div class="layui-card-body" id=` + "cardItem" + NewIdNumber + `>
<hr>
@ -178,7 +194,7 @@
id="openSonByMaterial" lay-verify="required" onblur="selectMaterialByName(this)"/>
<i class="layui-icon layui-icon-search" style="display: inline" id="selectMaterial" onclick="selectMaterial(this)"></i>
</div>
<input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id=` + "mid" + NewIdNumber +` value="${obj.id}"
<input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id=` + "mid" + NewIdNumber + ` value="${obj.id}"
style="display: none" lay-verify="required" />
</div>
</div>
@ -227,7 +243,10 @@
splitInfoList +
`</select>
</div>
</div>
</div>` +
depositoryList
+ `
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
@ -242,7 +261,11 @@
if (NewIdNumber !== "") {
params.push(NewIdNumber)
}
if (depositoryDisplay === "none") {
$("#stepForm").css("height", height + 390 + 'px');
} else {
$("#stepForm").css("height", height + 435 + 'px');
}
var materialItem = firstItem + lastItem;
$("#btn_sub").prepend(materialItem);
form.render();
@ -330,7 +353,7 @@
addItem = function (obj) {
// 获取父元素id
var parentId = obj.parentNode.id;
if(NewIdNumber === ""){
if (NewIdNumber === "") {
NewIdNumber = 0;
}
NewIdNumber = NewIdNumber + 1;
@ -390,6 +413,14 @@
<div class="layui-input-block">
<select id=` + "unit" + NewIdNumber + ` name=` + "unit" + NewIdNumber + `>
</select>
</div>
</div>
<div class="layui-form-item" id=` + "depositoryId" + NewIdNumber + ` style="display:` + depositoryDisplay + `" >
<label class="layui-form-label">仓库:</label>
<div class="layui-input-block">
<select id=` + "showDepository" + NewIdNumber + ` name=` + "depositoryId" + NewIdNumber + `>
</select>
</div>
</div>
@ -418,7 +449,11 @@
// 获取祖父节点
var reparent = parent.parentNode;
var height = parseInt(($("#stepForm").css('height')).split("px")[0]);
$("#stepForm").css("height", height - 387 + 'px');
if (depositoryDisplay === "none") {
$("#stepForm").css("height", height + 390 + 'px');
} else {
$("#stepForm").css("height", height + 435 + 'px');
}
params = remove(params, parentId);
reparent.removeChild(parent);
// 当前节点的id值
@ -426,7 +461,7 @@
$.ajax({
url: "/material/delTemporaryValue",
type: 'post',
data:JSON.stringify({"id":value,"type":"Out"}),
data: JSON.stringify({"id": value, "type": "Out"}),
dataType: 'json',
contentType: "application/json;charset=utf-8"
})
@ -992,29 +1027,29 @@
content.css('height', '100%');
iframeChildren.css('height', '100%');
},
end:function () {
let val = $("#"+id).val();
if(val !== ""){
if(id.indexOf("ForGroup") !== -1){
end: function () {
let val = $("#" + id).val();
if (val !== "") {
if (id.indexOf("ForGroup") !== -1) {
// 如果是组合
$("#stepForm2").find('input[id*="project"]').each(function () {
$(this).attr("lay-verify","required")
$(this).attr("lay-verify", "required")
})
}else{
} else {
// 如果是物料
$("#stepForm").find('input[id*="project"]').each(function () {
$(this).attr("lay-verify","required")
$(this).attr("lay-verify", "required")
})
}
}else{
if(id.indexOf("ForGroup") !== -1){
} else {
if (id.indexOf("ForGroup") !== -1) {
// 如果是组合
$("#stepForm2").find('input[id*="project"]').each(function () {
$(this).removeAttr("lay-verify")
})
}else{
} else {
// 如果是物料
$("#stepForm").find('input[id*="project"]').each(function () {
$(this).removeAttr("lay-verify")

6
target/classes/templates/pages/applicationForStorageCenter/application-out_temporaryValue.html

@ -306,7 +306,13 @@
if (NewIdNumber !== "") {
params.push(NewIdNumber)
}
if(depositoryDisplay === "none"){
$("#stepForm").css("height", height + 390 + 'px');
} else {
$("#stepForm").css("height", height + 435 + 'px');
}
var materialItem = firstItem + lastItem;
$("#btn_sub").prepend(materialItem);
form.render();

2
target/classes/templates/pages/company/company_edit.html

@ -14,7 +14,7 @@
</head>
<body>
<a id="refresh" href="javascript:" data-refresh="刷新"><i class="fa fa-refresh"></i></a>
<form class="layui-form layui-form-pane" action="" >
<div class="layui-form-item" style="display: none">

2
target/classes/templates/pages/warehouse/manager.html

@ -14,7 +14,7 @@
</head>
<body>
<input id="did" style="display: none" th:value="${did}">
<a id="refresh" href="javascript:" data-refresh="刷新"><i class="fa fa-refresh"></i></a>
<table id="demo" lay-filter="test"></table>

Loading…
Cancel
Save