Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r26835 -r27030 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 26835) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 27030) @@ -2788,6 +2788,23 @@ } /** + * 判断某个对象是否存在于数组中 + * @param obj 对象 + * @param array 元素 + */ +function existsObjInArray(obj, array) { + if(!obj || !array || array.length == 0){ + return false; + } + for(var i = 0;i < array.length;i++){ + if(array[i] == obj){ + return true; + } + } + return false; +} + +/** * 验证ext的form表单(暂时没有地方调用) * 仅验证表单内的可见元素(文本框、数字筐、文本域、日历控件、下拉筐等)是否有效(是否符合不允许为空、是否超出最小值与最大值的范围内) * @param formPanel Index: ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/config.js =================================================================== diff -u -r22653 -r27030 --- ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/config.js (.../config.js) (revision 22653) +++ ssts-web/src/main/webapp/disinfectsystem/config/hdqrmyy/config.js (.../config.js) (revision 27030) @@ -79,5 +79,7 @@ //回收时,申请数量与回收数量不一致,是否要确认 confirmRecyclingAmount:false, //只有装配完成才能使用清洗篮筐回收 - recycleClassifyBasketAfterPacked:false + recycleClassifyBasketAfterPacked:false, + //使用记录页面隐藏列名配置,如数组值为:['状态','身份证号码'],代表要隐藏状态和身份证号码这2列 + hiddenColumnsOfUseRecordListView:['状态'] } \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js =================================================================== diff -u -r26838 -r27030 --- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js (.../useRecordView.js) (revision 26838) +++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js (.../useRecordView.js) (revision 27030) @@ -708,19 +708,35 @@ dismissDelay: 0, showDelay: 0 }); - - // 记录cookie(3步) + //隐藏列名 + var hiddenColumnsOfUseRecordListView = sstsConfig.hiddenColumnsOfUseRecordListView; + var patientNameColumnHeader = "病人"; + var statusColumnHeader = "状态"; + var hospitalNumColumnHeader = "住院号"; + var treatmentNumColumnHeader = "诊疗号"; + var operationRoomColumnHeader = "手术间"; + var patientAgeColumnHeader = "年龄"; + var patientIDCardColumnHeader = "身份证号码"; + var doctorNameColumnHeader = "医生"; + var operationColumnHeader = "手术名称"; + var recyclingStatusColumnHeader = "回收状态"; + var operatorColumnHeader = "录入人"; + var departColumnHeader = "录入科室"; + var enteringDateColumnHeader = "录入时间"; + var applicationTimeColumnHeader = "申请时间"; + var remarkColumnHeader = "备注"; + var columns = [ - {header : "病人",width : 70,dataIndex : 'patientName',renderer : renderCallModifyFunction}, - {header : "状态",width : 50,dataIndex : 'status',renderer : rendererColor}, - {header : "住院号",width : 90,dataIndex : 'hospitalNum',renderer : renderCallModifyFunction}, - {header : "诊疗号",width : 90,dataIndex : 'treatmentNum',renderer : renderCallModifyFunction}, - {header : "手术间",width : 90,dataIndex : 'operationRoom',renderer : renderCallModifyFunction}, - {header : "年龄",width : 40,dataIndex : 'patientAge'}, - {header : "身份证号码",width : 120,dataIndex : 'patientIDCard'}, - {header : "医生",width : 70,dataIndex : 'doctorName'}, - {header : "手术名称",width : 150,dataIndex : 'operation'}, + {header : patientNameColumnHeader,width : 70,dataIndex : 'patientName',hidden:existsObjInArray(patientNameColumnHeader,hiddenColumnsOfUseRecordListView),renderer : renderCallModifyFunction}, + {header : statusColumnHeader,width : 50,dataIndex : 'status',hidden:existsObjInArray(statusColumnHeader,hiddenColumnsOfUseRecordListView),renderer : rendererColor}, + {header : hospitalNumColumnHeader,width : 90,dataIndex : 'hospitalNum',hidden:existsObjInArray(hospitalNumColumnHeader,hiddenColumnsOfUseRecordListView),renderer : renderCallModifyFunction}, + {header : treatmentNumColumnHeader,width : 90,dataIndex : 'treatmentNum',hidden:existsObjInArray(treatmentNumColumnHeader,hiddenColumnsOfUseRecordListView),renderer : renderCallModifyFunction}, + {header : operationRoomColumnHeader,width : 90,dataIndex : 'operationRoom',hidden:existsObjInArray(operationRoomColumnHeader,hiddenColumnsOfUseRecordListView),renderer : renderCallModifyFunction}, + {header : patientAgeColumnHeader,width : 40,dataIndex : 'patientAge',hidden:existsObjInArray(patientAgeColumnHeader,hiddenColumnsOfUseRecordListView)}, + {header : patientIDCardColumnHeader,width : 120,dataIndex : 'patientIDCard',hidden:existsObjInArray(patientIDCardColumnHeader,hiddenColumnsOfUseRecordListView)}, + {header : doctorNameColumnHeader,width : 70,dataIndex : 'doctorName',hidden:existsObjInArray(doctorNameColumnHeader,hiddenColumnsOfUseRecordListView)}, + {header : operationColumnHeader,width : 150,dataIndex : 'operation',hidden:existsObjInArray(operationColumnHeader,hiddenColumnsOfUseRecordListView)}, {header : "回收状态",width : 150,dataIndex : 'recyclingStatus',hidden:sstsConfig.monitorGoodsRecyclingStatusForUseRecord ? false :true,renderer:function(v , p , rec){ //SZSZLYY-31 使用记录监控回收状态功能优化 if(v == awaitRecycle){ @@ -734,11 +750,11 @@ } }}, {header : "优先转换状态",width : 150,dataIndex : 'priorConvertStatus',hidden:sstsConfig.enablePriorConvertApplyGoods ? false :true}, - {header : "录入人",width : 60,dataIndex : 'operator'}, - {header : "录入科室",width : 80,dataIndex : 'depart'}, - {header : "录入时间",width : 120,dataIndex : 'enteringDate',renderer : myDateFormatByMinute}, - {header : "申请时间",width : 120,dataIndex : 'applicationTime',renderer : myDateFormatByMinute}, - {header : "备注",width : 120,dataIndex : 'remark',id : 'autoWidth'} + {header : operatorColumnHeader,width : 60,dataIndex : 'operator',hidden:existsObjInArray(operatorColumnHeader,hiddenColumnsOfUseRecordListView)}, + {header : departColumnHeader,width : 80,dataIndex : 'depart',hidden:existsObjInArray(departColumnHeader,hiddenColumnsOfUseRecordListView)}, + {header : enteringDateColumnHeader,width : 120,dataIndex : 'enteringDate',hidden:existsObjInArray(enteringDateColumnHeader,hiddenColumnsOfUseRecordListView),renderer : myDateFormatByMinute}, + {header : applicationTimeColumnHeader,width : 120,dataIndex : 'applicationTime',hidden:existsObjInArray(applicationTimeColumnHeader,hiddenColumnsOfUseRecordListView),renderer : myDateFormatByMinute}, + {header : remarkColumnHeader,width : 120,dataIndex : 'remark',id : 'autoWidth',hidden:existsObjInArray(remarkColumnHeader,hiddenColumnsOfUseRecordListView)} ]; var filters = new Ext.grid.GridFilters({