diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java index 49457da7..346b2eab 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/DepositoryRecordController.java @@ -464,6 +464,21 @@ public class DepositoryRecordController { map.put("departmenthead", departmentHeadId.toString()); List params = (List) map.get("params"); Integer integer = 0; + + if (map.containsKey("constructionUnitId")) { + String constructionUnitId = map.get("constructionUnitId").toString(); + if ("".equals(constructionUnitId)) { + map.remove("constructionUnitId"); + } + } + if (map.containsKey("adminorgId")) { + String adminorgId = map.get("adminorgId").toString(); + if ("".equals(adminorgId)) { + map.put("adminorgId", userToken.getMaindeparment()); + } + } else { + map.put("adminorgId", userToken.getMaindeparment()); + } if (params.size() < 1 && map.size() > 3) { Integer res = depositoryRecordService.insertApplicationOutRecord(map, userToken); // 插入主订单 Object id = map.get("id"); // 获取主订单编号 @@ -472,21 +487,6 @@ public class DepositoryRecordController { map.remove("id"); map.put("parentId", id); } - if (map.containsKey("constructionUnitId")) { - String constructionUnitId = map.get("constructionUnitId").toString(); - if ("".equals(constructionUnitId)) { - map.remove("constructionUnitId"); - } - } - if (map.containsKey("adminorgId")) { - String adminorgId = map.get("adminorgId").toString(); - if ("".equals(adminorgId)) { - map.put("adminorgId", userToken.getMaindeparment()); - } - } else { - map.put("adminorgId", userToken.getMaindeparment()); - } - integer += depositoryRecordService.insertApplicationOutMin(map); // 开启一个线程执行发送信息操作 @@ -548,47 +548,16 @@ public class DepositoryRecordController { insert.put("applicantId", userToken.getId()); insert.put("mid", map.get("mid" + temp)); insert.put("quantity", (int) (ObjectFormatUtil.toDouble(map.get("quantity" + temp)) * 100)); - insert.put("applyRemark", map.get("applyRemark" + temp)); insert.put("code", map.get("code")); insert.put("placeId", map.get("placeId")); insert.put("unit", map.get("unit" + temp)); + insert.put("project", map.get("project" + temp)); // 获取主订单编号 insert.put("parentId", id); - if (map.containsKey("constructionUnitId" + temp)) { - String constructionUnitId = (String) map.get("constructionUnitId" + temp); - if (!"".equals(constructionUnitId)) { - insert.put("constructionUnitId", constructionUnitId); - } - } - if (map.containsKey("adminorgId" + temp)) { - String adminorgId = (String) map.get("adminorgId" + temp); - - if ("".equals(adminorgId)) { - map.put("adminorgId", userToken.getMaindeparment()); - } else { - map.put("adminorgId", adminorgId); - } - } else { - map.put("adminorgId", userToken.getMaindeparment()); - } - // 插入子订单 integer += depositoryRecordService.insertApplicationOutMin(insert); } - if (map.containsKey("constructionUnitId")) { - String constructionUnitId = map.get("constructionUnitId").toString(); - if ("".equals(constructionUnitId)) { - map.remove("constructionUnitId"); - } - } - if (map.containsKey("adminorgId")) { - 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.remove("id"); @@ -1491,7 +1460,6 @@ public class DepositoryRecordController { outRecord.put("code", mainRecord.get("code")); outRecord.put("placeId", place); outRecord.put("unit", unit); - outRecord.put("applyRemark", applyRemark); outRecord.put("adminorgId", userToken.getMaindeparment()); success += depositoryRecordService.insertApplicationOutMin(outRecord); } else { diff --git a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java index a531ef35..a99999fe 100644 --- a/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java +++ b/src/main/java/com/dreamchaser/depository_manage/controller/PageController.java @@ -1843,33 +1843,24 @@ public class PageController { Inventory inventoryById = materialService.findInventoryById(recordMinP.getMid()); // 获取出库物料仓库信息 Depository depository = depositoryService.findDepositoryById(recordMinP.getDepositoryId()); - // 获取出库库位 - Place placeById = placeService.findPlaceById(recordMinP.getPlaceId()); + + // 获取处理人 - UserByPort userByPort = LinkInterfaceUtil.FindUserById(recordMinP.getCheckId(), userToken); + Integer checkId = recordMinP.getCheckId(); + if (checkId != null) { + UserByPort userByPort = LinkInterfaceUtil.FindUserById(checkId, userToken); - if (recordMinP.getAdminorgId() != null) { - Administration company = LinkInterfaceUtil.getCompany(recordMinP.getAdminorgId(), userToken); - recordMinP.setAdminorgName(company.getName()); - mv.addObject("adisplay", "table-row"); - } else { - mv.addObject("adisplay", "none"); - } - if (recordMinP.getConstructionUnitId() != null) { - ConstructionUnit constructionUnitById = constructionUnitService.findConstructionUnitById(recordMinP.getConstructionUnitId()); - recordMinP.setConstructionUnitName(constructionUnitById.getName()); - mv.addObject("cdisplay", "table-row"); - } else { - mv.addObject("cdisplay", "none"); + // 设置处理人姓名 + recordMinP.setCheckerName(userByPort.getName()); + // 获取出库库位 + Place placeById = placeService.findPlaceById(recordMinP.getPlaceId()); + recordMinP.setPlaceCode(placeById.getCode()); } - // 设置处理人姓名 - recordMinP.setCheckerName(userByPort.getName()); recordMinP.setDepositoryName(depository.getDname()); recordMinP.setMname(inventoryById.getMname()); recordMinP.setMcode(inventoryById.getCode()); recordMinP.setVersion(inventoryById.getVersion() == null ? "" : inventoryById.getVersion()); - recordMinP.setPlaceCode(placeById.getCode()); String unit = recordMinP.getUnit(); if ("-1".equals(unit)) { recordMinP.setUnit(inventoryById.getUnit()); @@ -1955,14 +1946,9 @@ public class PageController { Inventory inventoryById = materialService.findInventoryById(recordMinP.getMid()); // 获取出库物料仓库信息 Depository depository = depositoryService.findDepositoryById(recordMinP.getDepositoryId()); - // 获取出库库位 - Place placeById = placeService.findPlaceById(recordMinP.getPlaceId()); - if (placeById != null) { - placeCode.append(placeById.getCode()).append(","); - } + recordMinP.setMname(inventoryById.getMname()); recordMinP.setDepositoryName(depository.getDname()); - recordMinP.setPlaceCode(placeById.getCode()); Integer checkId = recordMinP.getCheckId(); if (checkId != null) { // 如果当前子订单已经处理 @@ -1970,6 +1956,12 @@ public class PageController { UserByPort disposer = LinkInterfaceUtil.FindUserById(checkId, userToken); outDisposer.append(disposer.getName()).append(","); recordMinP.setCheckerName(disposer.getName()); + // 获取出库库位 + Place placeById = placeService.findPlaceById(recordMinP.getPlaceId()); + if (placeById != null) { + placeCode.append(placeById.getCode()).append(","); + recordMinP.setPlaceCode(placeById.getCode()); + } } else { outDisposer.append("暂未处理,"); recordMinP.setCheckerName("暂未处理"); @@ -2047,6 +2039,25 @@ public class PageController { depositoryManager.add(user); depositoryManagerNames.append(user.getName()); } + + Integer adminorgId = applicationOutRecordPById.getAdminorgId(); + Integer constructionUnitId = applicationOutRecordPById.getConstructionUnitId(); + if(adminorgId != null){ + Administration company = LinkInterfaceUtil.getCompany(adminorgId, userToken); + applicationOutRecordPById.setAdminorgName(company.getName()); mv.addObject("adisplay", "table-row"); + }else { + mv.addObject("adisplay", "none"); + } + if(constructionUnitId != null){ + ConstructionUnit constructionUnitById = constructionUnitService.findConstructionUnitById(constructionUnitId); + applicationOutRecordPById.setConstructionUnitName(constructionUnitById.getName()); + mv.addObject("cdisplay", "table-row"); + }else { + mv.addObject("cdisplay", "none"); + } + + + applicationOutRecordPById.setApplicantName(userByPort.getName()); applicationOutRecordPById.setDepartmentheadName(departmentHeadName.toString()); applicationOutRecordPById.setDepositoryManagerName(depositoryManagerNames.toString()); @@ -3031,13 +3042,13 @@ public class PageController { ModelAndView mv = new ModelAndView(); if (param.containsKey("id")) { String type = param.get("type"); - mv.addObject("id",param.get("id")); - if("m".equals(type)){ + mv.addObject("id", param.get("id")); + if ("m".equals(type)) { // 如果是物料 mv.setViewName("pages/showInventory/showInventoryForMaterial"); - }else if("d".equals(type) || "p".equals(type)){ - mv.addObject("type",type); + } else if ("d".equals(type) || "p".equals(type)) { + mv.addObject("type", type); // 如果是位置 mv.setViewName("pages/showInventory/showInventoryForLocation"); } diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java index 35f4b6dc..6a72f8ae 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecord.java @@ -169,6 +169,18 @@ public class ApplicationOutRecord { */ private String outTime; + /** + * 摘要 + */ + private String abstracts; + + + /** + * 出库类别 + */ + private String outType; + + } diff --git a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java index d9ff9d34..90497fc5 100644 --- a/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java +++ b/src/main/java/com/dreamchaser/depository_manage/entity/ApplicationOutRecordMin.java @@ -69,14 +69,9 @@ public class ApplicationOutRecordMin { */ private String mname; - /** - * 施工单位id + * 项目 */ - private Integer constructionUnitId; + private String project; - /** - * 部门id - */ - private Integer adminorgId; } diff --git a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index 4947e298..08cf3126 100644 --- a/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/src/main/java/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -113,8 +113,10 @@ - - + + + + @@ -131,8 +133,6 @@ - - @@ -170,12 +170,12 @@ aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage, - depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aormconstructionunitid,aormadminorgid,cuname, - cuintroduce,cuaddress,outTime + depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aorconstructionunitid,aoradminorgid,cuname, + cuintroduce,cuaddress,outTime,abstract,outType - aorm.id,aorm.mid,aorm.depositoryId,aorm.placeId,aorm.quantity,aorm.code,aorm.checkId,aorm.parentId,aorm.transferId,aorm.trueOut,aorm.unit,aorm.constructionunitid,aorm.adminorgid + aorm.id,aorm.mid,aorm.depositoryId,aorm.placeId,aorm.quantity,aorm.code,aorm.checkId,aorm.parentId,aorm.transferId,aorm.trueOut,aorm.unit,aorm.project @@ -1339,17 +1345,12 @@ parentId = #{parentId}, - - trueOut = #{trueOut}, - - - constructionunitid = #{constructionUnitId}, + + project = #{project}, - - adminorgid = #{adminorgId} + + trueOut = #{trueOut} - - where id = #{id} @@ -1448,6 +1449,15 @@ outTime = #{outTime}, + + constructionunitid = #{constructionUnitId}, + + + adminorgid = #{adminorgId}, + + + outType = #{outType}, + pass = #{pass} diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java index 8aa3386e..a034d080 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordMinP.java @@ -101,30 +101,16 @@ public class ApplicationOutRecordMinP { */ private Integer transferId; - /** - * 施工单位id - */ - private Integer constructionUnitId; - - /** - * 施工单位名称 - */ - private String constructionUnitName; /** - * 部门id + * 已经出库的数量 */ - private Integer adminorgId; - + private Double trueOut; /** - * 部门名称 - */ - private String adminorgName; - /** - * 已经出库的数量 + * 项目 */ - private Double trueOut; + private String project; @@ -140,8 +126,7 @@ public class ApplicationOutRecordMinP { this.placeId = recordMin.getPlaceId(); this.unit = recordMin.getUnit(); this.transferId = recordMin.getTransferId(); - this.constructionUnitId = recordMin.getConstructionUnitId(); - this.adminorgId = recordMin.getAdminorgId(); this.trueOut =(double) (recordMin.getTrueOut() / 100); + this.project = recordMin.getProject(); } } diff --git a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java index 4ce068cc..033223c2 100644 --- a/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java +++ b/src/main/java/com/dreamchaser/depository_manage/pojo/ApplicationOutRecordP.java @@ -172,6 +172,22 @@ public class ApplicationOutRecordP { private String outTime; + + /** + * 部门名称 + */ + private String adminorgName; + + /** + * 摘要 + */ + private String abstracts; + + /** + * 出库类别 + */ + private String outType; + public ApplicationOutRecordP(ApplicationOutRecord aor) { this.id = aor.getId(); this.mid = aor.getMid(); @@ -206,5 +222,7 @@ public class ApplicationOutRecordP { this.constructionUnitName = aor.getConstructionUnitName(); this.adminorgId = aor.getAdminorgId(); this.outTime = aor.getOutTime() == null ? "" : DateUtil.TimeStampToDateTime(Long.valueOf(aor.getOutTime())); + this.abstracts = aor.getAbstracts(); + this.outType = aor.getOutType(); } } diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java index 1ae66b18..bad3aaa3 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/DepositoryRecordServiceImpl.java @@ -3765,8 +3765,7 @@ public class DepositoryRecordServiceImpl implements DepositoryRecordService { @Override public ApplicationOutRecordP findApplicationOutRecordPById(Integer id) { ApplicationOutRecord record = depositoryRecordMapper.findApplicationOutRecordPById(id); - ApplicationOutRecordP recordP = new ApplicationOutRecordP(record); - return recordP; + return new ApplicationOutRecordP(record); } /** diff --git a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java index 33a7bee7..e9706bec 100644 --- a/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java +++ b/src/main/java/com/dreamchaser/depository_manage/service/impl/ExcelServiceImpl.java @@ -514,7 +514,7 @@ public class ExcelServiceImpl implements ExcelService { // 设置制单人名称 excelInfoByWrite.setProducerName(userToken.getName()); // 定义部门id - Integer adminorgId = null; + Integer adminorgId = record.getAdminorgId(); // 定义部门 Administration company = null; for (int i = 1; i <= pagesum; i++) { @@ -565,10 +565,7 @@ public class ExcelServiceImpl implements ExcelService { dataMin.add(excelInfoByMinWrite); // 添加总数 total += (double) (recordMin.getQuantity() / 100); - if (adminorgId == null) { - // 如果没有选择部门 - adminorgId = recordMin.getAdminorgId(); - } + } if (adminorgId != null && company == null) { company = LinkInterfaceUtil.getCompany(adminorgId, userToken); diff --git a/src/main/resources/templates/pages/application/form-step-look_back.html b/src/main/resources/templates/pages/application/form-step-look_back.html index 2d1636b9..5fa066ab 100644 --- a/src/main/resources/templates/pages/application/form-step-look_back.html +++ b/src/main/resources/templates/pages/application/form-step-look_back.html @@ -46,6 +46,14 @@ 仓库名称 外芯仓库 + + 部门 + 部门 + + + 施工单位 + 施工单位 + 处理人 diff --git a/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html b/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html index 1114e7af..afedd039 100644 --- a/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html +++ b/src/main/resources/templates/pages/application/form-step-look_minRecordOut.html @@ -66,15 +66,6 @@ 转入位置 2016-11-28 - - 部门 - 外芯仓库 - - - - 施工单位 - 外芯仓库 - diff --git a/src/main/resources/templates/pages/applicationForStorageCenter/application-out.html b/src/main/resources/templates/pages/applicationForStorageCenter/application-out.html index 9234e0de..a7becfa0 100644 --- a/src/main/resources/templates/pages/applicationForStorageCenter/application-out.html +++ b/src/main/resources/templates/pages/applicationForStorageCenter/application-out.html @@ -59,6 +59,54 @@
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
- -
- - -
-
-
- +
- - -
-
-
- -
-
@@ -198,6 +220,54 @@
+ +
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
- -
- - -
-
-
- -
- - -
-
-
- +
-
@@ -421,7 +466,7 @@ elem: '#stepForm', filter: 'stepForm', width: '100%', //设置容器宽度 - height: '600px', + height: '700px', stepItems: [{ title: '填写信息' }, { @@ -636,36 +681,10 @@
-
- -
- - -
-
-
- -
- - -
-
- +
-
@@ -674,7 +693,7 @@ // 获取当前高度 var height = parseInt(($("#stepForm").css('height')).split("px")[0]); params.push(NewIdNumber); - $("#stepForm").css("height", height + 483 + 'px'); + $("#stepForm").css("height", height + 387 + 'px'); $("#" + parentId).after(materialItem); }; @@ -722,37 +741,11 @@
- -
- -
- - -
-
-
- -
- - -
- +
-
@@ -764,7 +757,7 @@ // 获取当前高度 var height = parseInt(($("#stepForm2").css('height')).split("px")[0]); params2.push(NewIdNumber); - $("#stepForm2").css("height", height + 385 + 'px'); + $("#stepForm2").css("height", height + 289 + 'px'); $("#" + parentId).after(materialItem); }; @@ -842,7 +835,7 @@ // 获取祖父节点 var reparent = parent.parentNode; var height = parseInt(($("#stepForm").css('height')).split("px")[0]); - $("#stepForm").css("height", height - 422 + 'px'); + $("#stepForm").css("height", height - 387 + 'px'); params = remove(params, parentId); reparent.removeChild(parent); }; @@ -1428,7 +1421,7 @@ var req = {}; req.qrCode = result; req.codeFlag = 1; - let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); + let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); $.ajax({ url: "/material/qywxApplicationOutScanBarCode", type: "post", @@ -1485,6 +1478,8 @@ }) } }) + + }; // 用于扫码功能 @@ -1506,7 +1501,7 @@ var req = {}; req.qrCode = result; req.codeFlag = 2; - let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); + let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); $.ajax({ url: "/material/qywxApplicationOutScanQrCode", type: "post", @@ -1717,6 +1712,36 @@ var iframeChildren = $(content.children()); content.css('height', '100%'); iframeChildren.css('height', '100%'); + }, + end:function () { + let val = $("#"+id).val(); + if(val !== ""){ + if(id.indexOf("ForGroup") !== -1){ + // 如果是组合 + $("#stepForm2").find('input[id*="project"]').each(function () { + $(this).attr("lay-verify","required") + }) + + }else{ + // 如果是物料 + $("#stepForm").find('input[id*="project"]').each(function () { + $(this).attr("lay-verify","required") + }) + } + }else{ + if(id.indexOf("ForGroup") !== -1){ + // 如果是组合 + $("#stepForm2").find('input[id*="project"]').each(function () { + $(this).removeAttr("lay-verify") + }) + + }else{ + // 如果是物料 + $("#stepForm").find('input[id*="project"]').each(function () { + $(this).removeAttr("lay-verify") + }) + } + } } }); }; diff --git a/src/main/resources/templates/pages/user/login.html b/src/main/resources/templates/pages/user/login.html index 72d2f505..2476e0e3 100644 --- a/src/main/resources/templates/pages/user/login.html +++ b/src/main/resources/templates/pages/user/login.html @@ -207,7 +207,7 @@ layer = layui.layer; // 登录过期的时候，跳出ifram框架 - if (top.location != self.location) top.location = self.location; + if (top.location !== self.location) top.location = self.location; // 粒子线条背景 $(document).ready(function () { diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index 4947e298..08cf3126 100644 --- a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -113,8 +113,10 @@ - - + + + + @@ -131,8 +133,6 @@ - - @@ -170,12 +170,12 @@ aorid,mid,mname,depositoryId,dname,applicantId,applicantTime,applyRemark,aorcode,aorpirce,aorquantity,departmenthead,departmentheadPass,departmentHeadTime,departmentheadMessage, - depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aormconstructionunitid,aormadminorgid,cuname, - cuintroduce,cuaddress,outTime + depositoryManager,depositoryManagerPass,depositoryManagerTime,depositoryManagerMessage,aorstate,istransfer,mcode,placeId,pass,aormUnit,aorconstructionunitid,aoradminorgid,cuname, + cuintroduce,cuaddress,outTime,abstract,outType - aorm.id,aorm.mid,aorm.depositoryId,aorm.placeId,aorm.quantity,aorm.code,aorm.checkId,aorm.parentId,aorm.transferId,aorm.trueOut,aorm.unit,aorm.constructionunitid,aorm.adminorgid + aorm.id,aorm.mid,aorm.depositoryId,aorm.placeId,aorm.quantity,aorm.code,aorm.checkId,aorm.parentId,aorm.transferId,aorm.trueOut,aorm.unit,aorm.project @@ -1339,17 +1345,12 @@ parentId = #{parentId}, - - trueOut = #{trueOut}, - - - constructionunitid = #{constructionUnitId}, + + project = #{project}, - - adminorgid = #{adminorgId} + + trueOut = #{trueOut} - - where id = #{id} @@ -1448,6 +1449,15 @@ outTime = #{outTime}, + + constructionunitid = #{constructionUnitId}, + + + adminorgid = #{adminorgId}, + + + outType = #{outType}, + pass = #{pass} diff --git a/target/classes/templates/pages/application/form-step-look_back.html b/target/classes/templates/pages/application/form-step-look_back.html index 2d1636b9..5fa066ab 100644 --- a/target/classes/templates/pages/application/form-step-look_back.html +++ b/target/classes/templates/pages/application/form-step-look_back.html @@ -46,6 +46,14 @@ 仓库名称 外芯仓库 + + 部门 + 部门 + + + 施工单位 + 施工单位 + 处理人 diff --git a/target/classes/templates/pages/application/form-step-look_minRecordOut.html b/target/classes/templates/pages/application/form-step-look_minRecordOut.html index 1114e7af..afedd039 100644 --- a/target/classes/templates/pages/application/form-step-look_minRecordOut.html +++ b/target/classes/templates/pages/application/form-step-look_minRecordOut.html @@ -66,15 +66,6 @@ 转入位置 2016-11-28 - - 部门 - 外芯仓库 - - - - 施工单位 - 外芯仓库 - diff --git a/target/classes/templates/pages/applicationForStorageCenter/application-out.html b/target/classes/templates/pages/applicationForStorageCenter/application-out.html index 9234e0de..a7becfa0 100644 --- a/target/classes/templates/pages/applicationForStorageCenter/application-out.html +++ b/target/classes/templates/pages/applicationForStorageCenter/application-out.html @@ -59,6 +59,54 @@
+
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
- -
- - -
-
-
- +
- - -
-
-
- -
-
@@ -198,6 +220,54 @@
+ +
+ +
+ + +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
- -
- - -
-
-
- -
- - -
-
-
- +
-
@@ -421,7 +466,7 @@ elem: '#stepForm', filter: 'stepForm', width: '100%', //设置容器宽度 - height: '600px', + height: '700px', stepItems: [{ title: '填写信息' }, { @@ -636,36 +681,10 @@
-
- -
- - -
-
-
- -
- - -
-
- +
-
@@ -674,7 +693,7 @@ // 获取当前高度 var height = parseInt(($("#stepForm").css('height')).split("px")[0]); params.push(NewIdNumber); - $("#stepForm").css("height", height + 483 + 'px'); + $("#stepForm").css("height", height + 387 + 'px'); $("#" + parentId).after(materialItem); }; @@ -722,37 +741,11 @@
- -
- -
- - -
-
-
- -
- - -
- +
-
@@ -764,7 +757,7 @@ // 获取当前高度 var height = parseInt(($("#stepForm2").css('height')).split("px")[0]); params2.push(NewIdNumber); - $("#stepForm2").css("height", height + 385 + 'px'); + $("#stepForm2").css("height", height + 289 + 'px'); $("#" + parentId).after(materialItem); }; @@ -842,7 +835,7 @@ // 获取祖父节点 var reparent = parent.parentNode; var height = parseInt(($("#stepForm").css('height')).split("px")[0]); - $("#stepForm").css("height", height - 422 + 'px'); + $("#stepForm").css("height", height - 387 + 'px'); params = remove(params, parentId); reparent.removeChild(parent); }; @@ -1428,7 +1421,7 @@ var req = {}; req.qrCode = result; req.codeFlag = 1; - let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); + let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); $.ajax({ url: "/material/qywxApplicationOutScanBarCode", type: "post", @@ -1485,6 +1478,8 @@ }) } }) + + }; // 用于扫码功能 @@ -1506,7 +1501,7 @@ var req = {}; req.qrCode = result; req.codeFlag = 2; - let loading2 = layer.open({ type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); + let loading2 = layer.open({type: 3, shade: [0.25, '#000'], icon: 2, speed: 0}); $.ajax({ url: "/material/qywxApplicationOutScanQrCode", type: "post", @@ -1717,6 +1712,36 @@ var iframeChildren = $(content.children()); content.css('height', '100%'); iframeChildren.css('height', '100%'); + }, + end:function () { + let val = $("#"+id).val(); + if(val !== ""){ + if(id.indexOf("ForGroup") !== -1){ + // 如果是组合 + $("#stepForm2").find('input[id*="project"]').each(function () { + $(this).attr("lay-verify","required") + }) + + }else{ + // 如果是物料 + $("#stepForm").find('input[id*="project"]').each(function () { + $(this).attr("lay-verify","required") + }) + } + }else{ + if(id.indexOf("ForGroup") !== -1){ + // 如果是组合 + $("#stepForm2").find('input[id*="project"]').each(function () { + $(this).removeAttr("lay-verify") + }) + + }else{ + // 如果是物料 + $("#stepForm").find('input[id*="project"]').each(function () { + $(this).removeAttr("lay-verify") + }) + } + } } }); }; diff --git a/target/classes/templates/pages/user/login.html b/target/classes/templates/pages/user/login.html index 72d2f505..2476e0e3 100644 --- a/target/classes/templates/pages/user/login.html +++ b/target/classes/templates/pages/user/login.html @@ -207,7 +207,7 @@ layer = layui.layer; // 登录过期的时候，跳出ifram框架 - if (top.location != self.location) top.location = self.location; + if (top.location !== self.location) top.location = self.location; // 粒子线条背景 $(document).ready(function () {