Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js =================================================================== diff -u -r36430 -r36689 --- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js (.../borrowingTousseView.js) (revision 36430) +++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js (.../borrowingTousseView.js) (revision 36689) @@ -322,14 +322,14 @@ //如果审核方式为按权限审核且有审核权限 或者 未配置审核方式属当前操作人为供应室用户时,可提供审核权限 if(sstsConfig.borrowInvoicePlanReviewType == 'operation' && !SSTS_borrow_Review || !sstsConfig.borrowInvoicePlanReviewType && validateIsSupplyRoomUser()){ - return ""; + return ""; } } return null; } else if (invoiceStatus == '部分签收') { - inoviceButton = ""; + inoviceButton = ""; } else { - inoviceButton = ""; + inoviceButton = ""; } var departCoding = $Id('departCoding').value; //用户的当前科室科室编码 @@ -338,23 +338,24 @@ //1.用户的当前科室科室为借物单的申请科室或者用户的当前科室科室为处理科室并且有“代归还物品”的权限,并且在config.js配置了允许处理科室的用户替申请科室归还物品 //2.借物单的发货状态为部分发货或已发货 //3.借物单的归还状态为未归还或部分归还 + //GGSRMYY-168:4.拥有归还物品的权限 if ((record.data.departCoding == departCoding || (sstsConfig.allowInsteadReturn && SSTS_borrow_InsteadReturn && handleDepartCoding == departCoding )) && (deliverStatus == statusArr[1] || deliverStatus == statusArr[2]) - && (returnStatusArr[0] == returnStatus || returnStatusArr[1] == returnStatus)) { - returnButton = ""; } //完全归还物品按钮的显示条件(以下各条件间为并且关系): //1.当前用户有完全归还物品的权限 //2.借物单的发货状态为已发货 //3.借物单的归还状态为未归还或部分归还 if (!SSTS_borrow_returnAll && deliverStatus === statusArr[2] && (returnStatusArr[0] == returnStatus || returnStatusArr[1] == returnStatus)){ - returnButton += ""; + returnButton += ""; } //simon-add:打印此单,需要满足两个个条件:1.借物单已部分发货;2.借物单全部发货 if ((returnStatusArr[1] == returnStatus) ||( returnStatusArr[2] == returnStatus)){ - returnButton += ""; + returnButton += ""; } return inoviceButton + returnButton; Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.jsp =================================================================== diff -u -r36430 -r36689 --- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.jsp (.../borrowingTousseView.jsp) (revision 36430) +++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.jsp (.../borrowingTousseView.jsp) (revision 36689) @@ -72,6 +72,13 @@ //归还所有物品end +//归还物品start +var SSTS_borrow_returnTousse = true; + +SSTS_borrow_returnTousse = false; + +//归还物品end + //借物单审核start var SSTS_borrow_Review = true; Index: ssts-web/src/main/resources/systemset/operationDefine.xml =================================================================== diff -u -r36685 -r36689 --- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 36685) +++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 36689) @@ -76,6 +76,7 @@ +