Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp
===================================================================
diff -u -r27425 -r27662
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp (.../supplyRoomTypeView.jsp) (revision 27425)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp (.../supplyRoomTypeView.jsp) (revision 27662)
@@ -23,6 +23,9 @@
.x-form-field-wrap {
width: auto !important
}
+ fieldset {
+ margin-bottom: 10px !important;
+ }
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js
===================================================================
diff -u -r25765 -r27662
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 25765)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.js (.../diposableGoodsView.js) (revision 27662)
@@ -687,20 +687,20 @@
new top.Ext.grid.GridPanel({
id :'batchNumberGrid',
store : godownEntryItemStore ,
- height : 425,
- width : 630,
+ autoHeight: true,
+ width : 680,
bodyStyle : 'border:1px solid #afd7af',
sm : selectModel,
cm : new top.Ext.grid.ColumnModel([selectModel,
{header : "id",dataIndex : 'id',hidden : true},
{header : "条码",width : 80,dataIndex : 'barcode',menuDisabled:true},
{header : "批次",width : 80,dataIndex : 'batchNumber',menuDisabled:true},
- {header : "价格",width : 50,dataIndex : 'cost',menuDisabled:true},
+ {header : "价格",width : 60,dataIndex : 'cost',menuDisabled:true},
{header : "失效期",width : 90,dataIndex : 'expDate',renderer:myDateFormat,menuDisabled:true},
{header : "灭菌批号",width : 90,dataIndex : 'sterileBatchNumber'},
{header : "是否打印",width : 70,dataIndex : 'hasPrinted',menuDisabled:true},
{header : "打印时间",width : 90,dataIndex : 'printTime',renderer:myDateFormat,menuDisabled:true},
- {id:'supplierName',header : "供应商",width : 130,dataIndex : 'supplierName',menuDisabled:true}
+ {id:'supplierName',header : "供应商",width : 170,dataIndex : 'supplierName',menuDisabled:true}
]),
autoExpandColumn : 'supplierName',
frame : false,
@@ -847,7 +847,7 @@
id : 'diposableGoodsWin',
layout : 'fit',
title : '一次性物品信息',
- width : 980,
+ width : 1080,
// height : 620,
height : top.screen.height > 800 ? 660 : 500,
modal : true,
Index: ssts-web/src/main/webapp/log/loggrid.js
===================================================================
diff -u -r23113 -r27662
--- ssts-web/src/main/webapp/log/loggrid.js (.../loggrid.js) (revision 23113)
+++ ssts-web/src/main/webapp/log/loggrid.js (.../loggrid.js) (revision 27662)
@@ -225,52 +225,117 @@
iconCls: 'icon_set',
handler: resetSearchCondition
};
-
- var tbar= [
- deleteAllPart,
- '-',
- deletePart,
- {text: '功能模块:'},
- modelPart,
- {text: '开始日期:'},
- startDatePart,
- {text: '结束日期:'},
- endDatePart,
- {text: '用户姓名:'},
- userNamePart,
- {text: '操作描述:'},
- operationDescriptionPart,
- {text: '操作类型:'},
- operationType,
- queryButton,
- resetButton
- ];
+ var tbar,tbar1_array,tbar2_array;
+ if(window.screen.width < 1280){
+ tbar= [
+ deleteAllPart,
+ '-',
+ deletePart,
+ {text: '功能模块:'},
+ modelPart,
+ {text: '开始日期:'},
+ startDatePart,
+ {text: '结束日期:'},
+ endDatePart,
+ {text: '用户姓名:'},
+ userNamePart
+ ];
+ tbar1_array = [
+ {text: '操作描述:'},
+ operationDescriptionPart,
+ {text: '操作类型:'},
+ operationType,
+ queryButton,
+ resetButton
+ ];
+ tbar2_array = ["租用编号：",'-','租户：','-'];
+ }else if(window.screen.width >= 1280 && window.screen.width <= 1440){
+ tbar= [
+ deleteAllPart,
+ '-',
+ deletePart,
+ {text: '功能模块:'},
+ modelPart,
+ {text: '开始日期:'},
+ startDatePart,
+ {text: '结束日期:'},
+ endDatePart,
+ {text: '用户姓名:'},
+ userNamePart,
+ {text: '操作描述:'},
+ operationDescriptionPart
+ ];
+ tbar1_array = [
+ {text: '操作类型:'},
+ operationType,
+ queryButton,
+ resetButton
+ ];
+ tbar2_array = ["租用编号：",'-','租户：','-'];
+ }else {
+ tbar= [
+ deleteAllPart,
+ '-',
+ deletePart,
+ {text: '功能模块:'},
+ modelPart,
+ {text: '开始日期:'},
+ startDatePart,
+ {text: '结束日期:'},
+ endDatePart,
+ {text: '用户姓名:'},
+ userNamePart,
+ {text: '操作描述:'},
+ operationDescriptionPart,
+ {text: '操作类型:'},
+ operationType,
+ queryButton,
+ resetButton
+ ];
+ tbar1_array = [];
+ tbar2_array = ["租用编号：",'-','租户：','-'];
+ }
var dwrCallParams = null;
//所有grid之外的参数用这个方法传入,返回的是Map>
Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function(){
};
- grid = new Ext.ux.ForgonPageGrid(
- {title:entityName+'列表',tbar:tbar,pageSize:30,id : 'logGrid',
- defaultSortField:'id',defaultSortDirection:'DESC',
- isCheckboxSelectionModel:true,
- isShowRowNumber:true,
- rememberSelected:false,
- isShowSearchField:false,
- layout:'fit',
- plugins: filters, columns: columns,autoExpandColumn: 'operationDescription',frame:false},
- readerDetail,
- LogTableManager.findLogs,
- dwrCallParams //这个参数只是占位作用
- );
-
- var viewport = new Ext.Viewport({
- layout : 'fit',
- items : grid
- });
+ grid = new Ext.ux.ForgonPageGrid({
+ title:entityName+'列表',
+ tbar:tbar,
+ listeners:{
+ 'render':function(){
+ if(tbar1_array.length > 0){
+ var tbar=new Ext.Toolbar({
+ items:tbar1_array
+ });
+ tbar.render(this.tbar);
+ }
+ var tbar2=new Ext.Toolbar({
+ items:tbar2_array
+ });
+ tbar2.render(this.tbar);
+ }
+ },pageSize:30,id : 'logGrid',
+ defaultSortField:'id',defaultSortDirection:'DESC',
+ isCheckboxSelectionModel:true,
+ isShowRowNumber:true,
+ rememberSelected:false,
+ isShowSearchField:false,
+ layout:'fit',
+ plugins: filters, columns: columns,autoExpandColumn: 'operationDescription',frame:false},
+ readerDetail,
+ LogTableManager.findLogs,
+ dwrCallParams //这个参数只是占位作用
+ );
+ var viewport = new Ext.Viewport({
+ layout : 'fit',
+ items : grid
+ });
+
setTimeout(function(){
//Ext.get('loading').remove();
//Ext.get('loading-mask').fadeOut({remove:true});
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r27649 -r27662
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 27649)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 27662)
@@ -9,8 +9,6 @@
var supplyRoomStoreExpensiveGoods;
var sterilingTypeStore;
var packageTypeStore;
-var configWinHeight = top.screen.height > 1000 ? 700 : 600;
-var configWinWidth = top.screen.width > 1280 ? 1920 : 1500;
extCompOperationUtil.setExtObj(Ext);
gridOperation = extCompOperationUtil.getGridOperation();
motionObj = extCompOperationUtil.getMotionObj();
@@ -643,16 +641,16 @@
});
var tabsItemArr = new Array();
-
+ var itemWidth = (document.body.offsetWidth>1400)?document.body.offsetWidth-60:1420;
tabsItemArr.push({
title: '系统参数设置',
autoScroll : true,
items:[
new Ext.Panel({
frame : true,
- width : configWinWidth,
- height : configWinHeight,
+ width : document.body.offsetWidth-20,
+ height : document.body.offsetHeight-90,
autoScroll : true,
layout :'column',
labelAlign:'right',
@@ -704,7 +702,7 @@
xtype : "fieldset",
title : '系统参数设置',
layout:'column',
- width : 1400,
+ width : itemWidth,
height : fontSize == 12 ? 135 : 150,
// columnWidth : 1,
labelWidth : 95,
@@ -1161,7 +1159,7 @@
xtype : "fieldset",
title : '合并申请单设置',
layout:'column',
- width : 1400,
+ width : itemWidth,
height: 100,
// columnWidth : 1,
labelWidth : 95,
@@ -1309,7 +1307,7 @@
xtype : "fieldset",
title : '价格参数设置',
layout:'column',
- width : 1400,
+ width : itemWidth,
height: 100,
// columnWidth : 1,
labelWidth : 95,
@@ -1427,7 +1425,7 @@
xtype : "fieldset",
title : '外来器械参数设置',
layout:'column',
- width : 1400,
+ width : itemWidth,
height:130,
// columnWidth : 1,
labelWidth : 95,
@@ -1716,7 +1714,7 @@
xtype : "fieldset",
title : '自定义器械参数设置',
layout:'column',
- width : 1400,
+ width : itemWidth,
height: 80,
// columnWidth : 1,
labelWidth : 95,
@@ -1895,7 +1893,7 @@
xtype : "fieldset",
title : '发货参数设置',
layout:'column',
- width : 1400,
+ width : itemWidth,
height:120,
// columnWidth : 1,
labelWidth : 95,
@@ -2883,7 +2881,6 @@
]
});
}
-
var tabs = new Ext.TabPanel({
activeTab: 0,
width:document.body.offsetWidth-10,
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js
===================================================================
diff -u -r27653 -r27662
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js (.../invoiceQueryView.js) (revision 27653)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/invoiceQueryView.js (.../invoiceQueryView.js) (revision 27662)
@@ -193,10 +193,9 @@
border : 0,
frame : true,
bodyStyle : 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px;
- height : 205,
+ height : 220,
items : [{
layout : 'column',
- width: 800,
items : [{
columnWidth : .33,
layout : 'form',
@@ -379,6 +378,7 @@
columnWidth : .33,
layout : 'form',
labelWidth : 95,
+ id:'formItem',
items : [{
xtype : 'combo',
id : 'settleDepartSearch',