Browse Source

组织表单二次提交

lwx_dev
erdanergou 3 years ago
parent
commit
1f2279be92
  1. 123
      src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java
  2. 9
      src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java
  3. 167
      src/main/resources/templates/pages/application/application-in.html
  4. 67
      src/main/resources/templates/pages/application/application-in_back.html
  5. 92
      src/main/resources/templates/pages/application/application-in_scanQrCode.html
  6. 284
      src/main/resources/templates/pages/application/application-out.html
  7. 65
      src/main/resources/templates/pages/application/application-out_back.html
  8. 62
      src/main/resources/templates/pages/application/application-out_scanQrCode.html
  9. 42
      src/main/resources/templates/pages/application/application-review.html
  10. 100
      src/main/resources/templates/pages/application/application-transfer.html
  11. 64
      src/main/resources/templates/pages/application/application-transfer_back.html
  12. 62
      src/main/resources/templates/pages/application/application_in_multi.html
  13. 22
      src/main/resources/templates/pages/application/form-step-look_group_review.html
  14. 22
      src/main/resources/templates/pages/application/form-step-look_in_review.html
  15. 251
      src/main/resources/templates/pages/applicationForStorageCenter/application-out.html
  16. 64
      src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html
  17. 61
      src/main/resources/templates/pages/applicationForStorageCenter/application-out_scanQrCode.html
  18. 59
      src/main/resources/templates/pages/company/company_add.html
  19. 65
      src/main/resources/templates/pages/constructionunit/constructionunit_add.html
  20. 51
      src/main/resources/templates/pages/constructionunit/constructionunit_edit.html
  21. 62
      src/main/resources/templates/pages/group/applicationInForGroup.html
  22. 189
      src/main/resources/templates/pages/group/applicationOutForGroup.html
  23. 2
      src/main/resources/templates/pages/group/group-add.html
  24. 104
      src/main/resources/templates/pages/group/group-add_back.html
  25. 1
      src/main/resources/templates/pages/group/group_edit.html
  26. 76
      src/main/resources/templates/pages/group/group_material_edit.html
  27. 72
      src/main/resources/templates/pages/material/material-add.html
  28. 72
      src/main/resources/templates/pages/material/material-add_back.html
  29. 64
      src/main/resources/templates/pages/material/material-view.html
  30. 65
      src/main/resources/templates/pages/materialtype/materialType_add.html
  31. 196
      src/main/resources/templates/pages/materialtype/materialType_edit.html
  32. 42
      src/main/resources/templates/pages/notice/notice-add.html
  33. 42
      src/main/resources/templates/pages/notice/notice-edit.html
  34. 67
      src/main/resources/templates/pages/place/place_add.html
  35. 80
      src/main/resources/templates/pages/place/place_edit.html
  36. 80
      src/main/resources/templates/pages/place/place_editForTray.html
  37. 74
      src/main/resources/templates/pages/post/postRole_add.html
  38. 64
      src/main/resources/templates/pages/post/postRole_edit.html
  39. 80
      src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html
  40. 57
      src/main/resources/templates/pages/split/split_add.html
  41. 60
      src/main/resources/templates/pages/split/split_edit.html
  42. 122
      src/main/resources/templates/pages/stockTaking/stockTaking.html
  43. 56
      src/main/resources/templates/pages/stockTaking/stockTakingComplete.html
  44. 57
      src/main/resources/templates/pages/stockTaking/stockTakingForTable.html
  45. 126
      src/main/resources/templates/pages/stockTaking/stockTakingReview.html
  46. 59
      src/main/resources/templates/pages/stockTaking/stockTaking_back.html
  47. 86
      src/main/resources/templates/pages/stockTaking/stockTransfer.html
  48. 67
      src/main/resources/templates/pages/warehouse/depository_add.html
  49. 58
      src/main/resources/templates/pages/warehouse/warehouse_view.html

123
src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java

