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
c81ccc0f4e
commit
1547c94abb
3 changed files with 74 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java
  2. 10
      src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java
  3. 83
      src/main/resources/templates/pages/application/application-out.html

1
src/main/java/com/dreamchaser/depository_manage/controller/GroupController.java
View File

@ -653,6 +653,7 @@ public class GroupController {
String header = request.getHeader("user-agent"); String header = request.getHeader("user-agent");
String crypt = Md5.crypt(header); String crypt = Md5.crypt(header);
map.put("applicantId", userToken.getId()); map.put("applicantId", userToken.getId());
// 获取当前部门负责人 // 获取当前部门负责人
List<UserByPort> departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userkey,token); List<UserByPort> departmentHeadByUsers = PublicConfig.findDepartmentHeadByUser(userToken.getMaindeparment(), userkey,token);
// 部门负责人id // 部门负责人id

10
src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java
View File

@ -585,7 +585,7 @@ public class GroupServiceImpl implements GroupService {
Map<String, Object> paramForOut = new HashMap<>(); Map<String, Object> paramForOut = new HashMap<>();
paramForOut.put("departmenthead", map.get("departmenthead")); paramForOut.put("departmenthead", map.get("departmenthead"));
paramForOut.put("applicantId", userToken.getId()); paramForOut.put("applicantId", userToken.getId());
paramForOut.put("createUid", userToken.getId());
// 获取当前提交数 // 获取当前提交数
List<String> params = (List<String>) map.get("params"); List<String> params = (List<String>) map.get("params");
@ -669,6 +669,14 @@ public class GroupServiceImpl implements GroupService {
} }
} }
} }
if (map.containsKey("flagForAgency")) {
// 如果开启了代领
paramForOut.put("applicantId", map.get("agencyUid"));
paramForOut.put("flagForAgency", 1);
} else {
paramForOut.put("flagForAgency", 2);
}
paramForOut.put("flagForOpenDepository",1);
paramForOut.put("quantity", quantityForTotal * 100); paramForOut.put("quantity", quantityForTotal * 100);
paramForOut.put("price", priceForTotal); paramForOut.put("price", priceForTotal);
paramForOut.put("applicantTime", System.currentTimeMillis()); paramForOut.put("applicantTime", System.currentTimeMillis());

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

@ -217,6 +217,42 @@
<div carousel-item style="overflow: inherit"> <div carousel-item style="overflow: inherit">
<div> <div>
<form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;"> <form class="layui-form layui-form-pane" style="margin: 0 auto;max-width: 460px;">
<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 class="layui-form-item">
<label class="layui-form-label">部门:</label>
<div class="layui-input-block">
<input type="text" placeholder="请选择部门" class="layui-input"
readonly id="agencyAdminorgForGroup"
/>
<input type="text" name="adminorgId" class="layui-input"
id="adminorgIdForGroup"
style="display: none"/>
</div>
</div>
</div>
</div>
<div class="layui-card" id="cardParentForGroup"> <div class="layui-card" id="cardParentForGroup">
<div class="layui-card-body" id="cardItemForGroup"> <div class="layui-card-body" id="cardItemForGroup">
<hr> <hr>
@ -527,7 +563,6 @@
} }
data.params = remove(data.params, Number(keyNumber)); data.params = remove(data.params, Number(keyNumber));
} }
$.ajax({ $.ajax({
url: "/group/applicationOutForGroup", url: "/group/applicationOutForGroup",
type: 'post', type: 'post',
@ -565,16 +600,17 @@
// 监听开关 // 监听开关
form.on('switch()', function (data) { form.on('switch()', function (data) {
let isAgency = data.elem.checked; //开关是否开启，true或者false let isAgency = data.elem.checked; //开关是否开启，true或者false
let id = data.elem.id;
if (isAgency) { if (isAgency) {
// 如果开启了代领功能 // 如果开启了代领功能
$("#agencyItem").show(); $("#agencyItem" + id).show();
// 添加必填 // 添加必填
$("#agencyUid").attr("lay-verify", "required"); $("#agencyUid" + id).attr("lay-verify", "required");
} else { } else {
$("#agencyItem").hide(); $("#agencyItem" + id).hide();
// 删除必填 // 删除必填
$("#agencyUid").removeAttr("lay-verify"); $("#agencyUid" + id).removeAttr("lay-verify");
} }
}); });
@ -1781,6 +1817,10 @@
// 用于选择代领用户 // 用于选择代领用户
selectUser = function (obj) { selectUser = function (obj) {
let id = obj.id;
if (id.indexOf("ForGroup") !== -1) {
id = "ForGroup";
}
let name = obj.value; let name = obj.value;
if (name !== "") { if (name !== "") {
let req = {}; let req = {};
@ -1803,18 +1843,18 @@
layer.msg("部门中不存在该用户，请重试", { layer.msg("部门中不存在该用户，请重试", {
icon: 0, icon: 0,
time: 1000 time: 1000
},function () { }, function () {
$("#adminorgId").val(""); $("#adminorgId" + id).val("");
$("#agencyAdminorg").val(""); $("#agencyAdminorg" + id).val("");
$("#agencyUid").val(""); $("#agencyUid" + id).val("");
$("#agencyUser").val(""); $("#agencyUser" + id).val("");
}) })
} else if (count > 1) { } else if (count > 1) {
let content = ``; let content = ``;
$.each(data, function (index, item) { $.each(data, function (index, item) {
let listItem = `<div class="userItem"> let listItem = `<div class="userItem">
<button 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> <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>`; </div>`;
content += listItem; content += listItem;
}); });
@ -1826,10 +1866,10 @@
}) })
} else { } else {
let user = data[0]; let user = data[0];
$("#adminorgId").val(user.maindeparment); $("#adminorgId" + id).val(user.maindeparment);
$("#agencyAdminorg").val(user.maindeparmentname); $("#agencyAdminorg" + id).val(user.maindeparmentname);
$("#agencyUid").val(user.id); $("#agencyUid" + id).val(user.id);
$("#agencyUser").val(user.name); $("#agencyUser" + id).val(user.name);
} }
} }
}) })
@ -1839,14 +1879,19 @@
// 用于选定人员 // 用于选定人员
SelectTheUser = function (obj) { SelectTheUser = function (obj) {
let data = $(obj); let data = $(obj);
let isGroup = data.attr("isGroup");
if (isGroup !== "ForGroup") {
isGroup = "";
}
let adminorg = data.attr("adminorg"); let adminorg = data.attr("adminorg");
let adminorgName = data.attr("adminorgname"); let adminorgName = data.attr("adminorgname");
let id = data.attr("id"); let id = data.attr("id");
let name = data.attr("name"); let name = data.attr("name");
$("#adminorgId").val(adminorg); $("#adminorgId" + isGroup).val(adminorg);
$("#agencyAdminorg").val(adminorgName); $("#agencyAdminorg" + isGroup).val(adminorgName);
$("#agencyUid").val(id); $("#agencyUid" + isGroup).val(id);
$("#agencyUser").val(name); $("#agencyUser" + isGroup).val(name);
layer.close(selectUserIfame) layer.close(selectUserIfame)
}; };

Write Preview
Loading…
Cancel
Save