Index: ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.js =================================================================== diff -u -r26452 -r26865 --- ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.js (.../recyclingErrorView.js) (revision 26452) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.js (.../recyclingErrorView.js) (revision 26865) @@ -75,9 +75,9 @@ {header : "报失时间",width : 120,dataIndex : 'operationTime', renderer : myDateFormatByMinute}, {header : "补充数量",width : 80,dataIndex : 'additionalAmount'}, {header : "补充时间",width : 120,dataIndex : 'additionalTime', renderer : myDateFormatByMinute}, - {header : "清洗完成时间",width : 130,dataIndex : 'washTime'}, + {header : "清洗完成时间",width : 130,dataIndex : 'washTime',sortable: false,menuDisabled : true}, {header : "备注",width : 150,dataIndex : 'errorRemark'}, - {header : "清洗人",width : 120,dataIndex : 'washOperator'}, + {header : "清洗人",width : 120,dataIndex : 'washOperator',sortable: false,menuDisabled : true}, {id:'materialCost',header : "成本",width : 50,dataIndex : 'materialCost'} ]; @@ -137,6 +137,7 @@ columns : columns, plugins: filters, autoExpandColumn : 'materialCost', + searchDisableIndexes : ['washTime','washOperator'], renderTo : 'gridDiv', frame : false }, Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js =================================================================== diff -u -r26373 -r26865 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 26373) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js (.../sterilizationRecordView.js) (revision 26865) @@ -819,7 +819,7 @@ }else{ return null } - }}, + },sortable: false,menuDisabled : true}, {id : 'action',header : "操作",width : 70,dataIndex : 'status',renderer : actionFun} ]; @@ -1117,7 +1117,7 @@ isShowSearchField : true, columns : columns, plugins : filters, - searchDisableIndexes : [ 'sterilizerRecordAmount' ], + searchDisableIndexes : [ 'sterilizerRecordAmount','isExist'], autoExpandColumn : 'action', renderTo : 'gridDiv', frame : false, Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierCertificationWarningView.js =================================================================== diff -u -r23710 -r26865 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierCertificationWarningView.js (.../supplierCertificationWarningView.js) (revision 23710) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplier/supplierCertificationWarningView.js (.../supplierCertificationWarningView.js) (revision 26865) @@ -38,7 +38,7 @@ //********* 2、ForgonGrid *********** var columns = [ {header : "注册号",width : 400,dataIndex : 'certification',renderer : rendeColor}, - {header : "生产厂家",width : 300,dataIndex : 'supplierName'}, + {header : "生产厂家",width : 300,dataIndex : 'supplierName',sortable: false,menuDisabled : true}, {header : "类别",width : 200,dataIndex : 'type'}, {id : 'operationRemark',header : "有效期",width : 200,dataIndex : 'validityTime'} ]; @@ -100,6 +100,7 @@ isShowSearchField : true, columns : columns, autoExpandColumn : 'operationRemark', + searchDisableIndexes : ['supplierName'], renderTo : 'gridDiv', frame : false }, readerDetail,