Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r15973 -r15980
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 15973)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 15980)
@@ -3752,11 +3752,12 @@
}
}];
- //如果没有配置版本2且是全部申请单,则默认状态是显示全部申请单,省医(省医才有版本2)不管是普通申请单还是全部申请单,默认状态都是未完成
- if (recyclingApplicationVersion != 2 && listType == 'all'){
- document.getElementById("parm_s_status").value = 'all';
+ // 省医要求:如果是科室申领,默认申请单是未提交状态(省医才有版本2)
+ if (recyclingApplicationVersion == 2 && listType != 'all'){
+ document.getElementById("parm_s_status").value = 'unFinish';
}
+
//如果不是用版本2或者是在高级视图的全部申请单打开或者不是临床科室则按原来的显示
if (recyclingApplicationVersion != 2 || listType == 'all' || isCssdUser == "true"){
grid = new Ext.ux.ForgonPageGrid({
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r15952 -r15980
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 15952)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 15980)
@@ -440,7 +440,7 @@
-
+