Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java =================================================================== diff -u -r13940 -r14055 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 13940) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java (.../InvoiceAction.java) (revision 14055) @@ -826,6 +826,7 @@ obj.put("startDate", record.getStartDateStr()); obj.put("endDate", record.getEndDateStr()); obj.put("washBasket", basket.getContainerName()); + obj.put("personInCharge", basket.getPersonInCharge()); basketJsons.add(obj); } } Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js =================================================================== diff -u -r13559 -r14055 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 13559) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js (.../tousseInstanceInfoTab.js) (revision 14055) @@ -4,15 +4,16 @@ {name : 'washOperator'}, {name : 'startDate'}, {name : 'endDate'}, - {name : 'washBasket'} + {name : 'washBasket'}, + {name : 'personInCharge'} ]); function tousseInstanceInfoShow(id,tousseName,hidden){ var tabsItemArr = new Array(); tabsItemArr.push({ title: '清洗记录', - layout : 'fit', +// layout : 'fit', items:[ new top.Ext.grid.GridPanel({ id : 'washRecord', @@ -24,24 +25,28 @@ {name : 'washOperator'}, {name : 'startDate'}, {name : 'endDate'}, - {name : 'washBasket'} + {name : 'washBasket'}, + {name : 'personInCharge'} ] }) }), cm : new Ext.grid.ColumnModel([ - {header : "清洗机名称",dataIndex : 'disinfectIdentification',width : 70, menuDisabled: true}, + {header : "清洗机名称",dataIndex : 'disinfectIdentification',width : 150, menuDisabled: true}, {header : "清洗程序",dataIndex : 'disinfectProgram',width : 60, menuDisabled: true}, - {header : "清洗篮筐",dataIndex : 'washBasket',width : 80, menuDisabled: true}, - {header : "操作员",dataIndex : 'washOperator',width : 40, menuDisabled: true}, - {header : "开始时间",dataIndex : 'startDate',width : 105, menuDisabled: true,renderer : myDateFormatBySecond}, - {id : 'endDate',header : "结束时间",dataIndex : 'endDate',width : 105, menuDisabled: true,renderer : myDateFormatBySecond} + {header : "清洗篮筐",dataIndex : 'washBasket',width : 120, menuDisabled: true}, + {header : "操作员",dataIndex : 'washOperator',width : 70, menuDisabled: true}, + {header : "责任人",dataIndex : 'personInCharge',width : 70, menuDisabled: true}, + {header : "开始时间",dataIndex : 'startDate',width : 160, menuDisabled: true,renderer : myDateFormatBySecond}, + {id : 'endDate',header : "结束时间",dataIndex : 'endDate',width : 160, menuDisabled: true,renderer : myDateFormatBySecond} ]), enableHdMenu : false, - width : 354, - height :385, + width : 900, +// height :385, + autoHeight : true, autoExpandColumn : 'endDate', frame : false, - bodyStyle : 'border:1px solid #afd7af', +// autoScroll : true, +// bodyStyle : 'border:1px solid #afd7af;overflow-y:auto;overflow-x:hidden;', viewConfig: { forceFit:true } @@ -637,14 +642,17 @@ var startDate = jsonItem.startDate; var endDate = jsonItem.endDate; var washBasket = jsonItem.washBasket; + var personInCharge = jsonItem.personInCharge; + if(disinfectIdentification != null && disinfectIdentification != ""){ var WashRecordData = new WashRecord({ disinfectIdentification : disinfectIdentification, disinfectProgram : disinfectProgram, washOperator : washOperator, startDate : startDate, endDate : endDate, - washBasket : washBasket + washBasket : washBasket, + personInCharge : personInCharge }); top.Ext.getCmp('washRecord').getStore().add(WashRecordData); }