Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp =================================================================== diff -u -r35475 -r35914 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 35475) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 35914) @@ -94,6 +94,7 @@ } } request.setAttribute("isCssdUser", isCssdUser); + boolean isEnableTousseOpDestLocation = sysParamsObj.getIsEnableTousseOpDestLocation(); %> @@ -527,6 +528,7 @@ var imageTypeCameraApplication = '<%=ImageFile.IMAGE_TYPE_CAMERA_APPLICATION%>'; //视频类型(申请采集视频) var videoType = '<%=VideoFile.VIDEO_TYPE_CAMERA_APPLICATION%>'; +var isEnableTousseOpDestLocation = '<%=isEnableTousseOpDestLocation%>'; <%--多选下拉框--%> Index: ssts-web/src/main/webapp/ext/fontSize15/styles/common.css =================================================================== diff -u -r35824 -r35914 --- ssts-web/src/main/webapp/ext/fontSize15/styles/common.css (.../common.css) (revision 35824) +++ ssts-web/src/main/webapp/ext/fontSize15/styles/common.css (.../common.css) (revision 35914) @@ -268,7 +268,9 @@ .btn_ext_add { background-image:url( ../resources/images/default/dd/drop-add.gif ) !important; } - +.btn_ext_delete { + background-image:url( ../resources/images/default/dd/btn_delete.gif ) !important; +} .btn_ext_edit { background-image:url( ../../../images/edit.gif ) !important; } @@ -441,6 +443,14 @@ cursor: default; } +#foreignTousseApplicationWin { + z-index: 7500 !important; +} + +.x4-css-shadow,.x4-ie-shadow { + z-index: 7500 !important; +} + /* ZSYY-280：按钮背景样式*/ #tousseFormInfo .x-panel-footer, #signBoardID .x-panel-footer { background: transparent url(../resources/images/default/panel/top-bottom.gif) repeat-x 0 bottom; @@ -486,4 +496,10 @@ .storageRowClass { background: red !important; color: #fff !important; +} + +/* GDSRMYY-552：打印机设置内容区显示竖滚动条*/ +#printerSettingBox-body { + overflow-y: auto !important; + overflow-x: hidden; } \ No newline at end of file