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
bc535477ef
commit
3928c6562a
2 changed files with 106 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  2. 94
      src/main/resources/templates/pages/group/applicationOutForGroup.html

10
src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
View File

@ -2559,13 +2559,23 @@ public class PageController {
if (token == null) {
token = (String) request.getSession().getAttribute("userToken");
}
UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
ModelAndView mv = new ModelAndView();
List<Integer> gidList = new ArrayList<>();
if ("one".equals(type)) {
gidList.add(gid);
} else if ("more".equals(type)) {
}
// 获取当前用户是否存在可见仓库
List<Integer> union = roleService.findDepositoryIdForWareHouseVisiblePermissionByUser(userToken);
if (union.size() > 0) {
mv.addObject("display", "block");
} else {
mv.addObject("display", "none");
}
mv.addObject("gidList", gidList);
mv.setViewName("pages/group/applicationOutForGroup");
Integer maindeparment = userToken.getMaindeparment();

94
src/main/resources/templates/pages/group/applicationOutForGroup.html
View File

@ -45,9 +45,6 @@
display: none;
}
.layui-form-select .layui-input {
border-style: none;
}
</style>
<div class="layuimini-container">
<div class="layuimini-main">
@ -55,6 +52,7 @@
<div class="layui-fluid">
<input id="gidList" type="text" style="display:none;" th:value="${gidList}">
<input id="display" type="text" style="display:none;" th:value="${display}">
<div class="layui-carousel" id="stepForm2" lay-filter="stepForm2" style="margin: 0 auto;">
<div carousel-item style="overflow: inherit">
<div>
@ -188,6 +186,8 @@
element = layui.element,
step = layui.step;
let depositoryDisplay = $("#display").val();
// 用于分步表单加载
step.render({
elem: '#stepForm2',
@ -313,10 +313,25 @@
} else {
var data = d.data;
CoverPageForGroup(i, data[0]);
form.render();
let satisfyDepositoryList = data[0].satisfyDepositoryList;
for (let j = 0; j < data.length; j++) {
CoverpageForGroupInfo(i, data[j]);
form.render();
let num = j;
if (num === 0) {
num = '';
}
$("#showDepositoryForGroup" + num).empty();
if (satisfyDepositoryList !== null) {
for (let k = 0; k < satisfyDepositoryList.length; k++) {
$("#showDepositoryForGroup" + num).append(new Option(satisfyDepositoryList[k].dname, satisfyDepositoryList[k].id));
}
}
form.render();
}
element.init();
form.render();
}
@ -439,6 +454,15 @@
<input type="number" name=` + "quantity" + num + ` class="layui-input" id=` + "quantityForGroup" + num + `
required lay-verify="number" onblur="groupQuantityIsTrue(this)" placeholder="请填写组合数量"/>
</div>
</div>
<div class="layui-form-item" id=` + "depositoryIdForGroup" + num + `
style="display:` + depositoryDisplay + `">
<label class="layui-form-label">仓库:</label>
<div class="layui-input-block">
<select name=` + "depositoryId" + num + ` id=` + "showDepositoryForGroup" + num + `>
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
@ -512,6 +536,15 @@
<input type="number" name=` + "quantity" + NewIdNumber + ` class="layui-input" id=` + "quantityForGroup" + NewIdNumber + `
required lay-verify="number" onblur="groupQuantityIsTrue(this)" placeholder="请填写组合数量"/>
</div>
</div>
<div class="layui-form-item" id=` + "depositoryIdForGroup" + NewIdNumber + `
style="display:` + depositoryDisplay + `">
<label class="layui-form-label">仓库:</label>
<div class="layui-input-block">
<select name=` + "depositoryId" + NewIdNumber + ` id=` + "showDepositoryForGroup" + NewIdNumber + `>
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
@ -589,6 +622,17 @@
// 赋值给gname
gnameItem.value = data[0].gname;
gidItem.value = data[0].gid;
let satisfyDepositoryList = data[0].satisfyDepositoryList;
if (depositoryDisplay !== "none") {
var idNumber = gidItem.name.split("gid")[1];
$("#showDepositoryForGroup" + idNumber).empty();
if (satisfyDepositoryList !== null) {
for (let i = 0; i < satisfyDepositoryList.length; i++) {
$("#showDepositoryForGroup" + idNumber).append(new Option(satisfyDepositoryList[i].dname, satisfyDepositoryList[i].id));
}
}
form.render();
}
for (let i = 0; i < data.length; i++) {
CoverpageForGroupInfo(pid, data[i]);
}
@ -683,6 +727,17 @@
}
// 赋值给gname
gcodeItem.value = data[0].gcode;
let satisfyDepositoryList = data[0].satisfyDepositoryList;
if (depositoryDisplay !== "none") {
var idNumber = gidItem.name.split("gid")[1];
$("#showDepositoryForGroup" + idNumber).empty();
if (satisfyDepositoryList !== null) {
for (let i = 0; i < satisfyDepositoryList.length; i++) {
$("#showDepositoryForGroup" + idNumber).append(new Option(satisfyDepositoryList[i].dname, satisfyDepositoryList[i].id));
}
}
form.render();
}
for (let i = 0; i < data.length; i++) {
CoverpageForGroupInfo(pid, data[i]);
}
@ -775,6 +830,17 @@
// 赋值给gname
gidItem.value = data[0].gid;
gcodeItem.value = data[0].gcode;
let satisfyDepositoryList = data[0].satisfyDepositoryList;
if (depositoryDisplay !== "none") {
var idNumber = gidItem.name.split("gid")[1];
$("#showDepositoryForGroup" + idNumber).empty();
if (satisfyDepositoryList !== null) {
for (let i = 0; i < satisfyDepositoryList.length; i++) {
$("#showDepositoryForGroup" + idNumber).append(new Option(satisfyDepositoryList[i].dname, satisfyDepositoryList[i].id));
}
}
form.render();
}
for (let i = 0; i < data.length; i++) {
CoverpageForGroupInfo(pid, data[i]);
}
@ -810,6 +876,9 @@
var req = {};
req.gid = gid;
req.quantity = val;
if (depositoryDisplay !== "none") {
req.depositoryId = $("#showDepositoryForGroup" + id).val();
}
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/group/groupQuantityIsTrue",
@ -823,10 +892,10 @@
if (!flag) { // 如果当前数目不合适
layer.msg("当前组合中" + res.statusInfo.message + "的库存数量不足", {
icon: 0,
time: 500
time: 1000
}, function () {
$("#quantityForGroup" + id).val("");
layer.close(loading2);
$("#quantityForGroup" + id).val("");
});
} else {
@ -836,7 +905,19 @@
});
}
}
}
};
// 监听下拉选择框
form.on('select()', function (data) {
let id = data.elem.id;
let idNum = id.split('showDepositoryForGroup')[1];
let elem = {};
elem.id = "quantityForGroup" + idNum;
groupQuantityIsTrue(elem)
});
// 实现卡片删除（组合）
deleteItemForGroup = function (obj) {
@ -864,6 +945,7 @@
}
return result;
}
// 用于选择代领用户
selectUser = function (obj) {
let id = obj.id;

Write Preview
Loading…
Cancel
Save