Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js =================================================================== diff -u -r18189 -r18485 --- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js (.../qualitymonitoringInstanceView.js) (revision 18189) +++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js (.../qualitymonitoringInstanceView.js) (revision 18485) @@ -56,7 +56,7 @@ var columns = [ {header : "监测项",width : 200,dataIndex : 'name', renderer : modifyRecord}, {header : "登记人",width : 60,dataIndex : 'createUserName'}, - {header : "抽检时间",width : 120,dataIndex : 'createDate',renderer : myDateFormatByMinute}, + {header : "抽检时间",width : 120,dataIndex : 'dateTime',renderer : myDateFormatByMinute}, // {header : "条码",width : 100,dataIndex : 'barcode'}, // {header : "器械包名称",width : 120,dataIndex : 'tousseName'}, // {header : "材料名称",width : 120,dataIndex : 'material'}, @@ -76,6 +76,7 @@ {type:'string',dataIndex:'barcode'}, {type:'string',dataIndex:'tousseName'}, {type:'string',dataIndex:'material'}, + {type:'date',dataIndex:'dateTime'}, {type:'date',dataIndex:'createDate'}, {type:'string',dataIndex:'sterilizerName'}, {type:'string',dataIndex:'sterilizerFrequency'}, @@ -93,6 +94,7 @@ {name : 'material'}, {name : 'remark'}, {name : 'createUserName'}, + {name : 'dateTime'}, {name : 'createDate'}, {name : 'sterilizerName'}, {name : 'sterilizerFrequency'},