Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js =================================================================== diff -u -r19834 -r19848 --- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 19834) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 19848) @@ -179,5 +179,7 @@ //自定义入筐是否启用输入装载数量进行入筐操作 enableCustomIntoBasketWithCustomAmount:true, //是否启用自定义回收的篮筐序号。目前就外来器械拆包有用 - enableClassifyBasketSequence:true + enableClassifyBasketSequence:true, + //同步入库单失效时期默认值,添加3年 + defaultExpDate:3 } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp =================================================================== diff -u -r19754 -r19848 --- ssts-web/src/main/webapp/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp (.../syncStorageEntry.jsp) (revision 19754) +++ ssts-web/src/main/webapp/disinfectsystem/datasynchronization/inventory/syncStorageEntry.jsp (.../syncStorageEntry.jsp) (revision 19848) @@ -8,7 +8,7 @@ <%@page import="java.text.SimpleDateFormat"%> <%@ page language="java" contentType="text/html; charset=UTF-8" %> <%@ include file="/common/taglibs.jsp"%> - + <% String startDate = request.getParameter("startDate"); String endDate = request.getParameter("endDate"); @@ -337,11 +337,13 @@ cellSix.insertBefore(createDisplayTextNodeIfEmpty(expDate), null);//失效日期 }else{ var columnField2 = createInputElement("itemExpDate_"+entryId+"_" + prev, "text", ""); - var date = new Date(); - var mon = date.getMonth()+1; - var day = date.getDate(); - var date = date.getFullYear()+3 + "-" + (mon<10?"0"+mon:mon) + "-" +(day<10?"0"+day:day); - columnField2.value=date; + if (sstsConfig.defaultExpDate) {//zzyy医院数据没有失效日期,需要添加失效日期默认值 + var date = new Date(); + var mon = date.getMonth()+1; + var day = date.getDate(); + var date = date.getFullYear()+sstsConfig.defaultExpDate + "-" + (mon<10?"0"+mon:mon) + "-" +(day<10?"0"+day:day); + columnField2.value=date; + } columnField2.className="accessories_iamge"; columnField2.style.width="80"; columnField2.style.height="20";