@ -54,7 +54,7 @@ public class DepositoryRecordController {
@GetMapping("/myApply") @GetMapping("/myApply")
public RestResponse findDepositoryInAndOutRecordPByCondition(@RequestParam Map<String, Object> map, HttpServletRequest request) { public RestResponse findDepositoryInAndOutRecordPByCondition(@RequestParam Map<String, Object> map, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -84,7 +84,7 @@ public class DepositoryRecordController {
@GetMapping("/myTaskOut") @GetMapping("/myTaskOut")
public RestResponse myTaskOut(@RequestParam Map<String, Object> map, HttpServletRequest request) { public RestResponse myTaskOut(@RequestParam Map<String, Object> map, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -99,7 +99,7 @@ public class DepositoryRecordController {
@GetMapping("/myTaskIn") @GetMapping("/myTaskIn")
public RestResponse myTaskIn(@RequestParam Map<String, Object> map, HttpServletRequest request) { public RestResponse myTaskIn(@RequestParam Map<String, Object> map, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -117,7 +117,7 @@ public class DepositoryRecordController {
// isDone 为0为未完成,1为已完成 // isDone 为0为未完成,1为已完成
String isDone = (String) (map.get("isDone")); String isDone = (String) (map.get("isDone"));
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -200,7 +200,7 @@ public class DepositoryRecordController {
@PostMapping("/depositoryRecord") @PostMapping("/depositoryRecord")
public RestResponse insertDepositoryRecord(@RequestBody Map<String, Object> map, HttpServletRequest request) { public RestResponse insertDepositoryRecord(@RequestBody Map<String, Object> map, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -219,7 +219,7 @@ public class DepositoryRecordController {
String header = request.getHeader("user-agent"); String header = request.getHeader("user-agent");
String crypt = Md5.crypt(header); String crypt = Md5.crypt(header);
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -244,8 +244,7 @@ public class DepositoryRecordController {
recordIds.add(ObjectFormatUtil.toInteger(map.get("applicationInId"))); recordIds.add(ObjectFormatUtil.toInteger(map.get("applicationInId")));
mtIdList.add(ObjectFormatUtil.toLong(map.get("mtId"))); mtIdList.add(ObjectFormatUtil.toLong(map.get("mtId")));
} }
} } else {
else {
// 获取库位id // 获取库位id
Integer placeId = ObjectFormatUtil.toInteger(map.get("placeId")); Integer placeId = ObjectFormatUtil.toInteger(map.get("placeId"));
if (placeId == 0) {// 如果插入到仓库 if (placeId == 0) {// 如果插入到仓库
@ -438,7 +437,7 @@ public class DepositoryRecordController {
@PostMapping("/applicationOut") @PostMapping("/applicationOut")
public RestResponse insertApplicationOutRecord(@RequestBody Map<String, Object> map, HttpServletRequest request) { public RestResponse insertApplicationOutRecord(@RequestBody Map<String, Object> map, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -466,15 +465,21 @@ public class DepositoryRecordController {
map.remove("id"); map.remove("id");
map.put("parentId", id); map.put("parentId", id);
} }
String constructionUnitId = map.get("constructionUnitId").toString(); if (map.containsKey("constructionUnitId")) {
String adminorgId = map.get("adminorgId").toString(); String constructionUnitId = map.get("constructionUnitId").toString();
if("".equals(constructionUnitId)) if ("".equals(constructionUnitId)) {
{ map.remove("constructionUnitId");
map.remove("constructionUnitId"); }
} }
if("".equals(adminorgId)){ if (map.containsKey("adminorgId")) {
map.put("adminorgId",userToken.getMaindeparment()); String adminorgId = map.get("adminorgId").toString();
if ("".equals(adminorgId)) {
map.put("adminorgId", userToken.getMaindeparment());
}
} else {
map.put("adminorgId", userToken.getMaindeparment());
} }
integer += depositoryRecordService.insertApplicationOutMin(map); integer += depositoryRecordService.insertApplicationOutMin(map);
// 开启一个线程执行发送信息操作 // 开启一个线程执行发送信息操作
@ -542,28 +547,40 @@ public class DepositoryRecordController {
insert.put("unit", map.get("unit" + temp)); insert.put("unit", map.get("unit" + temp));
// 获取主订单编号 // 获取主订单编号
insert.put("parentId", id); insert.put("parentId", id);
String constructionUnitId = (String) map.get("constructionUnitId"+temp); if (map.containsKey("constructionUnitId" + temp)) {
String adminorgId = (String) map.get("adminorgId"+temp); String constructionUnitId = (String) map.get("constructionUnitId" + temp);
if(!"".equals(constructionUnitId)) if (!"".equals(constructionUnitId)) {
{ insert.put("constructionUnitId", constructionUnitId);
insert.put("constructionUnitId",constructionUnitId); }
} }
if("".equals(adminorgId)){ if (map.containsKey("adminorgId" + temp)) {
map.put("adminorgId",userToken.getMaindeparment()); String adminorgId = (String) map.get("adminorgId" + temp);
}else{
map.put("adminorgId",adminorgId); if ("".equals(adminorgId)) {
map.put("adminorgId", userToken.getMaindeparment());
} else {
map.put("adminorgId", adminorgId);
}
} else {
map.put("adminorgId", userToken.getMaindeparment());
} }
// 插入子订单 // 插入子订单
integer += depositoryRecordService.insertApplicationOutMin(insert); integer += depositoryRecordService.insertApplicationOutMin(insert);
} }
String constructionUnitId = map.get("constructionUnitId").toString(); if (map.containsKey("constructionUnitId")) {
String adminorgId = map.get("adminorgId").toString(); String constructionUnitId = map.get("constructionUnitId").toString();
if("".equals(constructionUnitId)) if ("".equals(constructionUnitId)) {
{ map.remove("constructionUnitId");
map.remove("constructionUnitId"); }
} }
if("".equals(adminorgId)){ if (map.containsKey("adminorgId")) {
map.put("adminorgId",userToken.getMaindeparment()); String adminorgId = map.get("adminorgId").toString();
if ("".equals(adminorgId)) {
map.put("adminorgId", userToken.getMaindeparment());
}
} else {
map.put("adminorgId", userToken.getMaindeparment());
} }
// 插入子订单 // 插入子订单
map.put("parentId", id); map.put("parentId", id);
@ -620,7 +637,7 @@ public class DepositoryRecordController {
@GetMapping("/applicationInView") @GetMapping("/applicationInView")
public RestResponse findApplicationInRecordByCondition(@RequestParam Map<String, Object> map, HttpServletRequest request) { public RestResponse findApplicationInRecordByCondition(@RequestParam Map<String, Object> map, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -652,7 +669,7 @@ public class DepositoryRecordController {
// 0未完成1已完成 // 0未完成1已完成
Integer stateOnView = ObjectFormatUtil.toInteger(map.get("state")); Integer stateOnView = ObjectFormatUtil.toInteger(map.get("state"));
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -776,19 +793,19 @@ public class DepositoryRecordController {
@GetMapping("/applicationOutView") @GetMapping("/applicationOutView")
public RestResponse findApplicationOutRecordByCondition(@RequestParam Map<String, Object> map, HttpServletRequest request) { public RestResponse findApplicationOutRecordByCondition(@RequestParam Map<String, Object> map, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userByPort = AuthenticationTokenPool.getUserToken(token); UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
// 获取对应主订单 // 获取对应主订单
List<ApplicationOutRecordP> list = new ArrayList<>(); List<ApplicationOutRecordP> list = new ArrayList<>();
Integer countBy = 0; Integer countBy = 0;
if(Integer.compare(userByPort.getMaindeparment(),361)==0){ if (Integer.compare(userByPort.getMaindeparment(), 361) == 0) {
list = depositoryRecordService.findApplicationOutRecordPByCondition(map,userByPort); list = depositoryRecordService.findApplicationOutRecordPByCondition(map, userByPort);
countBy = depositoryRecordService.findApplicationOutRecordPCountByCondition(map); countBy = depositoryRecordService.findApplicationOutRecordPCountByCondition(map);
}else{ } else {
list = depositoryRecordService.findApplicationOutRecordPByUser(userByPort, map); list = depositoryRecordService.findApplicationOutRecordPByUser(userByPort, map);
countBy = depositoryRecordService.findApplicationOutRecordPCountByUser(userByPort, map); countBy = depositoryRecordService.findApplicationOutRecordPCountByUser(userByPort, map);
} }
@ -845,7 +862,7 @@ public class DepositoryRecordController {
@PostMapping("/addApplicationToRedis") @PostMapping("/addApplicationToRedis")
public RestResponse addApplicationToRedis(@RequestBody Map<String, Object> map, HttpServletRequest request) { public RestResponse addApplicationToRedis(@RequestBody Map<String, Object> map, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -878,7 +895,7 @@ public class DepositoryRecordController {
@PostMapping("/deleteApplicationToRedis") @PostMapping("/deleteApplicationToRedis")
public RestResponse deleteApplicationToRedis(@RequestBody Map<String, Object> map, HttpServletRequest request) { public RestResponse deleteApplicationToRedis(@RequestBody Map<String, Object> map, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -901,7 +918,7 @@ public class DepositoryRecordController {
@PutMapping("/review") @PutMapping("/review")
public RestResponse review(@RequestBody Map<String, Object> map, HttpServletRequest request) { public RestResponse review(@RequestBody Map<String, Object> map, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -918,7 +935,7 @@ public class DepositoryRecordController {
@PutMapping("/reviewIn") @PutMapping("/reviewIn")
public RestResponse reviewIn(@RequestBody Map<String, Object> map, HttpServletRequest request) { public RestResponse reviewIn(@RequestBody Map<String, Object> map, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -936,7 +953,7 @@ public class DepositoryRecordController {
@PutMapping("/transfer") @PutMapping("/transfer")
public RestResponse transfer(@RequestBody Map<String, Object> map, HttpServletRequest request) { public RestResponse transfer(@RequestBody Map<String, Object> map, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -1057,9 +1074,9 @@ public class DepositoryRecordController {
// 删除入库记录 // 删除入库记录
@PostMapping("/deleteApplicationInRecord") @PostMapping("/deleteApplicationInRecord")
public RestResponse deleteApplicationInRecord(@RequestBody Map<String, Object> map,HttpServletRequest request) { public RestResponse deleteApplicationInRecord(@RequestBody Map<String, Object> map, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userByPort = AuthenticationTokenPool.getUserToken(token); UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
@ -1067,10 +1084,10 @@ public class DepositoryRecordController {
String crypt = Md5.crypt(header); String crypt = Md5.crypt(header);
if (map.containsKey("id")) { if (map.containsKey("id")) {
Integer id = ObjectFormatUtil.toInteger(map.get("id")); Integer id = ObjectFormatUtil.toInteger(map.get("id"));
return CrudUtil.deleteHandle(depositoryRecordService.deleteApplicationInRecordById(id,userByPort,crypt), 1); return CrudUtil.deleteHandle(depositoryRecordService.deleteApplicationInRecordById(id, userByPort, crypt), 1);
} else if (map.containsKey("ids")) { } else if (map.containsKey("ids")) {
List<Integer> ids = (List<Integer>) map.get("ids"); List<Integer> ids = (List<Integer>) map.get("ids");
return CrudUtil.deleteHandle(depositoryRecordService.deleteApplicationInRecordByIds(ids,userByPort,crypt), ids.size()); return CrudUtil.deleteHandle(depositoryRecordService.deleteApplicationInRecordByIds(ids, userByPort, crypt), ids.size());
} else { } else {
throw new MyException("所需请求参数缺失!"); throw new MyException("所需请求参数缺失!");
} }
@ -1080,7 +1097,7 @@ public class DepositoryRecordController {
@PostMapping("/deleteApplicationOutRecord") @PostMapping("/deleteApplicationOutRecord")
public RestResponse deleteApplicationOutRecord(@RequestBody Map<String, Object> map, HttpServletRequest request) { public RestResponse deleteApplicationOutRecord(@RequestBody Map<String, Object> map, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userByPort = AuthenticationTokenPool.getUserToken(token); UserByPort userByPort = AuthenticationTokenPool.getUserToken(token);
@ -1134,7 +1151,7 @@ public class DepositoryRecordController {
int start = (page - 1) * pagesize; int start = (page - 1) * pagesize;
Integer end = page * 10; Integer end = page * 10;
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -1190,7 +1207,7 @@ public class DepositoryRecordController {
@PostMapping("/createMultiApplication") @PostMapping("/createMultiApplication")
public RestResponse createMultiApplication(@RequestBody Map<String, Object> map, HttpServletRequest request) { public RestResponse createMultiApplication(@RequestBody Map<String, Object> map, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -1303,7 +1320,7 @@ public class DepositoryRecordController {
@PostMapping("/createMultiApplications") @PostMapping("/createMultiApplications")
public RestResponse createMultiApplications(@RequestBody Map<String, Object> map, HttpServletRequest request) { public RestResponse createMultiApplications(@RequestBody Map<String, Object> map, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);
@ -1498,7 +1515,7 @@ public class DepositoryRecordController {
@PostMapping("/isCheckOut") @PostMapping("/isCheckOut")
public RestResponse isCheckOut(@RequestBody Map<String, Object> map, HttpServletRequest request) { public RestResponse isCheckOut(@RequestBody Map<String, Object> map, HttpServletRequest request) {
String token = request.getHeader("user-token"); String token = request.getHeader("user-token");
if(token == null){ if (token == null) {
token = (String) request.getSession().getAttribute("userToken"); token = (String) request.getSession().getAttribute("userToken");
} }
UserByPort userToken = AuthenticationTokenPool.getUserToken(token); UserByPort userToken = AuthenticationTokenPool.getUserToken(token);

9
src/main/java/com/dreamchaser/depository_manage/service/impl/GroupServiceImpl.java

@ -497,16 +497,19 @@ public class GroupServiceImpl implements GroupService {
List<Group> allGroupOnly = groupMapper.findAllGroupOnly(gname); List<Group> allGroupOnly = groupMapper.findAllGroupOnly(gname);
// 获取当前总数 // 获取当前总数
Integer totalVal = allGroupOnly.size(); int totalVal = allGroupOnly.size();
// 定义分页数量 // 定义分页数量
double size = 10.0; double size = 10.0;
// 定义线程数 // 定义线程数
Integer threadSize = (int) Math.ceil(totalVal / size); int threadSize = (int) Math.ceil(totalVal / size);
// 定义开启线程数目 // 定义开启线程数目
Integer openThreadSize = 0; int openThreadSize = 0;
if(threadSize == 0){
return list;
}
// 开启对应数量的线程 // 开启对应数量的线程
ExecutorService exs = Executors.newFixedThreadPool(threadSize); ExecutorService exs = Executors.newFixedThreadPool(threadSize);
// 线程结果集 // 线程结果集

167
src/main/resources/templates/pages/application/application-in.html

@ -413,6 +413,11 @@
// 用于卡片编号 // 用于卡片编号
var NewIdNumber = 1; var NewIdNumber = 1;
// 用于标志当前表单是否第一次提交
let flagForForm = false;
let GroupflagForForm = false;
// 用于暂存卡片个数(组合) // 用于暂存卡片个数(组合)
var params2 = []; var params2 = [];
layui.use(['form', 'step', 'flow', 'laydate', 'element'], function () { layui.use(['form', 'step', 'flow', 'laydate', 'element'], function () {
@ -449,92 +454,100 @@
// 用于提交操作 // 用于提交操作
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data = data.field; if(!flagForForm){
data.type = 1; flagForForm = true;
data.params = params; data = data.field;
$.ajax({ data.type = 1;
url: "/depositoryRecord/applicationIn", data.params = params;
type: 'post', $.ajax({
dataType: 'json', url: "/depositoryRecord/applicationIn",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(data), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(data),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.close(this.layerIndex); },
if (data.status >= 300) { success: function (data) {
var d = data.data; layer.close(this.layerIndex);
if (d === "") { if (data.status >= 300) {
layer.msg(data.statusInfo.detail); var d = data.data;
} else { if (d === "") {
var err = d["err"]; layer.msg(data.statusInfo.detail);
var success = d["success"];
var errMsg = "";
for (let i = 0; i < err.length; i++) {
errMsg += "物料编码: ";
errMsg += err[i]["code"];
}
if (err.length > 0) {
errMsg += "添加失败,请选择新仓库或库位";
layer.msg(errMsg, {
icon: 5,
time: 1000
}, function () {
step.next('#stepForm');
});
} else { } else {
step.next('#stepForm'); var err = d["err"];
var success = d["success"];
var errMsg = "";
for (let i = 0; i < err.length; i++) {
errMsg += "物料编码: ";
errMsg += err[i]["code"];
}
if (err.length > 0) {
errMsg += "添加失败,请选择新仓库或库位";
layer.msg(errMsg, {
icon: 5,
time: 1000
}, function () {
step.next('#stepForm');
});
} else {
step.next('#stepForm');
}
} }
}
} else { } else {
layer.msg("申请提交成功", { layer.msg("申请提交成功", {
icon: 6,//成功的表情 icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒) time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () { }, function () {
step.next('#stepForm'); step.next('#stepForm');
}); });
}
},
complete: function () {
layer.close(this.layerIndex);
} }
}, });
complete: function () { }
layer.close(this.layerIndex);
}
});
return false; return false;
}); });
// 用于提交操作(组合) // 用于提交操作(组合)
form.on('submit(formStep2)', function (data) { form.on('submit(formStep2)', function (data) {
data = data.field; if(!GroupflagForForm){
data.type = 1; GroupflagForForm = true;
data.params = params2; data = data.field;
$.ajax({ data.type = 1;
url: "/group/applicationInForGroup", data.params = params2;
type: 'post', $.ajax({
dataType: 'json', url: "/group/applicationInForGroup",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(data), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(data),
}, beforeSend: function () {
success: function (d) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.close(this.layerIndex); },
if (d.status >= 300) { success: function (d) {
layer.msg(d.statusInfo.detail);//失败的表情 layer.close(this.layerIndex);
if (d.status >= 300) {
} else { layer.msg(d.statusInfo.detail);//失败的表情
layer.msg("申请提交成功", {
icon: 6,//成功的表情 } else {
time: 500 //1秒关闭(如果不配置,默认是3秒) layer.msg("申请提交成功", {
}, function () { icon: 6,//成功的表情
step.next('#stepForm2'); time: 500 //1秒关闭(如果不配置,默认是3秒)
}); }, function () {
step.next('#stepForm2');
});
}
},
complete: function () {
layer.close(this.layerIndex);
} }
}, });
complete: function () { }
layer.close(this.layerIndex);
}
});
}); });
$('.pre').click(function () { $('.pre').click(function () {

67
src/main/resources/templates/pages/application/application-in_back.html

@ -139,11 +139,14 @@
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script> <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script> <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
<script> <script>
let flagForForm = false;
layui.use(['form', 'step','laydate'], function () { layui.use(['form', 'step','laydate'], function () {
var $ = layui.$, var $ = layui.$,
form = layui.form, form = layui.form,
laydate = layui.laydate, laydate = layui.laydate,
step = layui.step; step = layui.step;
// 用于标志当前表单是否第一次提交
var mid = $("#mid").val(); var mid = $("#mid").val();
var depositoryId = $("#depositoryId").val(); var depositoryId = $("#depositoryId").val();
@ -294,37 +297,41 @@
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data = data.field; if(!flagForForm){
data.type = 1; flagForForm = true;
var params = []; data = data.field;
data.params = params; data.type = 1;
$.ajax({ var params = [];
url: "/depositoryRecord/applicationIn", data.params = params;
type: 'post', $.ajax({
dataType: 'json', url: "/depositoryRecord/applicationIn",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(data), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(data),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.close(this.layerIndex); },
if (data.status >= 300) { success: function (data) {
layer.msg(data.statusInfo.detail);//失败的表情 layer.close(this.layerIndex);
return; if (data.status >= 300) {
} else { layer.msg(data.statusInfo.detail);//失败的表情
layer.msg("申请提交成功", { return;
icon: 6,//成功的表情 } else {
time: 500 //1秒关闭(如果不配置,默认是3秒) layer.msg("申请提交成功", {
}, function () { icon: 6,//成功的表情
step.next('#stepForm'); time: 500 //1秒关闭(如果不配置,默认是3秒)
}); }, function () {
step.next('#stepForm');
});
}
},
complete: function () {
layer.close(this.layerIndex);
} }
}, });
complete: function () { }
layer.close(this.layerIndex);
}
});
return false; return false;
}); });

92
src/main/resources/templates/pages/application/application-in_scanQrCode.html

@ -131,6 +131,10 @@
function initForm(num, obj) { function initForm(num, obj) {
} }
// 用于标志当前表单是否第一次提交
let flagForForm = false;
// 用于暂存卡片个数 // 用于暂存卡片个数
var params = []; var params = [];
// 用于卡片编号 // 用于卡片编号
@ -354,54 +358,58 @@
// 用于提交操作 // 用于提交操作
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data = data.field; if(!flagForForm){
data.type = 1; flagForForm = true;
data.params = params; data = data.field;
$.ajax({ data.type = 1;
url: "/depositoryRecord/applicationIn", data.params = params;
type: 'post', $.ajax({
dataType: 'json', url: "/depositoryRecord/applicationIn",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(data), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(data),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.close(this.layerIndex); },
if (data.status >= 300) { success: function (data) {
var d = data.data; layer.close(this.layerIndex);
if (d === "") { if (data.status >= 300) {
layer.msg(data.statusInfo.detail); var d = data.data;
} else { if (d === "") {
var err = d["err"]; layer.msg(data.statusInfo.detail);
var success = d["success"]; } else {
var errMsg = ""; var err = d["err"];
for (let i = 0; i < err.length; i++) { var success = d["success"];
errMsg += "物料编码: "; var errMsg = "";
errMsg += err[i]["code"]; for (let i = 0; i < err.length; i++) {
errMsg += "物料编码: ";
errMsg += err[i]["code"];
}
errMsg += "添加失败,请选择新仓库或库位";
layer.msg(errMsg, {
icon: 5,
time: 1000
}, function () {
step.next('#stepForm');
});
} }
errMsg += "添加失败,请选择新仓库或库位";
layer.msg(errMsg, { } else {
icon: 5, layer.msg("申请提交成功", {
time: 1000 icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () { }, function () {
step.next('#stepForm'); step.next('#stepForm');
}); });
} }
},
} else { complete: function () {
layer.msg("申请提交成功", { layer.close(this.layerIndex);
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
step.next('#stepForm');
});
} }
}, });
complete: function () { }
layer.close(this.layerIndex);
}
});
return false; return false;
}); });

284
src/main/resources/templates/pages/application/application-out.html

@ -203,14 +203,16 @@
class="layui-input" lay-verify="required" class="layui-input" lay-verify="required"
style="border-style: none"> style="border-style: none">
<img src="/static/images/search.ico" height="16" width="16" <img src="/static/images/search.ico" height="16" width="16"
style="margin-top: 10px;display: none" onclick="scanCodeByOut(this)"> style="margin-top: 10px;display: none"
onclick="scanCodeByOut(this)">
</div> </div>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">组合数量:</label> <label class="layui-form-label">组合数量:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="number" name="quantity" class="layui-input" id="quantityForGroup" onblur="groupQuantityIsTrue(this)" <input type="number" name="quantity" class="layui-input"
id="quantityForGroup" onblur="groupQuantityIsTrue(this)"
required lay-verify="number" placeholder="请填写组合数量"/> required lay-verify="number" placeholder="请填写组合数量"/>
</div> </div>
</div> </div>
@ -229,7 +231,8 @@
<!--提交按钮--> <!--提交按钮-->
<div class="layui-form-item" id="btn_sub2"> <div class="layui-form-item" id="btn_sub2">
<div class="layui-input-block"> <div class="layui-input-block">
<button class="layui-btn" lay-submit lay-filter="formStep2" type="button" <button class="layui-btn" lay-submit lay-filter="formStep2"
type="button"
style="margin-bottom: 30px;margin-left: 15%"> style="margin-bottom: 30px;margin-left: 15%">
&emsp;提交&emsp; &emsp;提交&emsp;
</button> </button>
@ -335,6 +338,10 @@
// 用于暂存卡片个数 // 用于暂存卡片个数
var params = []; var params = [];
// 用于标志当前表单是否第一次提交
let flagForForm = false;
let GroupflagForForm = false;
// 用于暂存卡片个数(组合) // 用于暂存卡片个数(组合)
var params2 = []; var params2 = [];
// 用于卡片编号 // 用于卡片编号
@ -373,116 +380,124 @@
// 提交(物料出库) // 提交(物料出库)
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data = data.field; if(!flagForForm){
data.params = params; flagForForm = true;
if (data.mid === undefined) { data = data.field;
// 如果没有初始项 data.params = params;
var dataKeys = Object.keys(data); if (data.mid === undefined) {
var dataKey; // 如果没有初始项
for (let i = 0; i < dataKeys.length; i++) { var dataKeys = Object.keys(data);
dataKey = dataKeys[i]; var dataKey;
if (dataKey.includes("mid")) { for (let i = 0; i < dataKeys.length; i++) {
break; dataKey = dataKeys[i];
if (dataKey.includes("mid")) {
break;
}
} }
} // 获取当前数字
// 获取当前数字 var keyNumber = dataKey.split("mid")[1];
var keyNumber = dataKey.split("mid")[1]; for (let index = 0; index < dataKeys.length; index++) {
for (let index = 0; index < dataKeys.length; index++) { var tempKey = dataKeys[index];
var tempKey = dataKeys[index]; if (tempKey.includes(keyNumber)) {
if (tempKey.includes(keyNumber)) { var key = tempKey.replace(keyNumber, "");
var key = tempKey.replace(keyNumber, ""); data[key] = data[tempKey];
data[key] = data[tempKey]; delete data[tempKey];
delete data[tempKey]; }
} }
data.params = remove(data.params, Number(keyNumber));
} }
data.params = remove(data.params, Number(keyNumber)); $.ajax({
} url: "/depositoryRecord/applicationOut",
$.ajax({ type: 'post',
url: "/depositoryRecord/applicationOut", dataType: 'json',
type: 'post', contentType: "application/json;charset=utf-8",
dataType: 'json', data: JSON.stringify(data),
contentType: "application/json;charset=utf-8", beforeSend: function () {
data: JSON.stringify(data), this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
beforeSend: function () { },
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); success: function (data) {
}, layer.close(this.layerIndex);
success: function (data) { if (data.status >= 300) {
layer.close(this.layerIndex); layer.msg(data.statusInfo.message);//失败的表情
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情 } else {
layer.msg("申请提交成功", {
} else { icon: 6,//成功的表情
layer.msg("申请提交成功", { time: 500 //1秒关闭(如果不配置,默认是3秒)
icon: 6,//成功的表情 }, function () {
time: 500 //1秒关闭(如果不配置,默认是3秒) step.next('#stepForm');
}, function () { });
step.next('#stepForm');
});
}
},
complete: function () {
layer.close(this.layerIndex);
} }
}, });
complete: function () { }
layer.close(this.layerIndex);
}
});
return false; return false;
}); });
// 提交(组合出库) // 提交(组合出库)
form.on('submit(formStep2)', function (data) { form.on('submit(formStep2)', function (data) {
data = data.field; if(!GroupflagForForm){
data.params = params2; GroupflagForForm = true;
if (data.gid === undefined) { data = data.field;
// 如果没有初始项 data.params = params2;
var dataKeys = Object.keys(data); if (data.gid === undefined) {
var dataKey; // 如果没有初始项
for (let i = 0; i < dataKeys.length; i++) { var dataKeys = Object.keys(data);
dataKey = dataKeys[i]; var dataKey;
if (dataKey.includes("gid")) { for (let i = 0; i < dataKeys.length; i++) {
break; dataKey = dataKeys[i];
if (dataKey.includes("gid")) {
break;
}
} }
} // 获取当前数字
// 获取当前数字 var keyNumber = dataKey.split("gid")[1];
var keyNumber = dataKey.split("gid")[1]; for (let index = 0; index < dataKeys.length; index++) {
for (let index = 0; index < dataKeys.length; index++) { var tempKey = dataKeys[index];
var tempKey = dataKeys[index]; if (tempKey.includes(keyNumber)) {
if (tempKey.includes(keyNumber)) { var key = tempKey.replace(keyNumber, "");
var key = tempKey.replace(keyNumber, ""); data[key] = data[tempKey];
data[key] = data[tempKey]; delete data[tempKey];
delete data[tempKey]; }
} }
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',
dataType: 'json', dataType: 'json',
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
data: JSON.stringify(data), data: JSON.stringify(data),
beforeSend: function () { beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
}, },
success: function (d) { success: function (d) {
layer.close(this.layerIndex); layer.close(this.layerIndex);
if (d.status >= 300) { if (d.status >= 300) {
layer.msg(d.statusInfo.detail);//失败的表情 layer.msg(d.statusInfo.detail);//失败的表情
} else { } else {
layer.msg("申请提交成功", { layer.msg("申请提交成功", {
icon: 6,//成功的表情 icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒) time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () { }, function () {
step.next('#stepForm2'); step.next('#stepForm2');
}); });
}
},
complete: function () {
layer.close(this.layerIndex);
} }
}, });
complete: function () { }
layer.close(this.layerIndex); return false;
}
});
}); });
$('.pre').click(function () { $('.pre').click(function () {
@ -554,7 +569,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">计量单位:</label> <label class="layui-form-label">计量单位:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<select id=`+"unit"+NewIdNumber+` name=`+"unit"+NewIdNumber+`> <select id=` + "unit" + NewIdNumber + ` name=` + "unit" + NewIdNumber + `>
</select> </select>
</div> </div>
@ -590,13 +605,13 @@
<div class="inputdiv"> <div class="inputdiv">
<input type="text" placeholder="请选择组合" class="layui-input" <input type="text" placeholder="请选择组合" class="layui-input"
style="border-style: none" style="border-style: none"
id=`+"openGroupList"+NewIdNumber+` onblur="selectGroupByName(this)" id=` + "openGroupList" + NewIdNumber + ` onblur="selectGroupByName(this)"
lay-verify="required"/> lay-verify="required"/>
<i class="layui-icon layui-icon-search" <i class="layui-icon layui-icon-search"
style="display: inline" style="display: inline"
id=`+"selectGroup"+NewIdNumber+` onclick="selectGroup(this)"></i> id=` + "selectGroup" + NewIdNumber + ` onclick="selectGroup(this)"></i>
</div> </div>
<input type="text" name=`+"gid"+NewIdNumber+` class="layui-input" id=`+"gid"+NewIdNumber+` <input type="text" name=` + "gid" + NewIdNumber + ` class="layui-input" id=` + "gid" + NewIdNumber + `
style="display: none" lay-verify="required"/> style="display: none" lay-verify="required"/>
</div> </div>
</div> </div>
@ -616,14 +631,14 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">组合数量:</label> <label class="layui-form-label">组合数量:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="number" name=`+"quantity"+NewIdNumber+` class="layui-input" id=`+"quantityForGroup"+NewIdNumber+` <input type="number" name=` + "quantity" + NewIdNumber + ` class="layui-input" id=` + "quantityForGroup" + NewIdNumber + `
required lay-verify="number" onblur="groupQuantityIsTrue(this)" placeholder="请填写组合数量"/> required lay-verify="number" onblur="groupQuantityIsTrue(this)" placeholder="请填写组合数量"/>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">备注说明:</label> <label class="layui-form-label">备注说明:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input name=`+"applyRemark"+NewIdNumber+` placeholder="请填写相关原因及申请原因" value="" <input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/> class="layui-input"/>
</div> </div>
</div> </div>
@ -762,7 +777,7 @@
var req = {}; var req = {};
req.code = code; req.code = code;
req.type = "out"; req.type = "out";
if(code !== ""){ if (code !== "") {
$.ajax({ $.ajax({
url: "/material/findMatrialByCode", url: "/material/findMatrialByCode",
type: "get", type: "get",
@ -843,7 +858,7 @@
let gnameItem = gnameParent.childNodes[1].childNodes[1]; let gnameItem = gnameParent.childNodes[1].childNodes[1];
let req = {}; let req = {};
req.code = code; req.code = code;
if(code !== ""){ if (code !== "") {
$.ajax({ $.ajax({
url: "/group/findGroupByCode", url: "/group/findGroupByCode",
type: "post", type: "post",
@ -856,7 +871,7 @@
layer.msg(d.statusInfo.detail, { layer.msg(d.statusInfo.detail, {
icon: 0, icon: 0,
time: 1500 time: 1500
},function () { }, function () {
obj.value = ''; obj.value = '';
gidItem.value = ''; gidItem.value = '';
gnameItem.value = ''; gnameItem.value = '';
@ -928,9 +943,9 @@
}, },
end: function () { end: function () {
var mid = materialId.value; var mid = materialId.value;
if(mid !== '') { if (mid !== '') {
$.ajax({ $.ajax({
url: "/material/findMatrialById?mid=" + mid+"&type=out", url: "/material/findMatrialById?mid=" + mid + "&type=out",
type: "get", type: "get",
dataType: 'json', dataType: 'json',
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
@ -987,7 +1002,7 @@
}; };
// 用于实现点击搜索按钮(组合) // 用于实现点击搜索按钮(组合)
selectGroup = function(obj){ selectGroup = function (obj) {
var parent = obj.parentNode.parentNode.parentNode.parentNode; var parent = obj.parentNode.parentNode.parentNode.parentNode;
var parentId = parent.id; var parentId = parent.id;
@ -1025,9 +1040,9 @@
content.css('height', '100%'); content.css('height', '100%');
iframeChildren.css('height', '100%'); iframeChildren.css('height', '100%');
}, },
end:function () { end: function () {
let gid = gidItem.value; let gid = gidItem.value;
if(gid !== ''){ if (gid !== '') {
let req = {}; let req = {};
req.gid = gid; req.gid = gid;
$.ajax({ $.ajax({
@ -1042,7 +1057,7 @@
layer.msg(d.statusInfo.detail, { layer.msg(d.statusInfo.detail, {
icon: 0, icon: 0,
time: 1500 time: 1500
},function () { }, function () {
obj.value = ''; obj.value = '';
gidItem.value = ''; gidItem.value = '';
gnameItem.value = ''; gnameItem.value = '';
@ -1078,7 +1093,7 @@
}; };
// 用于实现组合名称搜索 // 用于实现组合名称搜索
selectGroupByName = function(obj){ selectGroupByName = function (obj) {
let gname = obj.value; let gname = obj.value;
var parent = obj.parentNode.parentNode.parentNode.parentNode; var parent = obj.parentNode.parentNode.parentNode.parentNode;
// 获取对应元素 // 获取对应元素
@ -1094,7 +1109,7 @@
// gid // gid
let gidItem = gnameParent.childNodes[3]; let gidItem = gnameParent.childNodes[3];
if(gname !== ''){ if (gname !== '') {
var req = {}; var req = {};
@ -1106,12 +1121,12 @@
data: JSON.stringify(req), data: JSON.stringify(req),
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
success: function (d) { success: function (d) {
if(d.count === -1){ if (d.count === -1) {
// 如果当前组合名称的数量不止一个 // 如果当前组合名称的数量不止一个
layer.msg("请点击右侧搜索确定物品", { layer.msg("请点击右侧搜索确定物品", {
icon: 0, icon: 0,
time: 1500 time: 1500
},function () { }, function () {
obj.value = ''; obj.value = '';
gidItem.value = ''; gidItem.value = '';
gcodeItem.value = ''; gcodeItem.value = '';
@ -1122,12 +1137,12 @@
} }
} }
}); });
}else if(d.count === 0){ } else if (d.count === 0) {
// 如果当前组合名称不存在 // 如果当前组合名称不存在
layer.msg("没有该组合,请确认输入是否正确", { layer.msg("没有该组合,请确认输入是否正确", {
icon: 0, icon: 0,
time: 1500 time: 1500
},function () { }, function () {
obj.value = ''; obj.value = '';
gidItem.value = ''; gidItem.value = '';
gcodeItem.value = ''; gcodeItem.value = '';
@ -1138,7 +1153,7 @@
} }
} }
}); });
}else{ } else {
// 正常 // 正常
let data = d.data; let data = d.data;
let childNodes = parent.childNodes; let childNodes = parent.childNodes;
@ -1160,8 +1175,7 @@
} }
} }
}) })
} } else {
else{
gcodeItem.value = ''; gcodeItem.value = '';
gidItem.value = ''; gidItem.value = '';
let childNodes = parent.childNodes; let childNodes = parent.childNodes;
@ -1191,7 +1205,7 @@
var barCodeItem = barCodeChildren.childNodes[3]; var barCodeItem = barCodeChildren.childNodes[3];
var req = {}; var req = {};
data = data.split(",")[0]; data = data.split(",")[0];
if(data !== ""){ if (data !== "") {
req.mname = data; req.mname = data;
$.ajax({ $.ajax({
url: "/material/findInventoryByCondition", url: "/material/findInventoryByCondition",
@ -1218,7 +1232,7 @@
unit.empty(); unit.empty();
$("#unit" + idNumber).append(new Option(material.baseUnit, "-1")); $("#unit" + idNumber).append(new Option(material.baseUnit, "-1"));
var unitList = material["splitInfoList"]; var unitList = material["splitInfoList"];
if(unitList !== null && unitList != undefined){ if (unitList !== null && unitList != undefined) {
for (let i = 0; i < unitList.length; i++) { for (let i = 0; i < unitList.length; i++) {
$("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit)); $("#unit" + idNumber).append(new Option(unitList[i].newUnit, unitList[i].newUnit));
} }
@ -1266,10 +1280,9 @@
scanBarCode = function (obj) { scanBarCode = function (obj) {
let wxScan = parent; let wxScan = parent;
if(wxScan.wx === undefined){ if (wxScan.wx === undefined) {
wxScan = wxScan.parent.wx; wxScan = wxScan.parent.wx;
} } else {
else{
wxScan = wxScan.wx; wxScan = wxScan.wx;
} }
wxScan.scanQRCode({ wxScan.scanQRCode({
@ -1342,16 +1355,15 @@
scanCodeByOut = function (obj) { scanCodeByOut = function (obj) {
let wxScan = parent; let wxScan = parent;
if(wxScan.wx === undefined){ if (wxScan.wx === undefined) {
wxScan = wxScan.parent.wx; wxScan = wxScan.parent.wx;
} } else {
else{
wxScan = wxScan.wx; wxScan = wxScan.wx;
} }
wxScan.scanQRCode({ wxScan.scanQRCode({
desc: 'scanQRCode desc', desc: 'scanQRCode desc',
needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果, needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果,
scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有 scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有
success: function (res) { success: function (res) {
// 回调 // 回调
var result = res.resultStr;//当needResult为1时返回处理结果 var result = res.resultStr;//当needResult为1时返回处理结果
@ -1446,7 +1458,7 @@
MaterialQuantityIsTrue = function (obj) { MaterialQuantityIsTrue = function (obj) {
var id = obj.id.split("quantity")[1]; var id = obj.id.split("quantity")[1];
var mcode = $("#code" + id).val(); // 获取到当前输入的物料编码 var mcode = $("#code" + id).val(); // 获取到当前输入的物料编码
var unit = $("#unit"+id).val(); var unit = $("#unit" + id).val();
if (mcode === "" || mcode === undefined || mcode === null) { if (mcode === "" || mcode === undefined || mcode === null) {
layer.msg("请输入物料的正确编码!", {icon: 0, time: 500}, function () { layer.msg("请输入物料的正确编码!", {icon: 0, time: 500}, function () {
$("#quantity" + id).val("") $("#quantity" + id).val("")
@ -1459,6 +1471,7 @@
req.quantity = val; req.quantity = val;
req.unit = unit; req.unit = unit;
req.placeId = -1; req.placeId = -1;
let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({ $.ajax({
url: "/material/MaterialQuantityIsTrue", url: "/material/MaterialQuantityIsTrue",
type: "post", type: "post",
@ -1470,8 +1483,10 @@
if (!flag) { // 如果当前数目不合适 if (!flag) { // 如果当前数目不合适
layer.msg("当前单个仓库中物料数量不足", {icon: 0, time: 500}, function () { layer.msg("当前单个仓库中物料数量不足", {icon: 0, time: 500}, function () {
$("#quantity" + id).val(""); $("#quantity" + id).val("");
layer.close(loading2);
}); });
} else {
layer.close(loading2);
} }
} }
}); });
@ -1503,7 +1518,10 @@
var flag = res.data; var flag = res.data;
if (!flag) { // 如果当前数目不合适 if (!flag) { // 如果当前数目不合适
layer.msg("当前组合中"+res.statusInfo.message+"的库存数量不足", {icon: 0, time: 1000}, function () { layer.msg("当前组合中" + res.statusInfo.message + "的库存数量不足", {
icon: 0,
time: 1000
}, function () {
$("#quantityForGroup" + id).val(""); $("#quantityForGroup" + id).val("");
}); });

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

@ -143,6 +143,9 @@
function selectMaterial() { function selectMaterial() {
} }
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'step', 'layer', 'jquery'], function () { layui.use(['form', 'step', 'layer', 'jquery'], function () {
var $ = layui.$, var $ = layui.$,
form = layui.form, form = layui.form,
@ -307,36 +310,40 @@
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data = data.field; if(!flagForForm){
var params = []; flagForForm = true;
data.params = params; data = data.field;
$.ajax({ var params = [];
url: "/depositoryRecord/applicationOut", data.params = params;
type: 'post', $.ajax({
dataType: 'json', url: "/depositoryRecord/applicationOut",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(data), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(data),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.close(this.layerIndex); },
if (data.status >= 300) { success: function (data) {
layer.msg(data.statusInfo.message);//失败的表情 layer.close(this.layerIndex);
return; if (data.status >= 300) {
} else { layer.msg(data.statusInfo.message);//失败的表情
layer.msg("申请提交成功", { return;
icon: 6,//成功的表情 } else {
time: 500 //1秒关闭(如果不配置,默认是3秒) layer.msg("申请提交成功", {
}, function () { icon: 6,//成功的表情
step.next('#stepForm'); time: 500 //1秒关闭(如果不配置,默认是3秒)
}); }, function () {
step.next('#stepForm');
});
}
},
complete: function () {
layer.close(this.layerIndex);
} }
}, });
complete: function () { }
layer.close(this.layerIndex);
}
});
return false; return false;
}); });

62
src/main/resources/templates/pages/application/application-out_scanQrCode.html

@ -99,6 +99,8 @@
function initForm(num,obj) {} function initForm(num,obj) {}
// 用于卡片编号 // 用于卡片编号
var NewIdNumber = 1; var NewIdNumber = 1;
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'step', 'layer', 'jquery'], function () { layui.use(['form', 'step', 'layer', 'jquery'], function () {
var $ = layui.$, var $ = layui.$,
form = layui.form, form = layui.form,
@ -307,35 +309,39 @@
// 提交 // 提交
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data = data.field; if(!flagForForm){
data.params = params; flagForForm = true;
$.ajax({ data = data.field;
url: "/depositoryRecord/applicationOut", data.params = params;
type: 'post', $.ajax({
dataType: 'json', url: "/depositoryRecord/applicationOut",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(data), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(data),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.close(this.layerIndex); },
if (data.status >= 300) { success: function (data) {
layer.msg(data.statusInfo.message);//失败的表情 layer.close(this.layerIndex);
return; if (data.status >= 300) {
} else { layer.msg(data.statusInfo.message);//失败的表情
layer.msg("申请提交成功", { return;
icon: 6,//成功的表情 } else {
time: 500 //1秒关闭(如果不配置,默认是3秒) layer.msg("申请提交成功", {
}, function () { icon: 6,//成功的表情
step.next('#stepForm'); time: 500 //1秒关闭(如果不配置,默认是3秒)
}); }, function () {
step.next('#stepForm');
});
}
},
complete: function () {
layer.close(this.layerIndex);
} }
}, })
complete: function () { }
layer.close(this.layerIndex);
}
})
return false; return false;
}); });

42
src/main/resources/templates/pages/application/application-review.html

@ -184,7 +184,8 @@
function selectThisMinRecord(obj){ function selectThisMinRecord(obj){
} }
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'step'], function () { layui.use(['form', 'step'], function () {
var $ = layui.$, var $ = layui.$,
form = layui.form, form = layui.form,
@ -235,26 +236,33 @@
$("#check").show(); $("#check").show();
} }
review = function (pass) { review = function (pass) {
let data = {}; if(!flagForForm){
data.id = $("#id").text(); flagForForm = true;
if (pass == 1) { let data = {};
data.departmentheadPass = 1; data.id = $("#id").text();
} else { if (pass == 1) {
data.departmentheadPass = 2; data.departmentheadPass = 1;
} else {
data.departmentheadPass = 2;
}
data.departmentheadMessage = $("#departmentheadMessageF").val();
send(data);
} }
data.departmentheadMessage = $("#departmentheadMessageF").val();
send(data);
}; };
check = function (pass) { check = function (pass) {
let data = {}; if(!flagForForm) {
data.id = $("#id").text(); flagForForm = true;
if (pass == 1) { let data = {};
data.depositoryManagerPass = 1; data.id = $("#id").text();
} else { if (pass == 1) {
data.depositoryManagerPass = 2; data.depositoryManagerPass = 1;
} else {
data.depositoryManagerPass = 2;
}
data.depositoryManagerMessage = $("#depositoryManagerMessageF").val();
send(data);
} }
data.depositoryManagerMessage = $("#depositoryManagerMessageF").val();
send(data);
}; };
function send(req) { function send(req) {

100
src/main/resources/templates/pages/application/application-transfer.html

@ -201,6 +201,8 @@
let scanValue = {}; let scanValue = {};
// 用于卡片编号 // 用于卡片编号
var NewIdNumber = 1; var NewIdNumber = 1;
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use([ 'form', 'step','layer','jquery'], function () { layui.use([ 'form', 'step','layer','jquery'], function () {
var $ = layui.$, var $ = layui.$,
form = layui.form, form = layui.form,
@ -221,57 +223,61 @@
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data=data.field; if(!flagForForm){
data.params = params; flagForForm = true;
if(data.mid === undefined){ data=data.field;
// 如果没有初始项 data.params = params;
var dataKeys = Object.keys(data); if(data.mid === undefined){
var dataKey; // 如果没有初始项
for (let i = 0; i < dataKeys.length; i++) { var dataKeys = Object.keys(data);
dataKey = dataKeys[i]; var dataKey;
if(dataKey.includes("mid")){ for (let i = 0; i < dataKeys.length; i++) {
break; dataKey = dataKeys[i];
if(dataKey.includes("mid")){
break;
}
} }
} // 获取当前数字
// 获取当前数字 var keyNumber = dataKey.split("mid")[1];
var keyNumber = dataKey.split("mid")[1]; for (let index = 0; index < dataKeys.length; index++) {
for (let index = 0; index < dataKeys.length; index++) { var tempKey = dataKeys[index];
var tempKey = dataKeys[index]; if(tempKey.includes(keyNumber)){
if(tempKey.includes(keyNumber)){ var key = tempKey.replace(keyNumber,"");
var key = tempKey.replace(keyNumber,""); data[key] = data[tempKey];
data[key] = data[tempKey]; delete data[tempKey];
delete data[tempKey]; }
} }
data.params = remove(data.params,Number(keyNumber));
} }
data.params = remove(data.params,Number(keyNumber)); $.ajax({
} url:"/depositoryRecord/transfer",
$.ajax({ type:'put',
url:"/depositoryRecord/transfer", dataType:'json',
type:'put', contentType: "application/json;charset=utf-8",
dataType:'json', data:JSON.stringify(data),
contentType: "application/json;charset=utf-8", beforeSend:function () {
data:JSON.stringify(data), this.layerIndex = layer.load(0, { shade: [0.5, '#393D49'] });
beforeSend:function () { },
this.layerIndex = layer.load(0, { shade: [0.5, '#393D49'] }); success:function(data){
}, layer.close(this.layerIndex);
success:function(data){ if(data.status >= 300){
layer.close(this.layerIndex); layer.msg(data.statusInfo.message);//失败的表情
if(data.status >= 300){ return;
layer.msg(data.statusInfo.message);//失败的表情 }else{
return; layer.msg("申请提交成功", {
}else{ icon: 6,//成功的表情
layer.msg("申请提交成功", { time: 500 //1秒关闭(如果不配置,默认是3秒)
icon: 6,//成功的表情 }, function(){
time: 500 //1秒关闭(如果不配置,默认是3秒) step.next('#stepForm');
}, function(){ });
step.next('#stepForm'); }
}); },
complete: function () {
layer.close(this.layerIndex);
} }
}, });
complete: function () { }
layer.close(this.layerIndex);
}
});
return false; return false;
}); });

64
src/main/resources/templates/pages/application/application-transfer_back.html

@ -151,6 +151,8 @@
var params = []; var params = [];
// 用于卡片编号 // 用于卡片编号
var NewIdNumber = 1; var NewIdNumber = 1;
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use([ 'form', 'step','layer','jquery'], function () { layui.use([ 'form', 'step','layer','jquery'], function () {
var $ = layui.$, var $ = layui.$,
form = layui.form, form = layui.form,
@ -171,36 +173,40 @@
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data=data.field; if(!flagForForm){
data.params = params; flagForForm = true;
$.ajax({ data=data.field;
url:"/depositoryRecord/transfer", data.params = params;
type:'put', $.ajax({
dataType:'json', url:"/depositoryRecord/transfer",
contentType: "application/json;charset=utf-8", type:'put',
data:JSON.stringify(data), dataType:'json',
beforeSend:function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, { shade: [0.5, '#393D49'] }); data:JSON.stringify(data),
}, beforeSend:function () {
success:function(data){ this.layerIndex = layer.load(0, { shade: [0.5, '#393D49'] });
layer.close(this.layerIndex); },
if(data.status >= 300){ success:function(data){
layer.msg(data.statusInfo.message);//失败的表情 layer.close(this.layerIndex);
return; if(data.status >= 300){
}else{ layer.msg(data.statusInfo.message);//失败的表情
layer.msg("申请提交成功", { return;
icon: 6,//成功的表情 }else{
time: 500 //1秒关闭(如果不配置,默认是3秒) layer.msg("申请提交成功", {
}, function(){ icon: 6,//成功的表情
step.next('#stepForm'); time: 500 //1秒关闭(如果不配置,默认是3秒)
}); }, function(){
step.next('#stepForm');
});
}
},
complete: function () {
layer.close(this.layerIndex);
} }
}, })
complete: function () { return false;
layer.close(this.layerIndex); }
}
})
return false;
}); });
form.on('submit(formStep2)', function (data) { form.on('submit(formStep2)', function (data) {

62
src/main/resources/templates/pages/application/application_in_multi.html

@ -32,6 +32,8 @@
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script> <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script> <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
<script> <script>
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'step'], function () { layui.use(['form', 'step'], function () {
var $ = layui.$, var $ = layui.$,
form = layui.form, form = layui.form,
@ -172,35 +174,39 @@
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data = data.field; if(!flagForForm){
data.type = 1; flagForForm = true;
$.ajax({ data = data.field;
url: "/depositoryRecord/applicationIn", data.type = 1;
type: 'post', $.ajax({
dataType: 'json', url: "/depositoryRecord/applicationIn",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(data), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(data),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.close(this.layerIndex); },
if (data.status >= 300) { success: function (data) {
layer.msg(data.statusInfo.detail);//失败的表情 layer.close(this.layerIndex);
return; if (data.status >= 300) {
} else { layer.msg(data.statusInfo.detail);//失败的表情
layer.msg("申请提交成功", { return;
icon: 6,//成功的表情 } else {
time: 500 //1秒关闭(如果不配置,默认是3秒) layer.msg("申请提交成功", {
}, function () { icon: 6,//成功的表情
step.next('#stepForm'); time: 500 //1秒关闭(如果不配置,默认是3秒)
}); }, function () {
step.next('#stepForm');
});
}
},
complete: function () {
layer.close(this.layerIndex);
} }
}, })
complete: function () { }
layer.close(this.layerIndex);
}
})
return false; return false;
}); });

22
src/main/resources/templates/pages/application/form-step-look_group_review.html

@ -217,18 +217,24 @@
<script> <script>
function review() { function review() {
} }
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'table', 'laydate'], function () { layui.use(['form', 'table', 'laydate'], function () {
var $ = layui.jquery; var $ = layui.jquery;
review = function (pass) { review = function (pass) {
let data = {}; if(!flagForForm){
data.id = $("#id").val(); flagForForm = true;
if (pass === 1) { let data = {};
data.approverPass = 1; data.id = $("#id").val();
} else { if (pass === 1) {
data.approverPass = 2; data.approverPass = 1;
} else {
data.approverPass = 2;
}
data.approverMessage = $("#approverMessage").val();
send(data);
} }
data.approverMessage = $("#approverMessage").val();
send(data);
}; };
function send(req) { function send(req) {

22
src/main/resources/templates/pages/application/form-step-look_in_review.html

@ -126,20 +126,26 @@
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script> <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script> <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
<script> <script>
// 用于标志是否为第一次提交
let flagForForm = false;
function review() { function review() {
} }
layui.use(['form', 'table', 'laydate'], function () { layui.use(['form', 'table', 'laydate'], function () {
var $ = layui.jquery; var $ = layui.jquery;
review = function (pass) { review = function (pass) {
let data = {}; if(!flagForForm){
data.id = $("#id").val(); flagForForm = true;
if (pass === 1) { let data = {};
data.approverPass = 1; data.id = $("#id").val();
} else { if (pass === 1) {
data.approverPass = 2; data.approverPass = 1;
} else {
data.approverPass = 2;
}
data.approverMessage = $("#approverMessage").val();
send(data);
} }
data.approverMessage = $("#approverMessage").val();
send(data);
}; };
function send(req) { function send(req) {

251
src/main/resources/templates/pages/applicationForStorageCenter/application-out.html

@ -133,7 +133,7 @@
readonly readonly
id="openCompanyAdminorg" id="openCompanyAdminorg"
onclick="selectPost(this)" onclick="selectPost(this)"
/> />
<input type="text" name="adminorgId" class="layui-input" <input type="text" name="adminorgId" class="layui-input"
id="adminorgId" id="adminorgId"
style="display: none"/> style="display: none"/>
@ -146,7 +146,7 @@
readonly readonly
id="openConstructionUnit" id="openConstructionUnit"
onclick="selectConstructionUnit(this)" onclick="selectConstructionUnit(this)"
/> />
<input type="text" name="constructionUnitId" class="layui-input" <input type="text" name="constructionUnitId" class="layui-input"
id="constructionUnitId" id="constructionUnitId"
style="display: none"/> style="display: none"/>
@ -249,7 +249,7 @@
readonly readonly
id="openCompanyAdminorgForGroup" id="openCompanyAdminorgForGroup"
onclick="selectPost(this)" onclick="selectPost(this)"
/> />
<input type="text" name="adminorgId" class="layui-input" <input type="text" name="adminorgId" class="layui-input"
id="adminorgIdForGroup" id="adminorgIdForGroup"
style="display: none"/> style="display: none"/>
@ -262,7 +262,7 @@
readonly readonly
id="openConstructionUnitForGroup" id="openConstructionUnitForGroup"
onclick="selectConstructionUnit(this)" onclick="selectConstructionUnit(this)"
/> />
<input type="text" name="constructionUnitId" class="layui-input" <input type="text" name="constructionUnitId" class="layui-input"
id="constructionUnitIdForGroup" id="constructionUnitIdForGroup"
style="display: none"/> style="display: none"/>
@ -404,6 +404,11 @@
var params2 = []; var params2 = [];
// 用于卡片编号 // 用于卡片编号
var NewIdNumber = 1; var NewIdNumber = 1;
// 用于标志是否为第一次提交
let flagForForm = false;
let GroupFlagForForm = false;
layui.use(['form', 'step', 'layer', 'jquery', 'element'], function () { layui.use(['form', 'step', 'layer', 'jquery', 'element'], function () {
var $ = layui.$, var $ = layui.$,
form = layui.form, form = layui.form,
@ -438,116 +443,123 @@
// 提交(物料出库) // 提交(物料出库)
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data = data.field; if(!flagForForm){
data.params = params; flagForForm = true;
if (data.mid === undefined) { data = data.field;
// 如果没有初始项 data.params = params;
var dataKeys = Object.keys(data); if (data.mid === undefined) {
var dataKey; // 如果没有初始项
for (let i = 0; i < dataKeys.length; i++) { var dataKeys = Object.keys(data);
dataKey = dataKeys[i]; var dataKey;
if (dataKey.includes("mid")) { for (let i = 0; i < dataKeys.length; i++) {
break; dataKey = dataKeys[i];
if (dataKey.includes("mid")) {
break;
}
} }
} // 获取当前数字
// 获取当前数字 var keyNumber = dataKey.split("mid")[1];
var keyNumber = dataKey.split("mid")[1]; for (let index = 0; index < dataKeys.length; index++) {
for (let index = 0; index < dataKeys.length; index++) { var tempKey = dataKeys[index];
var tempKey = dataKeys[index]; if (tempKey.includes(keyNumber)) {
if (tempKey.includes(keyNumber)) { var key = tempKey.replace(keyNumber, "");
var key = tempKey.replace(keyNumber, ""); data[key] = data[tempKey];
data[key] = data[tempKey]; delete data[tempKey];
delete data[tempKey]; }
} }
data.params = remove(data.params, Number(keyNumber));
} }
data.params = remove(data.params, Number(keyNumber)); $.ajax({
} url: "/depositoryRecord/applicationOut",
$.ajax({ type: 'post',
url: "/depositoryRecord/applicationOut", dataType: 'json',
type: 'post', contentType: "application/json;charset=utf-8",
dataType: 'json', data: JSON.stringify(data),
contentType: "application/json;charset=utf-8", beforeSend: function () {
data: JSON.stringify(data), this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
beforeSend: function () { },
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); success: function (data) {
}, layer.close(this.layerIndex);
success: function (data) { if (data.status >= 300) {
layer.close(this.layerIndex); layer.msg(data.statusInfo.message);//失败的表情
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情 } else {
layer.msg("申请提交成功", {
} else { icon: 6,//成功的表情
layer.msg("申请提交成功", { time: 500 //1秒关闭(如果不配置,默认是3秒)
icon: 6,//成功的表情 }, function () {
time: 500 //1秒关闭(如果不配置,默认是3秒) step.next('#stepForm');
}, function () { });
step.next('#stepForm');
});
}
},
complete: function () {
layer.close(this.layerIndex);
} }
}, });
complete: function () { }
layer.close(this.layerIndex);
}
});
return false; return false;
}); });
// 提交(组合出库) // 提交(组合出库)
form.on('submit(formStep2)', function (data) { form.on('submit(formStep2)', function (data) {
data = data.field; if(!GroupFlagForForm){
data.params = params2; GroupFlagForForm = true;
if (data.gid === undefined) { data = data.field;
// 如果没有初始项 data.params = params2;
var dataKeys = Object.keys(data); if (data.gid === undefined) {
var dataKey; // 如果没有初始项
for (let i = 0; i < dataKeys.length; i++) { var dataKeys = Object.keys(data);
dataKey = dataKeys[i]; var dataKey;
if (dataKey.includes("gid")) { for (let i = 0; i < dataKeys.length; i++) {
break; dataKey = dataKeys[i];
if (dataKey.includes("gid")) {
break;
}
} }
} // 获取当前数字
// 获取当前数字 var keyNumber = dataKey.split("gid")[1];
var keyNumber = dataKey.split("gid")[1]; for (let index = 0; index < dataKeys.length; index++) {
for (let index = 0; index < dataKeys.length; index++) { var tempKey = dataKeys[index];
var tempKey = dataKeys[index]; if (tempKey.includes(keyNumber)) {
if (tempKey.includes(keyNumber)) { var key = tempKey.replace(keyNumber, "");
var key = tempKey.replace(keyNumber, ""); data[key] = data[tempKey];
data[key] = data[tempKey]; delete data[tempKey];
delete data[tempKey]; }
} }
data.params = remove(data.params, Number(keyNumber));
} }
data.params = remove(data.params, Number(keyNumber)); $.ajax({
} url: "/group/applicationOutForGroup",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (d) {
layer.close(this.layerIndex);
if (d.status >= 300) {
layer.msg(d.statusInfo.detail);//失败的表情
$.ajax({ } else {
url: "/group/applicationOutForGroup", layer.msg("申请提交成功", {
type: 'post', icon: 6,//成功的表情
dataType: 'json', time: 500 //1秒关闭(如果不配置,默认是3秒)
contentType: "application/json;charset=utf-8", }, function () {
data: JSON.stringify(data), step.next('#stepForm2');
beforeSend: function () { });
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); }
}, },
success: function (d) { complete: function () {
layer.close(this.layerIndex); layer.close(this.layerIndex);
if (d.status >= 300) {
layer.msg(d.statusInfo.detail);//失败的表情
} else {
layer.msg("申请提交成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
step.next('#stepForm2');
});
} }
}, });
complete: function () { }
layer.close(this.layerIndex);
}
});
}); });
$('.pre').click(function () { $('.pre').click(function () {
@ -629,11 +641,11 @@
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" placeholder="请选择部门" class="layui-input" <input type="text" placeholder="请选择部门" class="layui-input"
readonly readonly
id=`+"openCompanyAdminorg"+NewIdNumber+` id=` + "openCompanyAdminorg" + NewIdNumber + `
onclick="selectPost(this)" onclick="selectPost(this)"
/> />
<input type="text" name=`+"adminorgId"+NewIdNumber+` class="layui-input" <input type="text" name=` + "adminorgId" + NewIdNumber + ` class="layui-input"
id=`+"adminorgId"+NewIdNumber+` id=` + "adminorgId" + NewIdNumber + `
style="display: none"/> style="display: none"/>
</div> </div>
</div> </div>
@ -642,11 +654,11 @@
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" placeholder="请选择施工单位" class="layui-input" <input type="text" placeholder="请选择施工单位" class="layui-input"
readonly readonly
id=`+"openConstructionUnit"+NewIdNumber+` id=` + "openConstructionUnit" + NewIdNumber + `
onclick="selectConstructionUnit(this)" onclick="selectConstructionUnit(this)"
/> />
<input type="text" name=`+"constructionUnitId"+NewIdNumber+` class="layui-input" <input type="text" name=` + "constructionUnitId" + NewIdNumber + ` class="layui-input"
id=`+"constructionUnitId"+NewIdNumber+` id=` + "constructionUnitId" + NewIdNumber + `
style="display: none"/> style="display: none"/>
</div> </div>
</div> </div>
@ -716,11 +728,11 @@
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" placeholder="请选择部门" class="layui-input" <input type="text" placeholder="请选择部门" class="layui-input"
readonly readonly
id=`+"openCompanyAdminorgForGroup"+NewIdNumber+` id=` + "openCompanyAdminorgForGroup" + NewIdNumber + `
onclick="selectPost(this)" onclick="selectPost(this)"
/> />
<input type="text" name=`+"adminorgId"+NewIdNumber+` class="layui-input" <input type="text" name=` + "adminorgId" + NewIdNumber + ` class="layui-input"
id=`+"adminorgIdForGroup"+NewIdNumber+` id=` + "adminorgIdForGroup" + NewIdNumber + `
style="display: none"/> style="display: none"/>
</div> </div>
</div> </div>
@ -729,11 +741,11 @@
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" placeholder="请选择施工单位" class="layui-input" <input type="text" placeholder="请选择施工单位" class="layui-input"
readonly readonly
id=`+"openConstructionUnitForGroup"+NewIdNumber+` id=` + "openConstructionUnitForGroup" + NewIdNumber + `
onclick="selectConstructionUnit(this)" onclick="selectConstructionUnit(this)"
/> />
<input type="text" name=`+"constructionUnitId"+NewIdNumber+` class="layui-input" <input type="text" name=` + "constructionUnitId" + NewIdNumber + ` class="layui-input"
id=`+"constructionUnitIdForGroup"+NewIdNumber+` id=` + "constructionUnitIdForGroup" + NewIdNumber + `
style="display: none"/> style="display: none"/>
</div> </div>
</div> </div>
@ -1573,6 +1585,7 @@
req.quantity = val; req.quantity = val;
req.unit = unit; req.unit = unit;
req.placeId = -1; req.placeId = -1;
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
$.ajax({ $.ajax({
url: "/material/MaterialQuantityIsTrue", url: "/material/MaterialQuantityIsTrue",
type: "post", type: "post",
@ -1583,10 +1596,14 @@
var flag = res.data; var flag = res.data;
if (!flag) { // 如果当前数目不合适 if (!flag) { // 如果当前数目不合适
layer.msg("当前单个仓库中物料数量不足", {icon: 0, time: 500}, function () { layer.msg("当前单个仓库中物料数量不足", {icon: 0, time: 500}, function () {
$("#quantity" + id).val(""); layer.close(loading2);
}); $("#quantity" + id).val("");
},
);
}else{
layer.close(loading2)
} }
} }
}); });
} }
@ -1597,9 +1614,11 @@
groupQuantityIsTrue = function (obj) { groupQuantityIsTrue = function (obj) {
var id = obj.id.split("quantityForGroup")[1]; var id = obj.id.split("quantityForGroup")[1];
var gid = $("#gid" + id).val(); // 获取到当前输入的物料编码 var gid = $("#gid" + id).val(); // 获取到当前输入的物料编码
let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0});
if (gid === "" || gid === undefined || gid === null) { if (gid === "" || gid === undefined || gid === null) {
layer.msg("请输入正确的组合!", {icon: 0, time: 500}, function () { layer.msg("请输入正确的组合!", {icon: 0, time: 500}, function () {
$("#quantityForGroup" + id).val("") $("#quantityForGroup" + id).val("");
layer.close(loading2)
}); });
} else { } else {
let val = $("#quantityForGroup" + id).val(); let val = $("#quantityForGroup" + id).val();
@ -1607,6 +1626,7 @@
var req = {}; var req = {};
req.gid = gid; req.gid = gid;
req.quantity = val; req.quantity = val;
$.ajax({ $.ajax({
url: "/group/groupQuantityIsTrue", url: "/group/groupQuantityIsTrue",
type: "post", type: "post",
@ -1622,8 +1642,11 @@
time: 1000 time: 1000
}, function () { }, function () {
$("#quantityForGroup" + id).val(""); $("#quantityForGroup" + id).val("");
layer.close(loading2)
}); });
}else{
layer.close(loading2);
} }
} }
}); });

64
src/main/resources/templates/pages/applicationForStorageCenter/application-out_back.html

@ -178,6 +178,8 @@
function selectPost() { function selectPost() {
} }
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'step', 'layer', 'jquery'], function () { layui.use(['form', 'step', 'layer', 'jquery'], function () {
var $ = layui.$, var $ = layui.$,
form = layui.form, form = layui.form,
@ -342,36 +344,40 @@
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data = data.field; if(!flagForForm){
var params = []; flagForForm = true;
data.params = params; data = data.field;
$.ajax({ var params = [];
url: "/depositoryRecord/applicationOut", data.params = params;
type: 'post', $.ajax({
dataType: 'json', url: "/depositoryRecord/applicationOut",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(data), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(data),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.close(this.layerIndex); },
if (data.status >= 300) { success: function (data) {
layer.msg(data.statusInfo.message);//失败的表情 layer.close(this.layerIndex);
return; if (data.status >= 300) {
} else { layer.msg(data.statusInfo.message);//失败的表情
layer.msg("申请提交成功", { return;
icon: 6,//成功的表情 } else {
time: 500 //1秒关闭(如果不配置,默认是3秒) layer.msg("申请提交成功", {
}, function () { icon: 6,//成功的表情
step.next('#stepForm'); time: 500 //1秒关闭(如果不配置,默认是3秒)
}); }, function () {
step.next('#stepForm');
});
}
},
complete: function () {
layer.close(this.layerIndex);
} }
}, });
complete: function () { }
layer.close(this.layerIndex);
}
});
return false; return false;
}); });

61
src/main/resources/templates/pages/applicationForStorageCenter/application-out_scanQrCode.html

@ -99,6 +99,8 @@
function initForm(num,obj) {} function initForm(num,obj) {}
// 用于卡片编号 // 用于卡片编号
var NewIdNumber = 1; var NewIdNumber = 1;
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'step', 'layer', 'jquery'], function () { layui.use(['form', 'step', 'layer', 'jquery'], function () {
var $ = layui.$, var $ = layui.$,
form = layui.form, form = layui.form,
@ -307,35 +309,38 @@
// 提交 // 提交
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data = data.field; if(!flagForForm){
data.params = params; flagForForm = true;
$.ajax({ data = data.field;
url: "/depositoryRecord/applicationOut", data.params = params;
type: 'post', $.ajax({
dataType: 'json', url: "/depositoryRecord/applicationOut",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(data), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(data),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.close(this.layerIndex); },
if (data.status >= 300) { success: function (data) {
layer.msg(data.statusInfo.message);//失败的表情 layer.close(this.layerIndex);
return; if (data.status >= 300) {
} else { layer.msg(data.statusInfo.message);//失败的表情
layer.msg("申请提交成功", { return;
icon: 6,//成功的表情 } else {
time: 500 //1秒关闭(如果不配置,默认是3秒) layer.msg("申请提交成功", {
}, function () { icon: 6,//成功的表情
step.next('#stepForm'); time: 500 //1秒关闭(如果不配置,默认是3秒)
}); }, function () {
step.next('#stepForm');
});
}
},
complete: function () {
layer.close(this.layerIndex);
} }
}, })
complete: function () { }
layer.close(this.layerIndex);
}
})
return false; return false;
}); });

59
src/main/resources/templates/pages/company/company_add.html

@ -63,40 +63,45 @@
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script> <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script> <script>
var data; var data;
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'layer'], function () { layui.use(['form', 'layer'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,
layer = layui.layer; layer = layui.layer;
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
$.ajax({ if(!flagForForm){
url:"/company/company_add", flagForForm = true;
type:'post', $.ajax({
dataType:'json', url:"/company/company_add",
contentType: "application/json;charset=utf-8", type:'post',
data:JSON.stringify(data.field), dataType:'json',
beforeSend:function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, { shade: [0.5, '#393D49'] }); data:JSON.stringify(data.field),
}, beforeSend:function () {
success:function(data){ this.layerIndex = layer.load(0, { shade: [0.5, '#393D49'] });
layer.close(this.layerIndex); },
if(data.status >= 300){ success:function(data){
layer.msg(data.statusInfo.message);//失败的表情 layer.close(this.layerIndex);
return; if(data.status >= 300){
}else{ layer.msg(data.statusInfo.message);//失败的表情
layer.msg("添加成功!", { return;
icon: 6,//成功的表情 }else{
time: 1000 //1秒关闭(如果不配置,默认是3秒) layer.msg("添加成功!", {
}); icon: 6,//成功的表情
time: 1000 //1秒关闭(如果不配置,默认是3秒)
});
}
},
complete: function () {
form.val("form1", {
"cname": "" // "name": "value"
,"introduce": ""
})
} }
}, })
complete: function () { }
form.val("form1", {
"cname": "" // "name": "value"
,"introduce": ""
})
}
})
return false; return false;
}); });

65
src/main/resources/templates/pages/constructionunit/constructionunit_add.html

@ -63,43 +63,48 @@
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script> <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script> <script>
var data; var data;
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'layer'], function () { layui.use(['form', 'layer'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,
layer = layui.layer; layer = layui.layer;
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
$.ajax({ if(!flagForForm){
url: "/company/constructionUnitAdd", flagForForm = true;
type: 'post', $.ajax({
dataType: 'json', url: "/company/constructionUnitAdd",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(data.field), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(data.field),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.close(this.layerIndex); },
if (data.status >= 300) { success: function (data) {
layer.msg(data.statusInfo.message);//失败的表情 layer.close(this.layerIndex);
return; if (data.status >= 300) {
} else { layer.msg(data.statusInfo.message);//失败的表情
layer.msg("添加成功!", { return;
icon: 6,//成功的表情 } else {
time: 1000 //1秒关闭(如果不配置,默认是3秒) layer.msg("添加成功!", {
}, function () { icon: 6,//成功的表情
window.location = "/constructionUnitAdd" time: 1000 //1秒关闭(如果不配置,默认是3秒)
}); }, function () {
window.location = "/constructionUnitAdd"
});
}
},
complete: function () {
form.val("form1", {
"name": "",// "name": "value"
"address": "",
"introduce": ""
})
} }
}, });
complete: function () { }
form.val("form1", {
"name": "",// "name": "value"
"address": "",
"introduce": ""
})
}
});
return false; return false;
}); });

51
src/main/resources/templates/pages/constructionunit/constructionunit_edit.html

@ -67,36 +67,41 @@
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script> <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script> <script>
var data; var data;
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'layer'], function () { layui.use(['form', 'layer'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,
layer = layui.layer; layer = layui.layer;
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
$.ajax({ if(!flagForForm){
url: "/company/ConstructionUnitEdit", flagForForm = true;
type: 'post', $.ajax({
dataType: 'json', url: "/company/ConstructionUnitEdit",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(data.field), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(data.field),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.close(this.layerIndex); },
if (data.status >= 300) { success: function (data) {
layer.msg(data.statusInfo.message);//失败的表情 layer.close(this.layerIndex);
return; if (data.status >= 300) {
} else { layer.msg(data.statusInfo.message);//失败的表情
layer.msg("修改成功!", { return;
icon: 6,//成功的表情 } else {
time: 1000 //1秒关闭(如果不配置,默认是3秒) layer.msg("修改成功!", {
}, function () { icon: 6,//成功的表情
window.location = "/constructionUnitEdit?id="+$("#id").val(); time: 1000 //1秒关闭(如果不配置,默认是3秒)
}); }, function () {
window.location = "/constructionUnitEdit?id="+$("#id").val();
});
}
} }
} });
}); }
return false; return false;
}); });

62
src/main/resources/templates/pages/group/applicationInForGroup.html

@ -124,6 +124,8 @@
// 用于编码查询(用于组合) // 用于编码查询(用于组合)
function selectCodeForGroup(obj) { function selectCodeForGroup(obj) {
} }
// 用于标志是否为第一次提交
let flagForForm = false;
// 用于暂存卡片个数(组合) // 用于暂存卡片个数(组合)
var params2 = []; var params2 = [];
@ -151,36 +153,40 @@
// 用于提交操作(组合) // 用于提交操作(组合)
form.on('submit(formStep2)', function (data) { form.on('submit(formStep2)', function (data) {
data = data.field; if(!flagForForm){
data.type = 1; flagForForm = true;
data.params = params2; data = data.field;
$.ajax({ data.type = 1;
url: "/group/applicationInForGroup", data.params = params2;
type: 'post', $.ajax({
dataType: 'json', url: "/group/applicationInForGroup",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(data), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(data),
}, beforeSend: function () {
success: function (d) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.close(this.layerIndex); },
if (d.status >= 300) { success: function (d) {
layer.msg(d.statusInfo.detail);//失败的表情 layer.close(this.layerIndex);
if (d.status >= 300) {
layer.msg(d.statusInfo.detail);//失败的表情
} else { } else {
layer.msg("申请提交成功", { layer.msg("申请提交成功", {
icon: 6,//成功的表情 icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒) time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () { }, function () {
step.next('#stepForm2'); step.next('#stepForm2');
}); });
}
},
complete: function () {
layer.close(this.layerIndex);
} }
}, });
complete: function () { }
layer.close(this.layerIndex);
}
});
}); });
$('.pre').click(function () { $('.pre').click(function () {

189
src/main/resources/templates/pages/group/applicationOutForGroup.html

@ -50,7 +50,7 @@
<div class="layuimini-container"> <div class="layuimini-container">
<div class="layuimini-main"> <div class="layuimini-main">
<div class="layui-fluid"> <div class="layui-fluid">
<input id="gidList" type="text" style="display:none;" th:value="${gidList}" > <input id="gidList" type="text" style="display:none;" th:value="${gidList}">
<div class="layui-carousel" id="stepForm2" lay-filter="stepForm2" style="margin: 0 auto;"> <div class="layui-carousel" id="stepForm2" lay-filter="stepForm2" style="margin: 0 auto;">
<div carousel-item style="overflow: inherit"> <div carousel-item style="overflow: inherit">
<div> <div>
@ -91,13 +91,16 @@
<script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script> <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
<script> <script>
// 用于重新构造页面中的组合明细 // 用于重新构造页面中的组合明细
function CoverpageForGroupInfo(){} function CoverpageForGroupInfo() {
}
// 用于重新构造页面 // 用于重新构造页面
function CoverPageForGroup(){} function CoverPageForGroup() {
}
// 用于实现卡片添加 // 用于实现卡片添加
function addItemForGroup(){} function addItemForGroup() {
}
// 用于判断当前组合数量是否合适 // 用于判断当前组合数量是否合适
function groupQuantityIsTrue() { function groupQuantityIsTrue() {
@ -121,6 +124,9 @@
function selectCodeForGroup(obj) { function selectCodeForGroup(obj) {
} }
// 用于标志是否为第一次提交
let flagForForm = false;
// 用于暂存卡片个数(组合) // 用于暂存卡片个数(组合)
var params2 = []; var params2 = [];
// 用于卡片编号 // 用于卡片编号
@ -147,58 +153,61 @@
// 提交(组合出库) // 提交(组合出库)
form.on('submit(formStep2)', function (data) { form.on('submit(formStep2)', function (data) {
data = data.field; if (!flagForForm) {
data.params = params2; flagForForm = true;
if (data.gid === undefined) { data = data.field;
// 如果没有初始项 data.params = params2;
var dataKeys = Object.keys(data); if (data.gid === undefined) {
var dataKey; // 如果没有初始项
for (let i = 0; i < dataKeys.length; i++) { var dataKeys = Object.keys(data);
dataKey = dataKeys[i]; var dataKey;
if (dataKey.includes("gid")) { for (let i = 0; i < dataKeys.length; i++) {
break; dataKey = dataKeys[i];
if (dataKey.includes("gid")) {
break;
}
} }
} // 获取当前数字
// 获取当前数字 var keyNumber = dataKey.split("gid")[1];
var keyNumber = dataKey.split("gid")[1]; for (let index = 0; index < dataKeys.length; index++) {
for (let index = 0; index < dataKeys.length; index++) { var tempKey = dataKeys[index];
var tempKey = dataKeys[index]; if (tempKey.includes(keyNumber)) {
if (tempKey.includes(keyNumber)) { var key = tempKey.replace(keyNumber, "");
var key = tempKey.replace(keyNumber, ""); data[key] = data[tempKey];
data[key] = data[tempKey]; delete data[tempKey];
delete data[tempKey]; }
} }
data.params = remove(data.params, Number(keyNumber));
} }
data.params = remove(data.params, Number(keyNumber)); $.ajax({
url: "/group/applicationOutForGroup",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (d) {
layer.close(this.layerIndex);
if (d.status >= 300) {
layer.msg(d.statusInfo.detail);//失败的表情
} else {
layer.msg("申请提交成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
step.next('#stepForm2');
});
}
},
complete: function () {
layer.close(this.layerIndex);
}
});
} }
$.ajax({
url: "/group/applicationOutForGroup",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (d) {
layer.close(this.layerIndex);
if (d.status >= 300) {
layer.msg(d.statusInfo.detail);//失败的表情
} else {
layer.msg("申请提交成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
step.next('#stepForm2');
});
}
},
complete: function () {
layer.close(this.layerIndex);
}
});
}); });
$('.pre').click(function () { $('.pre').click(function () {
@ -223,16 +232,16 @@
dataType: 'json', dataType: 'json',
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
success: function (d) { success: function (d) {
if(d.status === 666){ if (d.status === 666) {
layer.msg(d.statusInfo.detail,{ layer.msg(d.statusInfo.detail, {
icon:0, icon: 0,
time:1000, time: 1000,
},function () { }, function () {
// 关闭当前页 // 关闭当前页
var index = parent.layer.getFrameIndex(window.name); var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index); parent.layer.close(index);
}) })
}else { } else {
var data = d.data; var data = d.data;
CoverPageForGroup(i, data[0]); CoverPageForGroup(i, data[0]);
form.render(); form.render();
@ -316,10 +325,10 @@
}; };
// 用于重新构造页面 // 用于重新构造页面
CoverPageForGroup =function (num,obj) { CoverPageForGroup = function (num, obj) {
if(num === 0){ if (num === 0) {
num = ''; num = '';
}else{ } else {
params2.push(num); params2.push(num);
} }
var materialItem = `<div class="layui-card-body" id=` + "cardItemForGroup" + num + `> var materialItem = `<div class="layui-card-body" id=` + "cardItemForGroup" + num + `>
@ -332,13 +341,13 @@
<div class="inputdiv"> <div class="inputdiv">
<input type="text" placeholder="请选择组合" class="layui-input" value="${obj.gname}" <input type="text" placeholder="请选择组合" class="layui-input" value="${obj.gname}"
style="border-style: none" style="border-style: none"
id=`+"openGroupList"+num+` onblur="selectGroupByName(this)" id=` + "openGroupList" + num + ` onblur="selectGroupByName(this)"
lay-verify="required"/> lay-verify="required"/>
<i class="layui-icon layui-icon-search" <i class="layui-icon layui-icon-search"
style="display: inline" style="display: inline"
id=`+"selectGroup"+num+` onclick="selectGroup(this)"></i> id=` + "selectGroup" + num + ` onclick="selectGroup(this)"></i>
</div> </div>
<input type="text" value="${obj.gid}" name=`+"gid"+num+` class="layui-input" id=`+"gid"+num+` <input type="text" value="${obj.gid}" name=` + "gid" + num + ` class="layui-input" id=` + "gid" + num + `
style="display: none" lay-verify="required"/> style="display: none" lay-verify="required"/>
</div> </div>
</div> </div>
@ -358,14 +367,14 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">组合数量:</label> <label class="layui-form-label">组合数量:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="number" name=`+"quantity"+num+` class="layui-input" id=`+"quantityForGroup"+num+` <input type="number" name=` + "quantity" + num + ` class="layui-input" id=` + "quantityForGroup" + num + `
required lay-verify="number" onblur="groupQuantityIsTrue(this)" placeholder="请填写组合数量"/> required lay-verify="number" onblur="groupQuantityIsTrue(this)" placeholder="请填写组合数量"/>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">备注说明:</label> <label class="layui-form-label">备注说明:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input name=`+"applyRemark"+num+` placeholder="请填写相关原因及申请原因" value="" <input name=` + "applyRemark" + num + ` placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/> class="layui-input"/>
</div> </div>
</div> </div>
@ -379,14 +388,14 @@
// 获取当前高度 // 获取当前高度
var height = parseInt(($("#stepForm2").css('height')).split("px")[0]); var height = parseInt(($("#stepForm2").css('height')).split("px")[0]);
$("#stepForm2").css("height", height + 289 + 'px'); $("#stepForm2").css("height", height + 289 + 'px');
if(num === ''){ if (num === '') {
$("#btn_sub2").before(materialItem); $("#btn_sub2").before(materialItem);
}else{ } else {
num = num - 1; num = num - 1;
if(num === 0){ if (num === 0) {
num = ''; num = '';
} }
$("#"+"cardItemForGroup"+num).after(materialItem); $("#" + "cardItemForGroup" + num).after(materialItem);
} }
}; };
@ -405,13 +414,13 @@
<div class="inputdiv"> <div class="inputdiv">
<input type="text" placeholder="请选择组合" class="layui-input" <input type="text" placeholder="请选择组合" class="layui-input"
style="border-style: none" style="border-style: none"
id=`+"openGroupList"+NewIdNumber+` onblur="selectGroupByName(this)" id=` + "openGroupList" + NewIdNumber + ` onblur="selectGroupByName(this)"
lay-verify="required"/> lay-verify="required"/>
<i class="layui-icon layui-icon-search" <i class="layui-icon layui-icon-search"
style="display: inline" style="display: inline"
id=`+"selectGroup"+NewIdNumber+` onclick="selectGroup(this)"></i> id=` + "selectGroup" + NewIdNumber + ` onclick="selectGroup(this)"></i>
</div> </div>
<input type="text" name=`+"gid"+NewIdNumber+` class="layui-input" id=`+"gid"+NewIdNumber+` <input type="text" name=` + "gid" + NewIdNumber + ` class="layui-input" id=` + "gid" + NewIdNumber + `
style="display: none" lay-verify="required"/> style="display: none" lay-verify="required"/>
</div> </div>
</div> </div>
@ -431,14 +440,14 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">组合数量:</label> <label class="layui-form-label">组合数量:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="number" name=`+"quantity"+NewIdNumber+` class="layui-input" id=`+"quantityForGroup"+NewIdNumber+` <input type="number" name=` + "quantity" + NewIdNumber + ` class="layui-input" id=` + "quantityForGroup" + NewIdNumber + `
required lay-verify="number" onblur="groupQuantityIsTrue(this)" placeholder="请填写组合数量"/> required lay-verify="number" onblur="groupQuantityIsTrue(this)" placeholder="请填写组合数量"/>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">备注说明:</label> <label class="layui-form-label">备注说明:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input name=`+"applyRemark"+NewIdNumber+` placeholder="请填写相关原因及申请原因" value="" <input name=` + "applyRemark" + NewIdNumber + ` placeholder="请填写相关原因及申请原因" value=""
class="layui-input"/> class="layui-input"/>
</div> </div>
</div> </div>
@ -484,7 +493,7 @@
layer.msg(d.statusInfo.detail, { layer.msg(d.statusInfo.detail, {
icon: 0, icon: 0,
time: 1500 time: 1500
},function () { }, function () {
obj.value = ''; obj.value = '';
gidItem.value = ''; gidItem.value = '';
gnameItem.value = ''; gnameItem.value = '';
@ -518,7 +527,7 @@
}; };
// 用于实现点击搜索按钮(组合) // 用于实现点击搜索按钮(组合)
selectGroup = function(obj){ selectGroup = function (obj) {
var parent = obj.parentNode.parentNode.parentNode.parentNode; var parent = obj.parentNode.parentNode.parentNode.parentNode;
var parentId = parent.id; var parentId = parent.id;
@ -556,9 +565,9 @@
content.css('height', '100%'); content.css('height', '100%');
iframeChildren.css('height', '100%'); iframeChildren.css('height', '100%');
}, },
end:function () { end: function () {
let gid = gidItem.value; let gid = gidItem.value;
if(gid !== ''){ if (gid !== '') {
let req = {}; let req = {};
req.gid = gid; req.gid = gid;
$.ajax({ $.ajax({
@ -573,7 +582,7 @@
layer.msg(d.statusInfo.detail, { layer.msg(d.statusInfo.detail, {
icon: 0, icon: 0,
time: 1500 time: 1500
},function () { }, function () {
obj.value = ''; obj.value = '';
gidItem.value = ''; gidItem.value = '';
gnameItem.value = ''; gnameItem.value = '';
@ -609,7 +618,7 @@
}; };
// 用于实现组合名称搜索 // 用于实现组合名称搜索
selectGroupByName = function(obj){ selectGroupByName = function (obj) {
let gname = obj.value; let gname = obj.value;
var parent = obj.parentNode.parentNode.parentNode.parentNode; var parent = obj.parentNode.parentNode.parentNode.parentNode;
// 获取对应元素 // 获取对应元素
@ -625,7 +634,7 @@
// gid // gid
let gidItem = gnameParent.childNodes[3]; let gidItem = gnameParent.childNodes[3];
if(gname !== ''){ if (gname !== '') {
var req = {}; var req = {};
@ -637,12 +646,12 @@
data: JSON.stringify(req), data: JSON.stringify(req),
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
success: function (d) { success: function (d) {
if(d.count === -1){ if (d.count === -1) {
// 如果当前组合名称的数量不止一个 // 如果当前组合名称的数量不止一个
layer.msg("请点击右侧搜索确定物品", { layer.msg("请点击右侧搜索确定物品", {
icon: 0, icon: 0,
time: 1500 time: 1500
},function () { }, function () {
obj.value = ''; obj.value = '';
gidItem.value = ''; gidItem.value = '';
gcodeItem.value = ''; gcodeItem.value = '';
@ -653,12 +662,12 @@
} }
} }
}); });
}else if(d.count === 0){ } else if (d.count === 0) {
// 如果当前组合名称不存在 // 如果当前组合名称不存在
layer.msg("没有该组合,请确认输入是否正确", { layer.msg("没有该组合,请确认输入是否正确", {
icon: 0, icon: 0,
time: 1500 time: 1500
},function () { }, function () {
obj.value = ''; obj.value = '';
gidItem.value = ''; gidItem.value = '';
gcodeItem.value = ''; gcodeItem.value = '';
@ -669,7 +678,7 @@
} }
} }
}); });
}else{ } else {
// 正常 // 正常
let data = d.data; let data = d.data;
let childNodes = parent.childNodes; let childNodes = parent.childNodes;
@ -691,8 +700,7 @@
} }
} }
}) })
} } else {
else{
gcodeItem.value = ''; gcodeItem.value = '';
gidItem.value = ''; gidItem.value = '';
let childNodes = parent.childNodes; let childNodes = parent.childNodes;
@ -729,7 +737,10 @@
var flag = res.data; var flag = res.data;
if (!flag) { // 如果当前数目不合适 if (!flag) { // 如果当前数目不合适
layer.msg("当前组合中"+res.statusInfo.message+"的库存数量不足", {icon: 0, time: 500}, function () { layer.msg("当前组合中" + res.statusInfo.message + "的库存数量不足", {
icon: 0,
time: 500
}, function () {
$("#quantityForGroup" + id).val(""); $("#quantityForGroup" + id).val("");
}); });

2
src/main/resources/templates/pages/group/group-add.html

@ -61,6 +61,8 @@
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script> <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script> <script>
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'layer', 'dropdown', 'tree', 'laydate'], function () { layui.use(['form', 'layer', 'dropdown', 'tree', 'laydate'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,

104
src/main/resources/templates/pages/group/group-add_back.html

@ -57,20 +57,23 @@
<label class="layui-form-label" style="height: 40px;">组合名称:</label> <label class="layui-form-label" style="height: 40px;">组合名称:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<div class="inputdiv"> <div class="inputdiv">
<input type="text" placeholder="请输入组合名称" class="layui-input" id="gname" th:value="${gid == -1?'':group?.getGname()}" <input type="text" placeholder="请输入组合名称" class="layui-input" id="gname"
th:attr="readonly=${gid != -1}" name="gname" lay-verify="required"> th:value="${gid == -1?'':group?.getGname()}"
th:attr="readonly=${gid != -1}" name="gname" lay-verify="required">
</div> </div>
</div> </div>
</div> </div>
<label class="layui-form-label">备注说明:</label> <label class="layui-form-label">备注说明:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input name="applyRemark" placeholder="请填写相关原因及申请原因" th:value="${gid == -1?'':group?.getRemark()}" th:attr="readonly=${gid != -1}" <input name="applyRemark" placeholder="请填写相关原因及申请原因"
th:value="${gid == -1?'':group?.getRemark()}" th:attr="readonly=${gid != -1}"
class="layui-input"/> class="layui-input"/>
</div> </div>
</div> </div>
<div class="layui-card" id="cardParent" style="box-shadow:none"> <div class="layui-card" id="cardParent" style="box-shadow:none">
<fieldset style="color: rgb(107, 107, 107); border-style: solid; border-color: rgb(230, 230, 230);border-image: initial;" > <fieldset
style="color: rgb(107, 107, 107); border-style: solid; border-color: rgb(230, 230, 230);border-image: initial;">
<legend>组合明细</legend> <legend>组合明细</legend>
<div class="layui-card-body" id="cardItem"> <div class="layui-card-body" id="cardItem">
<hr> <hr>
@ -164,7 +167,7 @@
创建成功 创建成功
</div> </div>
<div style="text-align: center;margin-top: 50px;"> <div style="text-align: center;margin-top: 50px;">
<button class="layui-btn next" >再创建一次</button> <button class="layui-btn next">再创建一次</button>
</div> </div>
</div> </div>
@ -219,6 +222,9 @@
// 用于卡片编号 // 用于卡片编号
var NewIdNumber = 1; var NewIdNumber = 1;
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'layer', 'tree', 'step'], function () { layui.use(['form', 'layer', 'tree', 'step'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,
@ -240,39 +246,43 @@
// 提交(组合出库) // 提交(组合出库)
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data = data.field; if (!flagForForm) {
data.len = NewIdNumber; flagForForm = true;
data.params = params; data = data.field;
if("-1" !== gid){ data.len = NewIdNumber;
data.gid = gid; data.params = params;
} if ("-1" !== gid) {
$.ajax({ data.gid = gid;
url: "/group/addGroup",
data: JSON.stringify(data),
dataType: "json",
type: "post",
contentType: "application/json;charset=utf-8",
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (d) {
layer.close(this.layerIndex);
if (d.status >= 300) {
layer.msg(d.statusInfo.detail);//失败的表情
} else {
layer.msg("创建成功", {
icon: 6,//成功的表情
time: 1000 //1秒关闭(如果不配置,默认是3秒)
}, function () {
step.next('#stepForm');
});
}
},
complete: function () {
layer.close(this.layerIndex);
} }
}) $.ajax({
url: "/group/addGroup",
data: JSON.stringify(data),
dataType: "json",
type: "post",
contentType: "application/json;charset=utf-8",
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (d) {
layer.close(this.layerIndex);
if (d.status >= 300) {
layer.msg(d.statusInfo.detail);//失败的表情
} else {
layer.msg("创建成功", {
icon: 6,//成功的表情
time: 1000 //1秒关闭(如果不配置,默认是3秒)
}, function () {
step.next('#stepForm');
});
}
},
complete: function () {
layer.close(this.layerIndex);
}
})
}
return false;
}); });
$('.pre').click(function () { $('.pre').click(function () {
@ -301,7 +311,7 @@
id="openSonByMaterial" lay-verify="required" onblur="selectMaterialByName(this)"/> id="openSonByMaterial" lay-verify="required" onblur="selectMaterialByName(this)"/>
<i class="layui-icon layui-icon-search" style="display: inline" id="selectMaterial" onclick="selectMaterial(this)"></i> <i class="layui-icon layui-icon-search" style="display: inline" id="selectMaterial" onclick="selectMaterial(this)"></i>
</div> </div>
<input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id=`+"mid"+NewIdNumber+` <input type="text" name=` + "mid" + NewIdNumber + ` class="layui-input" id=` + "mid" + NewIdNumber + `
style="display: none" lay-verify="required" /> style="display: none" lay-verify="required" />
</div> </div>
</div> </div>
@ -386,11 +396,11 @@
// 扫描物料条码 // 扫描物料条码
scanBarCode = function (obj) { scanBarCode = function (obj) {
let wxScan = parent; let wxScan = parent;
if(wxScan.wx === undefined && wxScan.parent.wx !== undefined){ if (wxScan.wx === undefined && wxScan.parent.wx !== undefined) {
wxScan = wxScan.parent.wx; wxScan = wxScan.parent.wx;
}else if(wxScan.parent.wx === undefined){ } else if (wxScan.parent.wx === undefined) {
wxScan = wxScan.parent.parent.wx wxScan = wxScan.parent.parent.wx
}else{ } else {
wxScan = wxScan.wx; wxScan = wxScan.wx;
} }
wxScan.scanQRCode({ wxScan.scanQRCode({
@ -463,17 +473,17 @@
// 用于扫码功能 // 用于扫码功能
scanCodeForMaterial = function (obj) { scanCodeForMaterial = function (obj) {
let wxScan = parent; let wxScan = parent;
if(wxScan.wx === undefined && wxScan.parent.wx !== undefined){ if (wxScan.wx === undefined && wxScan.parent.wx !== undefined) {
wxScan = wxScan.parent.wx; wxScan = wxScan.parent.wx;
}else if(wxScan.parent.wx === undefined){ } else if (wxScan.parent.wx === undefined) {
wxScan = wxScan.parent.parent.wx wxScan = wxScan.parent.parent.wx
}else{ } else {
wxScan = wxScan.wx; wxScan = wxScan.wx;
} }
wxScan.scanQRCode({ wxScan.scanQRCode({
desc: 'scanQRCode desc', desc: 'scanQRCode desc',
needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果, needResult: 1, // 默认为0,扫描结果由企业微信处理,1则直接返回扫描结果,
scanType: ["qrCode","barCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有 scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是条形码(一维码),默认二者都有
success: function (res) { success: function (res) {
// 回调 // 回调
var result = res.resultStr;//当needResult为1时返回处理结果 var result = res.resultStr;//当needResult为1时返回处理结果
@ -667,7 +677,7 @@
var req = {}; var req = {};
req.code = code; req.code = code;
req.type = "in"; req.type = "in";
if(code !== "") { if (code !== "") {
$.ajax({ $.ajax({
url: "/material/findMatrialByCode", url: "/material/findMatrialByCode",
type: "get", type: "get",
@ -747,7 +757,7 @@
var barCodeItem = barCodeChildren.childNodes[3]; var barCodeItem = barCodeChildren.childNodes[3];
var req = {}; var req = {};
data = data.split(",")[0]; data = data.split(",")[0];
if(data !== ""){ if (data !== "") {
req.mname = data; req.mname = data;
$.ajax({ $.ajax({
url: "/material/findMaterialByCondition", url: "/material/findMaterialByCondition",

1
src/main/resources/templates/pages/group/group_edit.html

@ -85,6 +85,7 @@
// 用于创建二维码 // 用于创建二维码
function createQrCode(obj){} function createQrCode(obj){}
layui.use(['form', 'table'], function () { layui.use(['form', 'table'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,

76
src/main/resources/templates/pages/group/group_material_edit.html

@ -23,7 +23,8 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">物料编号</label> <label class="layui-form-label">物料编号</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input id="mcode" type="text" th:value="${record.getMcode()}" name="mcode" required lay-verify="required" autocomplete="off" <input id="mcode" type="text" th:value="${record.getMcode()}" name="mcode" required lay-verify="required"
autocomplete="off"
class="layui-input" onblur="selectMaterialByCode(this)" readonly="readonly"> class="layui-input" onblur="selectMaterialByCode(this)" readonly="readonly">
</div> </div>
</div> </div>
@ -37,14 +38,14 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">规格型号</label> <label class="layui-form-label">规格型号</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" th:value="${record.getVersion()}" name="version" autocomplete="off" readonly <input type="text" th:value="${record.getVersion()}" name="version" autocomplete="off" readonly
class="layui-input"> class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">物料数量</label> <label class="layui-form-label">物料数量</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" th:value="${record.getQuantity()}" name="quantity" autocomplete="off" <input type="text" th:value="${record.getQuantity()}" name="quantity" autocomplete="off"
class="layui-input"> class="layui-input">
</div> </div>
</div> </div>
@ -59,7 +60,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">物料类型</label> <label class="layui-form-label">物料类型</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" class="layui-input" id="openSonByMateralType" readonly <input type="text" class="layui-input" id="openSonByMateralType" readonly
th:value="${record.getTname()}" th:value="${record.getTname()}"
lay-verify="required"/> lay-verify="required"/>
<input type="text" id="materialTypeId" th:value="${record.getMtid()}" <input type="text" id="materialTypeId" th:value="${record.getMtid()}"
@ -69,7 +70,7 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">材质</label> <label class="layui-form-label">材质</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<input type="text" th:value="${record.getTexture()}" name="texture" autocomplete="off" readonly <input type="text" th:value="${record.getTexture()}" name="texture" autocomplete="off" readonly
class="layui-input"> class="layui-input">
</div> </div>
@ -79,7 +80,8 @@
<div class="layui-input-inline"> <div class="layui-input-inline">
<select id="unit" name="unit"> <select id="unit" name="unit">
<option value="-1" th:text="${record.getMunit()}" th:selected="${record.getUnit() == '-1'}"></option> <option value="-1" th:text="${record.getMunit()}" th:selected="${record.getUnit() == '-1'}"></option>
<option th:each="splitInfo,iterStar:${splitList}" th:selected="${splitInfo.getNewUnit() == record.getUnit()}" <option th:each="splitInfo,iterStar:${splitList}"
th:selected="${splitInfo.getNewUnit() == record.getUnit()}"
th:value="${splitInfo?.getNewUnit()}" th:value="${splitInfo?.getNewUnit()}"
th:text="${splitInfo?.getNewUnit()}"> th:text="${splitInfo?.getNewUnit()}">
</option> </option>
@ -98,41 +100,49 @@
// 用于通过编码查询物料 // 用于通过编码查询物料
function selectMaterialByCode(obj) { function selectMaterialByCode(obj) {
} }
// 用于点击搜索按钮 // 用于点击搜索按钮
function selectMaterial(obj) { function selectMaterial(obj) {
} }
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form'], function () { layui.use(['form'], function () {
var form = layui.form, $ = layui.$; var form = layui.form, $ = layui.$;
let id = $("#id").val(); let id = $("#id").val();
form.on('submit(formDemo)', function (data) { form.on('submit(formDemo)', function (data) {
data = data.field; if (!flagForForm) {
data.id = id; flagForForm = true;
$.ajax({ data = data.field;
url: "/group/materialForGroupEdit", data.id = id;
type: 'post', $.ajax({
dataType: 'json', url: "/group/materialForGroupEdit",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(data), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(data),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.close(this.layerIndex); },
if (data.status >= 300) { success: function (data) {
layer.msg(data.statusInfo.message);//失败的表情 layer.close(this.layerIndex);
return; if (data.status >= 300) {
} else { layer.msg(data.statusInfo.message);//失败的表情
layer.msg("修改成功", { return;
icon: 6,//成功的表情 } else {
time: 500 //1秒关闭(如果不配置,默认是3秒) layer.msg("修改成功", {
}, function () { icon: 6,//成功的表情
var index = parent.layer.getFrameIndex(window.name); time: 500 //1秒关闭(如果不配置,默认是3秒)
parent.layer.close(index);//关闭当前页 }, function () {
window.location = '/group_out' var index = parent.layer.getFrameIndex(window.name);
}) parent.layer.close(index);//关闭当前页
window.location = '/group_out'
})
}
} }
} });
}); }
return false; return false;
}); });

72
src/main/resources/templates/pages/material/material-add.html

@ -164,6 +164,8 @@
var data; var data;
function selectBarCode(){} function selectBarCode(){}
function scanBarCode(){} function scanBarCode(){}
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'layer','dropdown','tree','laydate'], function () { layui.use(['form', 'layer','dropdown','tree','laydate'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,
@ -244,40 +246,44 @@
}; };
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
$.ajax({ if(!flagForForm){
url: "/material/material_add", flagForForm = true;
type: 'post', $.ajax({
dataType: 'json', url: "/material/material_add",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(data.field), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(data.field),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.close(this.layerIndex); },
if (data.status >= 300) { success: function (data) {
layer.msg(data.statusInfo.message);//失败的表情 layer.close(this.layerIndex);
return; if (data.status >= 300) {
} else { layer.msg(data.statusInfo.message);//失败的表情
layer.msg("添加成功!", { return;
icon: 6,//成功的表情 } else {
time: 1000 layer.msg("添加成功!", {
}, //1秒关闭(如果不配置,默认是3秒) icon: 6,//成功的表情
function(){ time: 1000
//do something }, //1秒关闭(如果不配置,默认是3秒)
window.location="/material_add" function(){
}); //do something
window.location="/material_add"
});
}
},
complete: function () {
form.val("form1", {
"mname": "",// "name": "value"
"depositoryId": "",
"materialTypeId": "",
"texture":""
})
} }
}, });
complete: function () { }
form.val("form1", {
"mname": "",// "name": "value"
"depositoryId": "",
"materialTypeId": "",
"texture":""
})
}
});
return false; return false;
}); });

72
src/main/resources/templates/pages/material/material-add_back.html

@ -86,6 +86,8 @@
<script> <script>
var data; var data;
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'layer','dropdown','tree'], function () { layui.use(['form', 'layer','dropdown','tree'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,
@ -138,40 +140,44 @@
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
$.ajax({ if(!flagForForm){
url: "/material/material_add", flagForForm = true;
type: 'post', $.ajax({
dataType: 'json', url: "/material/material_add",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(data.field), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(data.field),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.close(this.layerIndex); },
if (data.status >= 300) { success: function (data) {
layer.msg(data.statusInfo.message);//失败的表情 layer.close(this.layerIndex);
return; if (data.status >= 300) {
} else { layer.msg(data.statusInfo.message);//失败的表情
layer.msg("添加成功!", { return;
icon: 6,//成功的表情 } else {
time: 1000 layer.msg("添加成功!", {
}, //1秒关闭(如果不配置,默认是3秒) icon: 6,//成功的表情
function(){ time: 1000
//do something }, //1秒关闭(如果不配置,默认是3秒)
window.location="/material_add" function(){
}); //do something
window.location="/material_add"
});
}
},
complete: function () {
form.val("form1", {
"mname": "",// "name": "value"
"depositoryId": "",
"materialTypeId": "",
"texture":""
})
} }
}, })
complete: function () { }
form.val("form1", {
"mname": "",// "name": "value"
"depositoryId": "",
"materialTypeId": "",
"texture":""
})
}
})
return false; return false;
}); });

64
src/main/resources/templates/pages/material/material-view.html

@ -179,6 +179,8 @@
function print_code() { function print_code() {
} }
// 用于标志是否为第一次提交
let flagForForm = false;
var barCode = []; var barCode = [];
var flag = false; var flag = false;
layui.use(['form', 'laydate'], function () { layui.use(['form', 'laydate'], function () {
@ -205,36 +207,40 @@
}); });
//提交 //提交
form.on('submit(formDemo)', function (data) { form.on('submit(formDemo)', function (data) {
data = data.field; if(!flagForForm){
if (flag) { flagForForm = true;
data.barCodeList = barCode; data = data.field;
} if (flag) {
$.ajax({ data.barCodeList = barCode;
url: "/material/material_edit",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);//关闭当前页
window.location = '/material_out'
})
}
} }
}); $.ajax({
url: "/material/material_edit",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);//关闭当前页
window.location = '/material_out'
})
}
}
});
}
return false; return false;
}); });

65
src/main/resources/templates/pages/materialtype/materialType_add.html

@ -66,6 +66,8 @@
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script> <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script> <script>
var data; var data;
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'layer','tree'], function () { layui.use(['form', 'layer','tree'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,
@ -94,37 +96,42 @@
}); });
}); });
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
$.ajax({ if(!flagForForm){
url:"/materialType/materialType_add", flagForForm = true;
type:'post', $.ajax({
dataType:'json', url:"/materialType/materialType_add",
contentType: "application/json;charset=utf-8", type:'post',
data:JSON.stringify(data.field), dataType:'json',
beforeSend:function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, { shade: [0.5, '#393D49'] }); data:JSON.stringify(data.field),
}, beforeSend:function () {
success:function(data){ this.layerIndex = layer.load(0, { shade: [0.5, '#393D49'] });
layer.close(this.layerIndex); },
if(data.status >= 300){ success:function(data){
layer.msg(data.statusInfo.message);//失败的表情 layer.close(this.layerIndex);
return; if(data.status >= 300){
}else{ layer.msg(data.statusInfo.message);//失败的表情
layer.msg("添加成功!", { return;
icon: 6,//成功的表情 }else{
time: 1000 //1秒关闭(如果不配置,默认是3秒) layer.msg("添加成功!", {
},function () { icon: 6,//成功的表情
window.location="/materialType_add" time: 1000 //1秒关闭(如果不配置,默认是3秒)
}); },function () {
window.location="/materialType_add"
});
}
},
complete: function () {
form.val("form1", {
"tname": "" // "name": "value"
,"introduce": ""
})
} }
}, })
complete: function () { }
form.val("form1", {
"tname": "" // "name": "value"
,"introduce": ""
})
}
})
return false; return false;
}); });

196
src/main/resources/templates/pages/materialtype/materialType_edit.html

@ -1,115 +1,127 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org"> <html lang="en" xmlns:th="http://www.thymeleaf.org">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title>分步表单</title> <title>分步表单</title>
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="/static/lib/layui-v2.6.3/css/layui.css" media="all"> <link rel="stylesheet" href="/static/lib/layui-v2.6.3/css/layui.css" media="all">
<link rel="stylesheet" href="/static/css/public.css" media="all"> <link rel="stylesheet" href="/static/css/public.css" media="all">
<link rel="stylesheet" href="/static/js/lay-module/step-lay/step.css" media="all"> <link rel="stylesheet" href="/static/js/lay-module/step-lay/step.css" media="all">
</head> </head>
<body> <body>
<form class="layui-form layui-form-pane" action="" > <form class="layui-form layui-form-pane" action="">
<div class="layui-form-item" style="display:none;"> <div class="layui-form-item" style="display:none;">
<label class="layui-form-label">类型编号</label> <label class="layui-form-label">类型编号</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" th:value="${record.getOldId()}" name="id" required lay-verify="required" autocomplete="off" class="layui-input" readonly="readonly"> <input type="text" th:value="${record.getOldId()}" name="id" required lay-verify="required"
autocomplete="off" class="layui-input" readonly="readonly">
</div>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <label class="layui-form-label">类型名称</label>
<label class="layui-form-label">类型名称</label> <div class="layui-input-block">
<div class="layui-input-block"> <input type="text" th:value="${record.getTname()}" name="tname" required lay-verify="required"
<input type="text" th:value="${record.getTname()}" name="tname" required lay-verify="required" autocomplete="off" class="layui-input"> autocomplete="off" class="layui-input">
</div>
</div> </div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">类型介绍</label> <label class="layui-form-label">类型介绍</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" th:value="${record.getIntroduce()}" name="introduce" required lay-verify="required" autocomplete="off" class="layui-input"> <input type="text" th:value="${record.getIntroduce()}" name="introduce" required lay-verify="required"
autocomplete="off" class="layui-input">
</div>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <label class="layui-form-label">父级类型:</label>
<label class="layui-form-label">父级类型:</label> <div class="layui-input-block">
<div class="layui-input-block"> <input type="text" placeholder="请选择物料类型" class="layui-input" id="openSonByMateralType" readonly
<input type="text" placeholder="请选择物料类型" class="layui-input" id="openSonByMateralType" readonly th:value="${parentType == null ?'': parentType.getTname()}" /> th:value="${parentType == null ?'': parentType.getTname()}"/>
<input type="text" id="materialTypeId" placeholder="请选择物料类型" name="parentId" class="layui-input" th:value="${parentType == null ?'' :parentType.getOldId()}" style="display: none" /> <input type="text" id="materialTypeId" placeholder="请选择物料类型" name="parentId" class="layui-input"
th:value="${parentType == null ?'' :parentType.getOldId()}" style="display: none"/>
</div>
</div> </div>
</div> <div class="layui-form-item" style="display: none">
<div class="layui-form-item" style="display: none"> <label class="layui-form-label">状态</label>
<label class="layui-form-label">状态</label> <div class="layui-input-block">
<div class="layui-input-block"> <input type="checkbox" name="state" lay-skin="switch" lay-text="启用|禁用"
<input type="checkbox" name="state" lay-skin="switch" lay-text="启用|禁用" th:checked="${record.getState() == 1}"> th:checked="${record.getState() == 1}">
</div>
</div> </div>
</div> <div class="layui-form-item">
<div class="layui-form-item"> <div class="layui-input-block">
<div class="layui-input-block"> <button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
<button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button> <button type="reset" class="layui-btn layui-btn-primary">重置</button>
<button type="reset" class="layui-btn layui-btn-primary">重置</button> </div>
</div> </div>
</div>
</form> </form>
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script> <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script> <script>
layui.use('form', function(){ // 用于标志是否为第一次提交
var form = layui.form, $ = layui.$; let flagForForm = false;
layui.use('form', function () {
var form = layui.form, $ = layui.$;
$('#openSonByMateralType').on('click', function(){ $('#openSonByMateralType').on('click', function () {
layer.open({ layer.open({
type: 2, type: 2,
title: '弹窗内容', title: '弹窗内容',
skin: 'layui-layer-rim', skin: 'layui-layer-rim',
maxmin: true, maxmin: true,
shadeClose: true, //点击遮罩关闭层 shadeClose: true, //点击遮罩关闭层
area: ['70%', '70%'], area: ['70%', '70%'],
move : '.layui-layer-title', move: '.layui-layer-title',
fixed:false, fixed: false,
content: '/selectType', content: '/selectType',
success: function(layero, index){ success: function (layero, index) {
var children = layero.children(); var children = layero.children();
var content = $(children[1]); var content = $(children[1]);
var iframeChildren = $(content.children()); var iframeChildren = $(content.children());
content.css('height','100%'); content.css('height', '100%');
iframeChildren.css('height','100%'); iframeChildren.css('height', '100%');
} }
}); });
}); });
//提交
form.on('submit(formDemo)', function (data) {
if (!flagForForm) {
flagForForm = true;
data = data.field;
$.ajax({
url: "/materialType/materialType_edit",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("物料类型信息修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
window.location = '/materialType_view';
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);//关闭当前页
})
}
}
})
}
//提交 return false;
form.on('submit(formDemo)', function(data){ });
data = data.field;
$.ajax({
url: "/materialType/materialType_edit",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("物料类型信息修改成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
},function(){
window.location='/materialType_view';
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);//关闭当前页
})
}
}
})
return false;
}); });
});
</script> </script>
</body> </body>

42
src/main/resources/templates/pages/notice/notice-add.html

@ -84,6 +84,8 @@
function selectDepartment(){ function selectDepartment(){
} }
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'layer', 'laydate', 'inputTag'], function () { layui.use(['form', 'layer', 'laydate', 'inputTag'], function () {
var form = layui.form, var form = layui.form,
layer = layui.layer, layer = layui.layer,
@ -98,25 +100,29 @@
//监听提交 //监听提交
form.on('submit(noticeBtn)', function (data) { form.on('submit(noticeBtn)', function (data) {
$.ajax({ if(!flagForForm){
url: "/notice/notice", flagForForm = true;
data: JSON.stringify(data.field), $.ajax({
type: "post", url: "/notice/notice",
dataType: 'json', data: JSON.stringify(data.field),
contentType: "application/json;charset=utf-8", type: "post",
success: function (data) { dataType: 'json',
if (data.status >= 300) { contentType: "application/json;charset=utf-8",
layer.msg(data.statusInfo.message);//失败的表情 success: function (data) {
} else { if (data.status >= 300) {
layer.msg("公告发布成功", { layer.msg(data.statusInfo.message);//失败的表情
icon: 6,//成功的表情 } else {
time: 1000 //1秒关闭(如果不配置,默认是3秒) layer.msg("公告发布成功", {
}, function () { icon: 6,//成功的表情
window.location = "/notice_add" time: 1000 //1秒关闭(如果不配置,默认是3秒)
}); }, function () {
window.location = "/notice_add"
});
}
} }
} });
}); }
return false; return false;
}); });

42
src/main/resources/templates/pages/notice/notice-edit.html

@ -86,6 +86,8 @@
function selectDepartment(){ function selectDepartment(){
} }
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'layer', 'laydate', 'inputTag'], function () { layui.use(['form', 'layer', 'laydate', 'inputTag'], function () {
var form = layui.form, var form = layui.form,
layer = layui.layer, layer = layui.layer,
@ -100,25 +102,29 @@
//监听提交 //监听提交
form.on('submit(noticeBtn)', function (data) { form.on('submit(noticeBtn)', function (data) {
$.ajax({ if(!flagForForm){
url: "/notice/noticeEdit", flagForForm = true;
data: JSON.stringify(data.field), $.ajax({
type: "post", url: "/notice/noticeEdit",
dataType: 'json', data: JSON.stringify(data.field),
contentType: "application/json;charset=utf-8", type: "post",
success: function (data) { dataType: 'json',
if (data.status >= 300) { contentType: "application/json;charset=utf-8",
layer.msg(data.statusInfo.message);//失败的表情 success: function (data) {
} else { if (data.status >= 300) {
layer.msg("公告修改成功", { layer.msg(data.statusInfo.message);//失败的表情
icon: 6,//成功的表情 } else {
time: 1000 //1秒关闭(如果不配置,默认是3秒) layer.msg("公告修改成功", {
}, function () { icon: 6,//成功的表情
window.location = "/notice_out" time: 1000 //1秒关闭(如果不配置,默认是3秒)
}); }, function () {
window.location = "/notice_out"
});
}
} }
} });
}); }
return false; return false;
}); });

67
src/main/resources/templates/pages/place/place_add.html

@ -125,7 +125,8 @@
<script> <script>
var data; var data;
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'layer', 'dropdown', 'tree'], function () { layui.use(['form', 'layer', 'dropdown', 'tree'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,
@ -133,37 +134,41 @@
var depositoryId = $("#depositoryID").val(); var depositoryId = $("#depositoryID").val();
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
var req = data.field; if(!flagForForm){
req.type = "one"; flagForForm = true;
$.ajax({ var req = data.field;
url: "/place/addPlace", req.type = "one";
type: 'post', $.ajax({
dataType: 'json', url: "/place/addPlace",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(req), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(req),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.close(this.layerIndex); },
if (data.status >= 300) { success: function (data) {
layer.msg(data.statusInfo.message);//失败的表情 layer.close(this.layerIndex);
return; if (data.status >= 300) {
} else { layer.msg(data.statusInfo.message);//失败的表情
layer.msg("添加成功!", { return;
icon: 6,//成功的表情 } else {
time: 1000 layer.msg("添加成功!", {
}, //1秒关闭(如果不配置,默认是3秒) icon: 6,//成功的表情
function () { time: 1000
//do something }, //1秒关闭(如果不配置,默认是3秒)
window.location = "/insertPlace?depositoryId=" + depositoryId function () {
}); //do something
window.location = "/insertPlace?depositoryId=" + depositoryId
});
}
},
complete: function () {
form.val("form1", {})
} }
}, });
complete: function () { }
form.val("form1", {})
}
});
return false; return false;
}); });
form.on('submit(formStep1)', function (data) { form.on('submit(formStep1)', function (data) {

80
src/main/resources/templates/pages/place/place_edit.html

@ -103,6 +103,8 @@
function print_code() { function print_code() {
} }
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'layer','dropdown','tree'], function () { layui.use(['form', 'layer','dropdown','tree'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,
@ -110,45 +112,49 @@
var depositoryId = $("#depositoryId").val(); var depositoryId = $("#depositoryId").val();
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
var req = data.field; if(!flagForForm){
req.type = "one"; flagForForm = true;
$.ajax({ var req = data.field;
url: "/place/place_edit", req.type = "one";
type: 'post', $.ajax({
dataType: 'json', url: "/place/place_edit",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(req), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(req),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.close(this.layerIndex); },
if (data.status >= 300) { success: function (data) {
layer.msg(data.statusInfo.detail,{ layer.close(this.layerIndex);
icon:0, if (data.status >= 300) {
time:1000 layer.msg(data.statusInfo.detail,{
},function () { icon:0,
location.reload(); time:1000
});//失败的表情 },function () {
location.reload();
});//失败的表情
} else { } else {
layer.msg("修改成功!", { layer.msg("修改成功!", {
icon: 6,//成功的表情 icon: 6,//成功的表情
time: 1000 time: 1000
}, //1秒关闭(如果不配置,默认是3秒) }, //1秒关闭(如果不配置,默认是3秒)
function(){ function(){
//do something //do something
var index = parent.layer.getFrameIndex(window.name); var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);//关闭当前页 parent.layer.close(index);//关闭当前页
window.location='/warehouseByParentId?parentId='+depositoryId; window.location='/warehouseByParentId?parentId='+depositoryId;
}); });
}
},
complete: function () {
form.val("form1", {
})
} }
}, });
complete: function () { }
form.val("form1", {
})
}
});
return false; return false;
}); });

80
src/main/resources/templates/pages/place/place_editForTray.html

@ -82,6 +82,8 @@
function print_code() { function print_code() {
} }
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'layer','dropdown','tree'], function () { layui.use(['form', 'layer','dropdown','tree'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,
@ -89,45 +91,49 @@
var depositoryId = $("#depositoryId").val(); var depositoryId = $("#depositoryId").val();
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
var req = data.field; if(!flagForForm){
req.type = "one"; flagForForm = true;
$.ajax({ var req = data.field;
url: "/place/tray_edit", req.type = "one";
type: 'post', $.ajax({
dataType: 'json', url: "/place/tray_edit",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(req), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(req),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.close(this.layerIndex); },
if (data.status >= 300) { success: function (data) {
layer.msg(data.statusInfo.detail,{ layer.close(this.layerIndex);
icon:0, if (data.status >= 300) {
time:1000 layer.msg(data.statusInfo.detail,{
},function () { icon:0,
location.reload(); time:1000
});//失败的表情 },function () {
location.reload();
});//失败的表情
} else { } else {
layer.msg("修改成功!", { layer.msg("修改成功!", {
icon: 6,//成功的表情 icon: 6,//成功的表情
time: 1000 time: 1000
}, //1秒关闭(如果不配置,默认是3秒) }, //1秒关闭(如果不配置,默认是3秒)
function(){ function(){
//do something //do something
var index = parent.layer.getFrameIndex(window.name); var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);//关闭当前页 parent.layer.close(index);//关闭当前页
window.location='/warehouseByParentId?parentId='+depositoryId; window.location='/warehouseByParentId?parentId='+depositoryId;
}); });
}
},
complete: function () {
form.val("form1", {
})
} }
}, });
complete: function () { }
form.val("form1", {
})
}
});
return false; return false;
}); });

74
src/main/resources/templates/pages/post/postRole_add.html

@ -45,6 +45,8 @@
</div> </div>
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script> <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script> <script>
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form','layer','laydate'], function () { layui.use(['form','layer','laydate'], function () {
var form = layui.form, var form = layui.form,
layer = layui.layer, layer = layui.layer,
@ -78,41 +80,45 @@
let organization = $("#organization").val(); let organization = $("#organization").val();
//监听提交 //监听提交
form.on('submit(saveBtn)', function (data) { form.on('submit(saveBtn)', function (data) {
data=data.field; if(!flagForForm){
//去除对应的仓库id flagForForm = true;
if (data.depositoryId===""){ data=data.field;
delete data.depositoryId; //去除对应的仓库id
} if (data.depositoryId===""){
$.ajax({ delete data.depositoryId;
url: "/company/post_role",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message,{
icon: 7,
time: 200
},function () {
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);//关闭当前页
});
} else {
layer.msg("添加成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
},function(){
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);//关闭当前页
})
}
} }
}) $.ajax({
url: "/company/post_role",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message,{
icon: 7,
time: 200
},function () {
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);//关闭当前页
});
} else {
layer.msg("添加成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
},function(){
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);//关闭当前页
})
}
}
})
}
return false; return false;
}); });

64
src/main/resources/templates/pages/post/postRole_edit.html

@ -60,6 +60,8 @@
</div> </div>
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script> <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script> <script>
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form','layer','laydate'], function () { layui.use(['form','layer','laydate'], function () {
var form = layui.form, var form = layui.form,
layer = layui.layer, layer = layui.layer,
@ -93,36 +95,40 @@
var organization = document.getElementById("organization").value var organization = document.getElementById("organization").value
//监听提交 //监听提交
form.on('submit(saveBtn)', function (data) { form.on('submit(saveBtn)', function (data) {
data=data.field; if(!flagForForm){
//去除对应的仓库id flagForForm = true;
if (data.depositoryId===""){ data=data.field;
delete data.depositoryId; //去除对应的仓库id
} if (data.depositoryId===""){
$.ajax({ delete data.depositoryId;
url: "/company/postRole_edit",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("申请提交成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
},function(){
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);//关闭当前页
})
}
} }
}) $.ajax({
url: "/company/postRole_edit",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("申请提交成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
},function(){
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);//关闭当前页
})
}
}
})
}
return false; return false;
}); });

80
src/main/resources/templates/pages/scanQrCode/ScanBarOrQrCodeOut.html

@ -53,11 +53,14 @@
var qrCode = null; var qrCode = null;
var barCode = null; var barCode = null;
// 用于标志是否为第一次提交
let flagForForm = false;
layui.$(function () { layui.$(function () {
let wxScan = parent.parent.parent; let wxScan = parent.parent.parent;
if(wxScan.wx !== undefined){ if (wxScan.wx !== undefined) {
wxScan = wxScan.wx; wxScan = wxScan.wx;
}else{ } else {
wxScan = wxScan.parent.wx; wxScan = wxScan.parent.wx;
} }
wxScan.scanQRCode({ wxScan.scanQRCode({
@ -89,39 +92,42 @@
btn: ["确定", "取消"] btn: ["确定", "取消"]
}, },
function () { // 如果确定出库 function () { // 如果确定出库
layui.$.ajax({ if (!flagForForm) {
url: "/depositoryRecord/isCheckOut", flagForForm = true;
type: "post", layui.$.ajax({
dataType: 'json', url: "/depositoryRecord/isCheckOut",
data: JSON.stringify(req), type: "post",
contentType: "application/json;charset=utf-8", dataType: 'json',
success: function (res) { data: JSON.stringify(req),
if (res.status === 200) { contentType: "application/json;charset=utf-8",
// 如果出库成功 success: function (res) {
layer.msg("出库成功", if (res.status === 200) {
{ // 如果出库成功
icon: 6, layer.msg("出库成功",
time: 500 {
} icon: 6,
, function () { time: 500
layer.close(layer.index); }
, function () {
layer.close(layer.index);
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
});
} else {
// 如果出库失败
layer.msg(res.statusInfo.detail + ",请重试", {
icon: 0,
time: 1000
}, function () {
var index = parent.layer.getFrameIndex(window.name); var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index); parent.layer.close(index);
}); });
} else { }
// 如果出库失败
layer.msg(res.statusInfo.detail + ",请重试",{
icon:0,
time:1000
},function () {
var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
});
}
} }
}) })
}
}, },
function () { function () {
// 如果取消 // 如果取消
@ -169,8 +175,7 @@
var index = parent.layer.getFrameIndex(window.name); var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index); parent.layer.close(index);
}) })
} } else if (flag === 1) {
else if (flag === 1) {
// 如果是物料 // 如果是物料
material = data.material; material = data.material;
if (mcode !== material.code && Number(mcode) !== material.code && mcode !== material.code.toString()) { if (mcode !== material.code && Number(mcode) !== material.code && mcode !== material.code.toString()) {
@ -197,8 +202,7 @@
parent.layer.close(index); parent.layer.close(index);
}) })
} } else {
else {
if (depository !== null) { // 如果已经扫描仓库 if (depository !== null) { // 如果已经扫描仓库
if (depositoryId !== depository.id && Number(depositoryId) !== depository.id && depositoryId !== depository.id.toString()) { if (depositoryId !== depository.id && Number(depositoryId) !== depository.id && depositoryId !== depository.id.toString()) {
// 如果扫描的仓库不是订单要求的仓库 // 如果扫描的仓库不是订单要求的仓库
@ -285,8 +289,7 @@
} }
} }
} } else if (flag === 2) {
else if (flag === 2) {
// 如果扫描的为库位 // 如果扫描的为库位
place = data.place;// 将扫描结果保存到vue中 place = data.place;// 将扫描结果保存到vue中
if (material == null) { if (material == null) {
@ -369,8 +372,7 @@
} }
} } else if (flag === 3) {
else if (flag === 3) {
// 如果是仓库 // 如果是仓库
depository = data.depository;// 将扫描结果保存到vue中 depository = data.depository;// 将扫描结果保存到vue中

57
src/main/resources/templates/pages/split/split_add.html

@ -185,40 +185,47 @@
function scanCode(obj) { function scanCode(obj) {
} }
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'layer'], function () { layui.use(['form', 'layer'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,
layer = layui.layer; layer = layui.layer;
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data = data.field; if(!flagForForm){
$.ajax({ flagForForm = true;
url: "/split/splitAdd", data = data.field;
data: JSON.stringify(data), $.ajax({
dataType: "json", url: "/split/splitAdd",
type: "post", data: JSON.stringify(data),
contentType: "application/json;charset=utf-8", dataType: "json",
success: function (res) { type: "post",
layer.close(this.layerIndex); contentType: "application/json;charset=utf-8",
if (data.status >= 300) { success: function (res) {
layer.msg(data.statusInfo.detail, { layer.close(this.layerIndex);
icon: 6, if (data.status >= 300) {
time: 1000 layer.msg(data.statusInfo.detail, {
}, function () { icon: 6,
window.location = "/split_add"
});//失败的表情
} else {
layer.msg("添加成功!", {
icon: 6,//成功的表情
time: 1000 time: 1000
}, //1秒关闭(如果不配置,默认是3秒) }, function () {
function () {
//do something
window.location = "/split_add" window.location = "/split_add"
}); });//失败的表情
} else {
layer.msg("添加成功!", {
icon: 6,//成功的表情
time: 1000
}, //1秒关闭(如果不配置,默认是3秒)
function () {
//do something
window.location = "/split_add"
});
}
} }
}
}) })
}
}); });
// 通过名称查询物料 // 通过名称查询物料

60
src/main/resources/templates/pages/split/split_edit.html

@ -155,42 +155,48 @@
<script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script> <script src="/static/js/lay-config.js?v=1.0.4" charset="utf-8"></script>
<script> <script>
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'layer'], function () { layui.use(['form', 'layer'], function () {
var $ = layui.jquery, var $ = layui.jquery,
form = layui.form, form = layui.form,
layer = layui.layer; layer = layui.layer;
let id = $("#id").val(); let id = $("#id").val();
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data = data.field; if(!flagForForm){
data.state = 1; flagForForm = true;
$.ajax({ data = data.field;
url:"/split/split_edit", data.state = 1;
data:JSON.stringify(data), $.ajax({
dataType:"json", url:"/split/split_edit",
type:"post", data:JSON.stringify(data),
contentType: "application/json;charset=utf-8", dataType:"json",
success:function (res) { type:"post",
layer.close(this.layerIndex); contentType: "application/json;charset=utf-8",
if (data.status >= 300) { success:function (res) {
layer.msg(data.statusInfo.detail,{ layer.close(this.layerIndex);
icon:6, if (data.status >= 300) {
time:1000 layer.msg(data.statusInfo.detail,{
},function () { icon:6,
window.location="/split_edit?id="+id time:1000
});//失败的表情 },function () {
} else {
layer.msg("修改成功!", {
icon: 6,//成功的表情
time: 1000
}, //1秒关闭(如果不配置,默认是3秒)
function(){
//do something
window.location="/split_edit?id="+id window.location="/split_edit?id="+id
}); });//失败的表情
} else {
layer.msg("修改成功!", {
icon: 6,//成功的表情
time: 1000
}, //1秒关闭(如果不配置,默认是3秒)
function(){
//do something
window.location="/split_edit?id="+id
});
}
} }
}
}) })
}
}); });

122
src/main/resources/templates/pages/stockTaking/stockTaking.html

@ -444,6 +444,10 @@
let departmentManagerIdForMaterial; let departmentManagerIdForMaterial;
// 用于存储当前选择的负责人 // 用于存储当前选择的负责人
let departmentManagerIdForLocation; let departmentManagerIdForLocation;
// 用于标志是否为第一次提交
let flagForForm = false;
let flagForForm1 = false;
layui.use(['form', 'step', 'flow', 'table', 'inputTag'], function () { layui.use(['form', 'step', 'flow', 'table', 'inputTag'], function () {
var $ = layui.$, var $ = layui.$,
form = layui.form, form = layui.form,
@ -481,36 +485,40 @@
// 用于提交盘点情况 // 用于提交盘点情况
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data = data.field; if(!flagForForm){
data.depositoryId = depositoryId; flagForForm = true;
data.placeId = placeId; data = data.field;
let submitType = this.getAttribute("submitType"); data.depositoryId = depositoryId;
if ("Material" === submitType) { data.placeId = placeId;
data.departmentManager = departmentManagerIdForMaterial; let submitType = this.getAttribute("submitType");
} else if ("Location" === submitType) { if ("Material" === submitType) {
data.departmentManager = departmentManagerIdForLocation; data.departmentManager = departmentManagerIdForMaterial;
} } else if ("Location" === submitType) {
$.ajax({ data.departmentManager = departmentManagerIdForLocation;
url: "/stockTaking/submitStockTaking",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.msg("申请提交成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
step.next('#stepForm');
});
},
complete: function () {
layer.close(this.layerIndex);
} }
}); $.ajax({
url: "/stockTaking/submitStockTaking",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.msg("申请提交成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
step.next('#stepForm');
});
},
complete: function () {
layer.close(this.layerIndex);
}
});
}
}); });
@ -521,32 +529,36 @@
// 用于提交盘点情况 // 用于提交盘点情况
form.on('submit(formStep3)', function (data) { form.on('submit(formStep3)', function (data) {
data = data.field; if(!flagForForm1){
data.params = params; flagForForm1 = true;
data.departmentManagerId = departmentManagerIdForLocation; data = data.field;
data.depositoryId = depositoryId; data.params = params;
data.placeId = placeId; data.departmentManagerId = departmentManagerIdForLocation;
$.ajax({ data.depositoryId = depositoryId;
url: "/stockTaking/addStockTakingRecord", data.placeId = placeId;
type: 'post', $.ajax({
dataType: 'json', url: "/stockTaking/addStockTakingRecord",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(data), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(data),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.msg("申请提交成功", { },
icon: 6,//成功的表情 success: function (data) {
time: 500 //1秒关闭(如果不配置,默认是3秒) layer.msg("申请提交成功", {
}, function () { icon: 6,//成功的表情
step.next('#stepForm'); time: 500 //1秒关闭(如果不配置,默认是3秒)
}); }, function () {
}, step.next('#stepForm');
complete: function () { });
layer.close(this.layerIndex); },
} complete: function () {
}); layer.close(this.layerIndex);
}
});
}
}); });
$('.pre').click(function () { $('.pre').click(function () {

56
src/main/resources/templates/pages/stockTaking/stockTakingComplete.html

@ -247,6 +247,8 @@
function complete(data) { function complete(data) {
} }
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'step', 'element'], function () { layui.use(['form', 'step', 'element'], function () {
var $ = layui.$, var $ = layui.$,
step = layui.step, step = layui.step,
@ -270,33 +272,37 @@
// 用于获取审核结果与审核的单号 // 用于获取审核结果与审核的单号
complete = function (pass) { complete = function (pass) {
let data = {}; if(!flagForForm){
data.mainId = $("#mainId").val(); flagForForm = true;
data.state = pass; let data = {};
data.mainId = $("#mainId").val();
data.state = pass;
$.ajax({ $.ajax({
url: "/stockTaking/complete", url: "/stockTaking/complete",
type: 'post', type: 'post',
dataType: 'json', dataType: 'json',
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
data: JSON.stringify(data), data: JSON.stringify(data),
beforeSend: function () { beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
}, },
success: function (d) { success: function (d) {
layer.close(this.layerIndex); layer.close(this.layerIndex);
if (d.status >= 300) { if (d.status >= 300) {
} else {
layer.msg("提交成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
window.location = '/StockTakingView?id=' + data.mainId;
});
}
},
})
}
} else {
layer.msg("提交成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
window.location = '/StockTakingView?id=' + data.mainId;
});
}
},
})
}; };

57
src/main/resources/templates/pages/stockTaking/stockTakingForTable.html

@ -177,6 +177,9 @@
} }
// 用于标志是否为第一次提交
let flagForForm = false;
// 用于存储当前选择的盘点位置 // 用于存储当前选择的盘点位置
let depositoryId; let depositoryId;
@ -373,32 +376,36 @@
// 用于提交盘点情况 // 用于提交盘点情况
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data = data.field; if(!flagForForm){
data.depositoryId = depositoryId; flagForForm = true;
data.placeId = placeId; data = data.field;
data.departmentManager = departmentManagerId; data.depositoryId = depositoryId;
data.placeId = placeId;
data.departmentManager = departmentManagerId;
$.ajax({
url: "/stockTaking/submitStockTaking",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.msg("申请提交成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
step.next('#stepForm');
});
},
complete: function () {
layer.close(this.layerIndex);
}
});
}
$.ajax({
url: "/stockTaking/submitStockTaking",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(data),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.msg("申请提交成功", {
icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () {
step.next('#stepForm');
});
},
complete: function () {
layer.close(this.layerIndex);
}
});
}); });

