Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/tousseModal.jsp =================================================================== diff -u -r24999 -r25017 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/tousseModal.jsp (.../tousseModal.jsp) (revision 24999) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/tousseModal.jsp (.../tousseModal.jsp) (revision 25017) @@ -46,8 +46,6 @@ - -
@@ -109,19 +107,13 @@
- +
- - -
- +
@@ -136,8 +128,6 @@
- - @@ -405,10 +395,7 @@ - - @@ -581,87 +568,57 @@ - - - - - - - - - - - - - - - - <%-- bootstrap-datetimepicker --%> + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - -<%-- -<%-- --%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - \ No newline at end of file Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationForm.js =================================================================== diff -u -r25015 -r25017 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 25015) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationForm.js (.../goodsApplicationForm.js) (revision 25017) @@ -93,7 +93,7 @@ $('#menu_recyclingApplication_content iframe',parent.document).contents().find("#app_disposable").on('click',function(){ $("#tousseAppForm").s_validate('destroy'); // FormCpt.switchApp("tousseApplicationContent"); - showApp("tousseApplicationContent") + showApp("tousseApplicationContent"); $("#tousseAppPrintPreview,#tousseAppPrint,#tousseAppReturnEdit,#tousseAppEndTousse").each(function(){//“打印预览”、“打印”等按钮隐藏 toggleShow(this,1); }); @@ -149,9 +149,10 @@ }}); }); - + //“添加物品”按钮 $("#tousseAdd").click(function(){ + var tousseName_tousse_select=$("#tousseName_tousse_select"); var tousseName_tousse_number=$("#tousseName_tousse_number"); var name=tousseName_tousse_select.text(); @@ -315,7 +316,7 @@ $("#tousseAppPrintPreview,#tousseAppPrint,#tousseAppReturnEdit,#tousseAppEndTousse").each(function(){ toggleShow(this,2); }); - if( $("#tousseName_tousse_number").length < 1 ){ + if( $("#tousseName_tousse_num").length < 1 ){ $("#tousseName_tousse_num").spinner({id:'tousseName_tousse_number'}); } @@ -596,10 +597,6 @@ }); } - //清空table - for(var i=0;i