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
a0f5b33499
commit
cf106d6859
4 changed files with 198 additions and 103 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. 2
      src/main/resources/templates/pages/applicationForStorageCenter/application-out.html
  2. 1
      src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html
  3. 288
      src/main/resources/templates/pages/applicationForStorageCenter/applicationOutForGroup.html
  4. 10
      src/main/resources/templates/pages/post/selectPost.html

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

@ -558,7 +558,7 @@
});
selectPost = function (obj) {
let id = obj.id;
let id = obj.target.id;
layer.open({
type: 2,
title: '弹窗内容',

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

@ -468,6 +468,7 @@
}]
});
$("#openCompanyAdminorg").on('click', selectPost);
// 监听开关
form.on('switch()', function (data) {
let isAgency = data.elem.checked; //开关是否开启，true或者false

288
src/main/resources/templates/pages/applicationForStorageCenter/applicationOutForGroup.html
View File

@ -58,6 +58,58 @@
<div>
<form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;">
<div class="layui-card" id="cardParentForGroup">
<div class="layui-card" id="agencyForGroup">
<div class="layui-form-item">
<label class="layui-form-label">是否代领:</label>
<div class="layui-input-block">
<input type="checkbox" name="flagForAgency" lay-skin="switch"
id="ForGroup"
lay-text="是|否">
</div>
</div>
<div id="agencyItemForGroup" style="display: none">
<div class="layui-form-item">
<label class="layui-form-label">人员:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择人员" class="layui-input"
id="agencyUserForGroup"
onblur="selectUser(this)"
/>
<input type="text" name="agencyUid" class="layui-input"
id="agencyUidForGroup"
style="display: none"/>
</div>
</div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">部门:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择部门" class="layui-input"
readonly
id="openCompanyAdminorgForGroup"
/>
<input type="text" name="adminorgId" class="layui-input"
id="adminorgIdForGroup"
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">施工单位:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择施工单位" class="layui-input"
readonly
id="openConstructionUnitForGroup"
onclick="selectConstructionUnit(this)"
/>
<input type="text" name="constructionUnitId" class="layui-input"
id="constructionUnitIdForGroup"
style="display: none"/>
</div>
</div>
<!--提交按钮-->
<div class="layui-form-item" id="btn_sub2">
<div class="layui-input-block">
@ -126,6 +178,10 @@
function selectCodeForGroup(obj) {
}
function selectPost(obj) {
}
// 用于标志是否为第一次提交
let flagForForm = false;
@ -152,6 +208,53 @@
}]
});
selectPost = function (obj) {
let id = obj.target.id;
layer.open({
type: 2,
title: '弹窗内容',
skin: 'layui-layer-rim',
maxmin: true,
shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'],
content: '/selectPost?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%');
}
});
};
$("#openCompanyAdminorgForGroup").on('click', selectPost);
// 监听开关
form.on('switch()', function (data) {
let isAgency = data.elem.checked; //开关是否开启，true或者false
let id = data.elem.id;
if (isAgency) {
// 如果开启了代领功能
$("#agencyItem" + id).show();
// 添加必填
$("#agencyUid" + id).attr("lay-verify", "required");
$("#openCompanyAdminorg" + id).off("click");
} else {
$("#agencyItem" + id).hide();
// 删除必填
$("#agencyUid" + id).removeAttr("lay-verify");
$("#openCompanyAdminorg" + id).on('click', selectPost);
}
});
// 提交（组合出库）
form.on('submit(formStep2)', function (data) {
@ -193,7 +296,7 @@
success: function (d) {
layer.close(this.layerIndex);
if (d.status >= 300) {
layer.msg(d.statusInfo.detail,{icon:0,time:500},function () {
layer.msg(d.statusInfo.detail, {icon: 0, time: 500}, function () {
flagForForm = false;
});//失败的表情
@ -375,39 +478,7 @@
required lay-verify="number" onblur="groupQuantityIsTrue(this)" placeholder="请填写组合数量"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">部门:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择部门" class="layui-input"
readonly
id=`+"openCompanyAdminorgForGroup"+num+`
onclick="selectPost(this)"
/>
<input type="text" name="adminorgId" class="layui-input"
id=`+"adminorgIdForGroup"+num+`
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">施工单位:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择施工单位" class="layui-input"
readonly
id=`+"openConstructionUnitForGroup"+num+`
onclick="selectConstructionUnit(this)"
/>
<input type="text" name=`+"constructionUnitId"+num+` class="layui-input"
id=`+"constructionUnitIdForGroup"+num+`
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name=` + "applyRemark" + num + ` placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
<i class="layui-icon layui-icon-addition" style="display: inline" id=` + "addItemForGroup" + num + `
onclick="addItemForGroup(this)"></i>
@ -474,39 +545,6 @@
required lay-verify="number" onblur="groupQuantityIsTrue(this)" placeholder="请填写组合数量"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">部门:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择部门" class="layui-input"
readonly
id=`+"openCompanyAdminorgForGroup"+NewIdNumber+`
onclick="selectPost(this)"
/>
<input type="text" name=`+"adminorgId"+NewIdNumber+` class="layui-input"
id=`+"adminorgIdForGroup"+NewIdNumber+`
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">施工单位:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择施工单位" class="layui-input"
readonly
id=`+"openConstructionUnitForGroup"+NewIdNumber+`
onclick="selectConstructionUnit(this)"
/>
<input type="text" name=`+"constructionUnitId"+NewIdNumber+` class="layui-input"
id=`+"constructionUnitIdForGroup"+NewIdNumber+`
style="display: none"/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">备注说明:</label>
<div class="layui-input-block">
<input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/>
</div>
</div>
<i class="layui-icon layui-icon-addition" style="display: inline" id=` + "addItemForGroup" + NewIdNumber + `
onclick="addItemForGroup(this)"></i>
@ -537,8 +575,8 @@
let gnameItem = gnameParent.childNodes[1].childNodes[1];
let req = {};
req.code = code;
if(code !== ""){
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
if (code !== "") {
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/group/findGroupByCode",
type: "post",
@ -631,7 +669,7 @@
if (gid !== '') {
let req = {};
req.gid = gid;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/group/findGroupInfoByGid",
data: JSON.stringify(req),
@ -702,7 +740,7 @@
var req = {};
req.gname = gname;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/group/findGroupByGname",
@ -795,7 +833,7 @@
var req = {};
req.gid = gid;
req.quantity = val;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({
url: "/group/groupQuantityIsTrue",
type: "post",
@ -814,7 +852,7 @@
layer.close(loading2);
});
}else{
} else {
layer.close(loading2);
}
}
@ -850,27 +888,6 @@
return result;
}
selectPost = function (obj) {
let id = obj.id;
layer.open({
type: 2,
title: '弹窗内容',
skin: 'layui-layer-rim',
maxmin: true,
shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'],
content: '/selectPost?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%');
}
});
};
selectConstructionUnit = function (obj) {
let id = obj.id;
@ -894,10 +911,87 @@
});
};
// 用于选择代领用户
selectUser = function (obj) {
let id = obj.id;
if (id.indexOf("ForGroup") !== -1) {
id = "ForGroup";
}
let name = obj.value;
if (name !== "") {
let req = {};
req.name = name;
req.scope = "department";
$.ajax({
url: "/sys/findUserByName",
type: "post",
data: JSON.stringify(req),
dataType: 'json',
contentType: "application/json;charset=utf-8",
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (res) {
layer.close(this.layerIndex);
let data = res.data;
let count = res.count;
if (count === 0) {
layer.msg("部门中不存在该用户，请重试", {
icon: 0,
time: 1000
}, function () {
$("#adminorgId" + id).val("");
$("#agencyAdminorg" + id).val("");
$("#agencyUid" + id).val("");
$("#agencyUser" + id).val("");
})
} else if (count > 1) {
let content = ``;
$.each(data, function (index, item) {
let listItem = `<div class="userItem">
<button isGroup=` + id + ` type="button" onclick="SelectTheUser(this)" name=` + item.name + ` id=` + item.id + ` adminorgname=` + item.maindeparmentname + ` adminorg=` + item.maindeparment + ` class="layui-btn layui-btn-fluid">` + item.number + "-" + item.name + `</button>
</div>`;
content += listItem;
});
selectUserIfame = layer.open({
type: 1,
title: false,
area: ["70%", "70%"],
content: content
})
} else {
let user = data[0];
$("#adminorgId" + id).val(user.maindeparment);
$("#openCompanyAdminorg" + id).val(user.maindeparmentname);
$("#agencyUid" + id).val(user.id);
$("#agencyUser" + id).val(user.name);
}
}
})
}
};
// 用于选定人员
SelectTheUser = function (obj) {
let data = $(obj);
let isGroup = data.attr("isGroup");
if (isGroup !== "ForGroup") {
isGroup = "";
}
let adminorg = data.attr("adminorg");
let adminorgName = data.attr("adminorgname");
let id = data.attr("id");
let name = data.attr("name");
$("#adminorgId" + isGroup).val(adminorg);
$("#openCompanyAdminorg" + isGroup).val(adminorgName);
$("#agencyUid" + isGroup).val(id);
$("#agencyUser" + isGroup).val(name);
layer.close(selectUserIfame)
};
$('body').on('click', '[data-refresh]', function () {
location.reload();
})
})
</script>

10
src/main/resources/templates/pages/post/selectPost.html
View File

@ -27,11 +27,11 @@
let id = $("#id").val();
let idNumber = id.replace(/[^\d]/g, "");
if (id.indexOf("Group") !== -1) {
$("#adminorgIdForGroup"+idNumber, window.parent.document).val(data.id);
$("#openCompanyAdminorgForGroup"+idNumber, window.parent.document).val(data.title);
}else{
$("#adminorgId"+idNumber, window.parent.document).val(data.id);
$("#openCompanyAdminorg"+idNumber, window.parent.document).val(data.title);
$("#adminorgIdForGroup" + idNumber, window.parent.document).val(data.id);
$("#openCompanyAdminorgForGroup" + idNumber, window.parent.document).val(data.title);
} else {
$("#adminorgId" + idNumber, window.parent.document).val(data.id);
$("#openCompanyAdminorg" + idNumber, window.parent.document).val(data.title);
}
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);

Write Preview
Loading…
Cancel
Save