126
src/main/resources/templates/pages/stockTaking/stockTakingReview.html

@ -265,6 +265,8 @@
function review(data) { function review(data) {
} }
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'step', 'element'], function () { layui.use(['form', 'step', 'element'], function () {
var $ = layui.$, var $ = layui.$,
@ -289,71 +291,75 @@
// 用于获取审核结果与审核的单号 // 用于获取审核结果与审核的单号
review = function (pass) { review = function (pass) {
let data = {}; if(!flagForForm){
data.mainId = $("#mainId").val(); flagForForm = true;
data.auditOpinion = $("#auditOpinion").val(); let data = {};
data.departmentManagerState = pass; data.mainId = $("#mainId").val();
data.auditOpinion = $("#auditOpinion").val();
data.departmentManagerState = pass;
$.ajax({ $.ajax({
url: "/stockTaking/review", url: "/stockTaking/review",
type: 'post', type: 'post',
dataType: 'json', dataType: 'json',
contentType: "application/json;charset=utf-8", contentType: "application/json;charset=utf-8",
data: JSON.stringify(data), data: JSON.stringify(data),
beforeSend: function () { beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
}, },
success: function (d) { success: function (d) {
layer.close(this.layerIndex); layer.close(this.layerIndex);
if (d.status >= 300) { if (d.status >= 300) {
var errMsg = d.data.errMsg; var errMsg = d.data.errMsg;
// 获取出错的子订单 // 获取出错的子订单
layer.confirm("当前盘点数量中有溢出情况,需要进行转移", { layer.confirm("当前盘点数量中有溢出情况,需要进行转移", {
btn: ["确定"] btn: ["确定"]
}, function () { // 继续 }, function () { // 继续
layer.open({ layer.open({
type: 2, type: 2,
title: '转移物料', title: '转移物料',
skin: 'layui-layer-rim', skin: 'layui-layer-rim',
maxmin: true, maxmin: true,
shadeClose: true, //点击遮罩关闭层 shadeClose: true, //点击遮罩关闭层
area: ['100%', '100%'], area: ['100%', '100%'],
move: '.layui-layer-title', move: '.layui-layer-title',
fixed: false, fixed: false,
content: '/stockTakingTransfer?minIds=' + errMsg.errIds, content: '/stockTakingTransfer?minIds=' + errMsg.errIds,
end: function (res) { end: function (res) {
if (res.status >= 300) { if (res.status >= 300) {
layer.close(layer.index); layer.close(layer.index);
layer.msg("提交失败,联系开发人员解决", { layer.msg("提交失败,联系开发人员解决", {
icon: 5,//成功的表情 icon: 5,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒) time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () { }, function () {
window.location = '/StockTakingView?id=' + data.mainId; window.location = '/StockTakingView?id=' + data.mainId;
}); });
} else { } else {
layer.close(layer.index); layer.close(layer.index);
layer.msg("提交成功", { layer.msg("提交成功", {
icon: 6,//成功的表情 icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒) time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () { }, function () {
window.location = '/StockTakingView?id=' + data.mainId; window.location = '/StockTakingView?id=' + data.mainId;
}); });
}
} }
} });
}); });
});
} else { } else {
layer.msg("提交成功", { layer.msg("提交成功", {
icon: 6,//成功的表情 icon: 6,//成功的表情
time: 500 //1秒关闭(如果不配置,默认是3秒) time: 500 //1秒关闭(如果不配置,默认是3秒)
}, function () { }, function () {
window.location = '/StockTakingView?id=' + data.mainId; window.location = '/StockTakingView?id=' + data.mainId;
}); });
} }
}, },
}) })
}
}; };

59
src/main/resources/templates/pages/stockTaking/stockTaking_back.html

@ -331,6 +331,9 @@
let barCodeList = {}; let barCodeList = {};
let needToUpdate = {}; let needToUpdate = {};
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use(['form', 'step', 'flow', 'laydate', 'inputTag'], function () { layui.use(['form', 'step', 'flow', 'laydate', 'inputTag'], function () {
var $ = layui.$, var $ = layui.$,
form = layui.form, form = layui.form,
@ -445,32 +448,36 @@
// 用于提交盘点情况 // 用于提交盘点情况
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
data = data.field; if(!flagForForm){
data.params = params; flagForForm = true;
data.needToUpdate = needToUpdate; data = data.field;
data.barCodeListByNoMaterial = barCodeList; data.params = params;
data.departmentManagerId = departmentManagerId; data.needToUpdate = needToUpdate;
$.ajax({ data.barCodeListByNoMaterial = barCodeList;
url: "/stockTaking/addStockTakingRecord", data.departmentManagerId = departmentManagerId;
type: 'post', $.ajax({
dataType: 'json', url: "/stockTaking/addStockTakingRecord",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(data), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(data),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.msg("申请提交成功", { },
icon: 6,//成功的表情 success: function (data) {
time: 500 //1秒关闭(如果不配置,默认是3秒) layer.msg("申请提交成功", {
}, function () { icon: 6,//成功的表情
step.next('#stepForm'); time: 500 //1秒关闭(如果不配置,默认是3秒)
}); }, function () {
}, step.next('#stepForm');
complete: function () { });
layer.close(this.layerIndex); },
} complete: function () {
}); layer.close(this.layerIndex);
}
});
}
}); });

