Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/urgentGoodsHintView.js
===================================================================
diff -u -r28320 -r31167
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/urgentGoodsHintView.js (.../urgentGoodsHintView.js) (revision 28320)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/urgentGoodsHintView.js (.../urgentGoodsHintView.js) (revision 31167)
@@ -114,14 +114,20 @@
},
height:200
});
-
- var window = new Ext.Window({
- autoHeight:true,
- width:500,
- draggable:true,
- items:[grid1, grid2]
+
+ var viewport = new Ext.Viewport( {
+ renderTo:'window',
+ layout: "border",
+ items: [{
+ region: "north",
+ height:150,
+ items:grid1
+ }, {
+ xtype: "panel",
+ region: "center",
+ items: grid2
+ }]
});
- window.show();
}
}
}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
===================================================================
diff -u -r31117 -r31167
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 31117)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 31167)
@@ -2037,10 +2037,11 @@
var voluntarilyUrgentItems = '${param.voluntarilyUrgentItems}';
if (voluntarilyUrgentItems) {
- var obj = new Object();
- obj.voluntarilyUrgentItems = voluntarilyUrgentItems;
var url = WWWROOT + "/disinfectsystem/recyclingApplication/urgentGoodsHintView.jsp";
- var temp = window.showModalDialog(url, obj, "dialogWidth=760px;dialogHeight=500px");
+ var params = {
+ voluntarilyUrgentItems:encodeURIComponent(voluntarilyUrgentItems)
+ }
+ var temp = openModalWindowForExt(url,params, '自动加急',550,345);
}
function ChangeRatio(type){
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/urgentGoodsHintView.jsp
===================================================================
diff -u -r29513 -r31167
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/urgentGoodsHintView.jsp (.../urgentGoodsHintView.jsp) (revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/urgentGoodsHintView.jsp (.../urgentGoodsHintView.jsp) (revision 31167)
@@ -9,14 +9,13 @@
急用物品视图列表
-
+