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
3928c6562a
commit
0a252b6c0b
4 changed files with 141 additions and 64 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/resources/templates/pages/application/application-out.html
  2. 187
      src/main/resources/templates/pages/applicationForStorageCenter/application-out.html
  3. 3
      src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html
  4. 3
      src/main/resources/templates/pages/applicationForStorageCenter/application-out_temporaryValue.html

10
src/main/resources/templates/pages/application/application-out.html
View File

@ -1400,8 +1400,7 @@
}
}
})
}
else {
} else {
gcodeItem.value = '';
gidItem.value = '';
let childNodes = parent.childNodes;
@ -1821,13 +1820,16 @@
// 用于标志是否为物料出库（默认为物料）
let flag = true;
if (id.indexOf('unit') !== -1) {
if (depositoryDisplay !== "none") {
depositoryId = $("#showDepository" + idNum).val();
}
unit = data.value;
} else if (!(id.indexOf('ForGroup'))) {
} else if (id.indexOf('ForGroup') === -1) {
// 获取当前选中的仓库id是在物料出库下
depositoryId = data.value;
idNum = id.split('showDepository')[1];
unit = $("#unit" + idNum).val();
} else if (id.indexOf("ForGroup")) {
} else if (id.indexOf("ForGroup") !== -1) {
depositoryId = data.value;
idNum = id.split('showDepositoryForGroup')[1];
flag = false;

187
src/main/resources/templates/pages/applicationForStorageCenter/application-out.html
View File

@ -373,7 +373,15 @@
required lay-verify="number" placeholder="请填写组合数量"/>
</div>
</div>
<div class="layui-form-item" id="depositoryIdForGroup"
th:style="'display:'+${display}">
<label class="layui-form-label">仓库:</label>
<div class="layui-input-block">
<select name="depositoryId" id="showDepositoryForGroup">
</select>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">项目:</label>
<div class="layui-input-block">
@ -874,6 +882,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>
@ -1156,6 +1173,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++) {
CoverpageForGroup(pid, data[i]);
}
@ -1354,6 +1382,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++) {
CoverpageForGroup(pid, data[i]);
}
@ -1444,6 +1483,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++) {
CoverpageForGroup(pid, data[i]);
}
@ -1827,7 +1877,7 @@
var gid = $("#gid" + id).val(); // 获取到当前输入的物料编码
if (gid === "" || gid === undefined || gid === null) {
layer.msg("请输入正确的组合！", {icon: 0, time: 500}, function () {
$("#quantityForGroup" + id).val("");
$("#quantityForGroup" + id).val("")
});
} else {
let val = $("#quantityForGroup" + id).val();
@ -1835,6 +1885,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",
@ -1850,8 +1903,8 @@
icon: 0,
time: 1000
}, function () {
layer.close(loading2);
$("#quantityForGroup" + id).val("");
layer.close(loading2)
});
} else {
@ -1863,59 +1916,7 @@
}
};
selectConstructionUnit = function (obj) {
let id = obj.id;
layer.open({
type: 2,
title: '弹窗内容',
skin: 'layui-layer-rim',
maxmin: true,
shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'],
content: '/selectConstructionUnit?id=' + id,
move: '.layui-layer-title',
fixed: false,
success: function (layero, index) {
var children = layero.children();
var content = $(children[1]);
var iframeChildren = $(content.children());
content.css('height', '100%');
iframeChildren.css('height', '100%');
},
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")
})
} else {
// 如果是物料
$("#stepForm").find('input[id*="project"]').each(function () {
$(this).attr("lay-verify", "required")
})
}
} else {
if (id.indexOf("ForGroup") !== -1) {
// 如果是组合
$("#stepForm2").find('input[id*="project"]').each(function () {
$(this).removeAttr("lay-verify")
})
} else {
// 如果是物料
$("#stepForm").find('input[id*="project"]').each(function () {
$(this).removeAttr("lay-verify")
})
}
}
}
});
};
// 监听下拉选择框
form.on('select()', function (data) {
let id = data.elem.id;
@ -1923,19 +1924,27 @@
let unit = "";
let mcode = "";
let depositoryId = "-1";
// 用于标志是否为物料出库（默认为物料）
let flag = true;
if (id.indexOf('unit') !== -1) {
unit = data.value;
if (depositoryDisplay !== "none") {
depositoryId = $("#showDepository" + idNum).val();
}
else {
// 获取当前选中的仓库id
} else if (id.indexOf('ForGroup') === -1) {
// 获取当前选中的仓库id是在物料出库下
depositoryId = data.value;
idNum = id.split('showDepository')[1];
unit = $("#unit" + idNum).val();
} else if (id.indexOf("ForGroup") !== -1) {
depositoryId = data.value;
idNum = id.split('showDepositoryForGroup')[1];
flag = false;
}
if (flag) {
mcode = $("#code" + idNum).val();
if (mcode === "" || mcode === undefined || mcode === null) {
layer.msg("请输入物料的正确编码！", {icon: 0, time: 500}, function () {
layer.msg("请输入物料的正确编码！", {icon: 0, time: 1000}, function () {
$("#quantity" + idNum).val("")
});
} else {
@ -1972,9 +1981,69 @@
});
}
}
} else {
let elem = {};
elem.id = "quantityForGroup" + idNum;
groupQuantityIsTrue(elem)
}
});
selectConstructionUnit = function (obj) {
let id = obj.id;
layer.open({
type: 2,
title: '弹窗内容',
skin: 'layui-layer-rim',
maxmin: true,
shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'],
content: '/selectConstructionUnit?id=' + id,
move: '.layui-layer-title',
fixed: false,
success: function (layero, index) {
var children = layero.children();
var content = $(children[1]);
var iframeChildren = $(content.children());
content.css('height', '100%');
iframeChildren.css('height', '100%');
},
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")
})
} else {
// 如果是物料
$("#stepForm").find('input[id*="project"]').each(function () {
$(this).attr("lay-verify", "required")
})
}
} else {
if (id.indexOf("ForGroup") !== -1) {
// 如果是组合
$("#stepForm2").find('input[id*="project"]').each(function () {
$(this).removeAttr("lay-verify")
})
} else {
// 如果是物料
$("#stepForm").find('input[id*="project"]').each(function () {
$(this).removeAttr("lay-verify")
})
}
}
}
});
};
// 用于选择代领用户
selectUser = function (obj) {
let id = obj.id;

3
src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html
View File

@ -597,6 +597,9 @@
let depositoryId = "-1";
if (id.indexOf('unit') !== -1) {
unit = data.value;
if (depositoryDisplay !== "none") {
depositoryId = $("#showDepository" + idNum).val();
}
} else {
// 获取当前选中的仓库id
depositoryId = data.value;

3
src/main/resources/templates/pages/applicationForStorageCenter/application-out_temporaryValue.html
View File

@ -1175,6 +1175,9 @@
let depositoryId = "-1";
if (id.indexOf('unit') !== -1) {
unit = data.value;
if (depositoryDisplay !== "none") {
depositoryId = $("#showDepository" + idNum).val();
}
} else {
// 获取当前选中的仓库id
depositoryId = data.value;

Write Preview
Loading…
Cancel
Save