86
src/main/resources/templates/pages/stockTaking/stockTransfer.html

@ -49,7 +49,8 @@
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">转移位置:</label> <label class="layui-form-label">转移位置:</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" id="minIds" name="minIds" th:value="${minIds}" style="display:none;"> <input type="text" id="minIds" name="minIds" th:value="${minIds}"
style="display:none;">
<input type="text" name="mainId" id="mainId" th:value="${mainRecord.getId()}" <input type="text" name="mainId" id="mainId" th:value="${mainRecord.getId()}"
style="display:none;"> style="display:none;">
<input type="text" class="layui-input" <input type="text" class="layui-input"
@ -205,6 +206,9 @@
} }
// 用于标志是否为第一次提交
let flagForForm = false;
// 用于暂存卡片个数 // 用于暂存卡片个数
let params = []; let params = [];
@ -244,12 +248,12 @@
move: '.layui-layer-title', move: '.layui-layer-title',
fixed: false, fixed: false,
content: '/selectDepository?type=2', content: '/selectDepository?type=2',
success: function(layero, index){ success: function (layero, index) {
var children = layero.children(); var children = layero.children();
var content = $(children[1]); var content = $(children[1]);
var iframeChildren = $(content.children()); var iframeChildren = $(content.children());
content.css('height','100%'); content.css('height', '100%');
iframeChildren.css('height','100%'); iframeChildren.css('height', '100%');
}, },
end: function () { end: function () {
var nowDepositoryId = $("#depositoryId").val(); var nowDepositoryId = $("#depositoryId").val();
@ -273,37 +277,41 @@
// 用于提交盘点转移情况 // 用于提交盘点转移情况
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
if (depositoryId !== null && depositoryId !== undefined && depositoryId !== "") { if (!flagForForm) {
data = data.field; flagForForm = true;
$.ajax({ if (depositoryId !== null && depositoryId !== undefined && depositoryId !== "") {
url: "/stockTaking/stockTransfer", data = data.field;
type: 'post', $.ajax({
dataType: 'json', url: "/stockTaking/stockTransfer",
contentType: "application/json;charset=utf-8", type: 'post',
data: JSON.stringify(data), dataType: 'json',
beforeSend: function () { contentType: "application/json;charset=utf-8",
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); data: JSON.stringify(data),
}, beforeSend: function () {
success: function (data) { this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
layer.msg("申请提交成功", { },
icon: 6,//成功的表情 success: function (data) {
time: 500 //1秒关闭(如果不配置,默认是3秒) layer.msg("申请提交成功", {
}, function () { icon: 6,//成功的表情
// 关闭当前页 time: 500 //1秒关闭(如果不配置,默认是3秒)
var index = parent.layer.getFrameIndex(window.name); }, function () {
parent.layer.close(index); // 关闭当前页
}); var index = parent.layer.getFrameIndex(window.name);
}, parent.layer.close(index);
complete: function () { });
layer.close(this.layerIndex); },
} complete: function () {
}); layer.close(this.layerIndex);
} else { }
layer.msg("请先选择盘点位置", { });
icon: 0, } else {
time: 500 layer.msg("请先选择盘点位置", {
}) icon: 0,
time: 500
})
}
} }
}); });
//删除数组中指定元素 //删除数组中指定元素
@ -331,12 +339,12 @@
move: '.layui-layer-title', move: '.layui-layer-title',
fixed: false, fixed: false,
content: '/scanCodeByTaking', content: '/scanCodeByTaking',
success: function(layero, index){ success: function (layero, index) {
var children = layero.children(); var children = layero.children();
var content = $(children[1]); var content = $(children[1]);
var iframeChildren = $(content.children()); var iframeChildren = $(content.children());
content.css('height','100%'); content.css('height', '100%');
iframeChildren.css('height','100%'); iframeChildren.css('height', '100%');
}, },
end: function () { end: function () {
var nowDepositoryId = $("#depositoryId").val(); var nowDepositoryId = $("#depositoryId").val();
@ -386,8 +394,8 @@
layer.msg("转移数量不能大于当前盘点数量:" + inventory); layer.msg("转移数量不能大于当前盘点数量:" + inventory);
obj.value = oldNumber; obj.value = oldNumber;
} }
if(number > placeInventory){ if (number > placeInventory) {
layer.msg("当前转移库位只能存放:" + placeInventory+"的物料"); layer.msg("当前转移库位只能存放:" + placeInventory + "的物料");
obj.value = oldNumber; obj.value = oldNumber;
} }
} }

