Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r35494 -r35540 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 35494) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 35540) @@ -1059,7 +1059,7 @@ returneeOfSupplier1:returneeOfSupplier, returnMan1:returnMan } - if(actionType == ACTION_TYPE_ADD || actionType == ACTION_TYPE_UPDATE){ + if(actionType == ACTION_TYPE_ADD || actionType == ACTION_TYPE_UPDATE || actionType == ACTION_TYPE_INTERFERE){ submitUrl = '/disinfectSystem/foreigntousseapplication/foreignTousseApplicationAction!saveForeignTousseApplication.do'; params.actionType = actionType; }else { Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp =================================================================== diff -u -r35469 -r35540 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 35469) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.jsp (.../foreignTousseApplicationView.jsp) (revision 35540) @@ -53,6 +53,8 @@ boolean has = operationManager.isCurrentUserHaveAnyOperation("SSTS_ForeignTousseApplication_ShowAll"); request.setAttribute("showAllForeignTousseApplicationPermission", has); request.setAttribute("TEMPLATE_NAME_PREFIX",LabelTemplate.TEMPLATE_NAME_PREFIX); + boolean isEnableTousseOpRecipient = sysParamsObj.getIsEnableTousseOpRecipient(); + boolean isEnableTousseOpDestLocation = sysParamsObj.getIsEnableTousseOpDestLocation(); %> @@ -144,6 +146,8 @@ var foreignToussePriceOfSysParams = '<%=pageContext.getAttribute("foreignToussePriceOfSysParams")%>'; var IMAGE_TYPE_TOUSSE = '<%=ImageFile.IMAGE_TYPE_TOUSSE %>';//器械包图片,查看图片用的参数 var profile = '${profile}'; + var isEnableTousseOpDestLocation = '<%=isEnableTousseOpDestLocation%>'; + var isEnableTousseOpRecipient = '<%=isEnableTousseOpRecipient%>'; <%@ include file="/disinfectsystem/print/print.jsp"%> Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp =================================================================== diff -u -r35104 -r35540 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp (.../interfereForeignTousseApplicationView.jsp) (revision 35104) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.jsp (.../interfereForeignTousseApplicationView.jsp) (revision 35540) @@ -18,6 +18,7 @@ <%@ include file="/common/includeExtJsAndCss.jsp"%> <%@ include file="/common/includeExtJs4_2.jsp"%>