Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js =================================================================== diff -u -r34154 -r34957 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js (.../tousseView.js) (revision 34154) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js (.../tousseView.js) (revision 34957) @@ -68,7 +68,7 @@ return false; } id = records[0].data['id']; - addAndEditTousse(id,records[0].data['isUploadVideo']); + addAndEditTousse(id,records[0].data['name']); }; @@ -254,7 +254,7 @@ hidden : SSTS_Tousse_Create, iconCls : 'btn_ext_application_add', handler : function() { - addAndEditTousse(0,'否'); + addAndEditTousse(0,''); } },{ text : '取消停用', Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js =================================================================== diff -u -r34912 -r34957 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 34912) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 34957) @@ -472,7 +472,7 @@ }); } -function addAndEditTousse(id, isUploadVideo) { +function addAndEditTousse(id, tousseName) { this.id = id; tousseDefinitionID = id; deleteErrorListString = ''; @@ -2868,10 +2868,15 @@ }); } + var title = '器械包信息'; + if((tousseName || '') !== ''){ + title = '【'+tousseName+'】包信息'; + } + tousseWin = new top.Ext.Window({ id: 'tousseWin', layout: 'fit', - title: '器械包信息', + title: title, width: fontSize == 12 ? 1200 : 1300, border: false, modal: true, Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/modifyList.js =================================================================== diff -u -r33301 -r34957 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/modifyList.js (.../modifyList.js) (revision 33301) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/modifyList.js (.../modifyList.js) (revision 34957) @@ -23,45 +23,45 @@ modifyRecordStore.load(); + var cm = new top.Ext.grid.ColumnModel([{ + header: '修改人', + dataIndex: 'modifyUserName', + width: 80, + menuDisabled: true + }, { + header: "修改时间", + dataIndex: 'modifyDateTime', + width: 100, + menuDisabled: true + }, { + header: "修改字段或内容", + dataIndex: 'modifyDetail', + width: 100, + menuDisabled: true + }, { + header: "修改类型", + dataIndex: 'modifyType', + width: 80, + menuDisabled: true + }, { + header: "原值", + dataIndex: 'oldValue', + width: 200, + menuDisabled: true + }, { + header: "新值", + dataIndex: 'newValue', + width: 200, + menuDisabled: true + }]) + var modifyRecordGrid = new top.Ext.grid.GridPanel({ id: 'modifyRecordGrid', - title: '器械包定义改动', + title: '包定义改动记录', store: modifyRecordStore, - columns: [{ - header: '修改人', - dataIndex: 'modifyUserName', - width: 100, - menuDisabled: true - }, { - header: "修改时间", - dataIndex: 'modifyDateTime', - width: 100, - menuDisabled: true - }, { - header: "修改字段或内容", - dataIndex: 'modifyDetail', - width: 100, - menuDisabled: true - }, { - header: "修改类型", - dataIndex: 'modifyType', - width: 100, - menuDisabled: true - }, { - header: "原值", - dataIndex: 'oldValue', - width: 100, - menuDisabled: true - }, { - header: "新值", - dataIndex: 'newValue', - width: 100, - menuDisabled: true - }], - viewConfig: { - forceFit: true - }, - autoExpandColumn: 'modifyField', + cm: cm, + viewConfig: { forceFit: true }, + autoExpandColumn: 'newValue', bodyStyle: 'border:1px solid #afd7af', anchor: '100%', frame: false