67
src/main/resources/templates/pages/warehouse/depository_add.html

@ -99,6 +99,8 @@
</div> </div>
<script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script> <script src="/static/lib/layui-v2.6.3/layui.js" charset="utf-8"></script>
<script> <script>
// 用于标志是否为第一次提交
let flagForForm = false;
var data; var data;
layui.use(['form', 'layer'], function () { layui.use(['form', 'layer'], function () {
var $ = layui.jquery, var $ = layui.jquery,
@ -150,39 +152,42 @@
}); });
form.on('submit(formStep)', function (data) { form.on('submit(formStep)', function (data) {
if(!flagForForm){
flagForForm = true;
$.ajax({
url: "/repository/depository",
type: 'post',
dataType: 'json',
contentType: "application/json;charset=utf-8",
data: JSON.stringify(data.field),
beforeSend: function () {
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("添加成功!", {
icon: 6,//成功的表情
time: 1000 //1秒关闭(如果不配置,默认是3秒)
},function () {
window.location="/depository_add"
});
$.ajax({ }
url: "/repository/depository", },
type: 'post', complete: function () {
dataType: 'json', form.val("form1", {
contentType: "application/json;charset=utf-8", "dname": "",// "name": "value"
data: JSON.stringify(data.field), "address": "",
beforeSend: function () { "introduce": ""
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); })
},
success: function (data) {
layer.close(this.layerIndex);
if (data.status >= 300) {
layer.msg(data.statusInfo.message);//失败的表情
return;
} else {
layer.msg("添加成功!", {
icon: 6,//成功的表情
time: 1000 //1秒关闭(如果不配置,默认是3秒)
},function () {
window.location="/depository_add"
});
} }
}, })
complete: function () { }
form.val("form1", {
"dname": "",// "name": "value"
"address": "",
"introduce": ""
})
}
})
return false; return false;
}); });

58
src/main/resources/templates/pages/warehouse/warehouse_view.html

@ -132,7 +132,8 @@
function downloadCodeImg() { function downloadCodeImg() {
} }
// 用于标志是否为第一次提交
let flagForForm = false;
layui.use('form', function () { layui.use('form', function () {
var form = layui.form, $ = layui.$; var form = layui.form, $ = layui.$;
@ -161,33 +162,36 @@
//提交 //提交
form.on('submit(formDemo)', function (data) { form.on('submit(formDemo)', function (data) {
data = data.field; if(!flagForForm){
$.ajax({ data = data.field;
url: "/repository/depository_edit", $.ajax({
type: 'post', url: "/repository/depository_edit",
dataType: 'json', type: 'post',
contentType: "application/json;charset=utf-8", dataType: 'json',
data: JSON.stringify(data), contentType: "application/json;charset=utf-8",
beforeSend: function () { data: JSON.stringify(data),
this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']}); beforeSend: function () {
}, this.layerIndex = layer.load(0, {shade: [0.5, '#393D49']});
success: function (data) { },
layer.close(this.layerIndex); success: function (data) {
if (data.status >= 300) { layer.close(this.layerIndex);
layer.msg(data.statusInfo.message);//失败的表情 if (data.status >= 300) {
return; layer.msg(data.statusInfo.message);//失败的表情
} else { return;
layer.msg("修改仓库信息成功", { } else {
icon: 6,//成功的表情 layer.msg("修改仓库信息成功", {
time: 500 //1秒关闭(如果不配置,默认是3秒) icon: 6,//成功的表情
}, function () { time: 500 //1秒关闭(如果不配置,默认是3秒)
var index = parent.layer.getFrameIndex(window.name); }, function () {
parent.layer.close(index);//关闭当前页 var index = parent.layer.getFrameIndex(window.name);
window.location = '/depository-out' parent.layer.close(index);//关闭当前页
}) window.location = '/depository-out'
})
}
} }
} });
}); }
return false; return false;
}); });

Loading…
Cancel
Save