Index: ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.js =================================================================== diff -u -r22409 -r22419 --- ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.js (.../workFlowApprovalTaskRecord.js) (revision 22409) +++ ssts-web/src/main/webapp/systemmanage/workFlow/workFlowApprovalTaskRecord.js (.../workFlowApprovalTaskRecord.js) (revision 22419) @@ -142,7 +142,7 @@ },{ header: '创建任务时间',dataIndex: 'createTaskTime',width: 250,filterable: true,filter: {type: 'date'},renderer: rendererTransitionTime },{ - header: '响应时间',dataIndex: 'createTaskTime',width: 250,filterable: true,filter: {type: 'string'},renderer: rendererResponseTime + header: '响应时间',dataIndex: 'responseTime',width: 250,filter: {type: 'string'},renderer: rendererResponseTime }] }); return approvalRecordGrid; Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js =================================================================== diff -u -r22417 -r22419 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js (.../expensiveGoodsApplicationForm.js) (revision 22417) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js (.../expensiveGoodsApplicationForm.js) (revision 22419) @@ -330,7 +330,7 @@ title: '基本信息', layout: 'column', width: '100%', - height: 195, + height: 160, items: [{ xtype : 'textfield', fieldLabel : '流水号', @@ -339,9 +339,11 @@ name : 'serialNumber', allowBlank : true, readOnly : true, + columnWidth: .25, fieldCls : 'fieldReadOnlyNoRemoveAndTop' },{ xtype : 'textfield', + columnWidth: .25, fieldLabel : '申请人', maxLength : '255', id : 'applicant', @@ -351,6 +353,7 @@ fieldCls : 'fieldReadOnlyNoRemoveAndTop' },{ xtype : 'textfield', + columnWidth: .25, fieldLabel : '时间', id : 'applicationTimeStr', name : 'applicationTimeStr', @@ -360,6 +363,7 @@ },{ xtype : 'combo', fieldLabel: '申请科室', + columnWidth: .25, id : 'department', name : 'department', valueField : 'departmentCode', @@ -414,6 +418,7 @@ hideTrigger : true, typeAhead : false, allowBlank : false, + columnWidth: .25, listeners: { focus : function(thiz){ thiz.selectText(); @@ -441,6 +446,7 @@ triggerAction : 'all', hideTrigger : true, allowBlank : false, + columnWidth: .25, listeners: { focus : function(thiz){ thiz.selectText(); @@ -458,6 +464,7 @@ id : 'hospitalNumber', name : 'hospitalNumber', enableKeyEvents : true, + columnWidth: .25, listeners : { specialkey : function(field, ee) { if (ee.getKey() == top.Ext4.EventObject.ENTER) { @@ -474,6 +481,7 @@ id : 'clinicNumber', name : 'clinicNumber', enableKeyEvents : true, + columnWidth: .25, listeners : { specialkey : function(field, ee) { if (ee.getKey() == top.Ext4.EventObject.ENTER) { @@ -489,13 +497,15 @@ fieldLabel : '病人姓名', id : 'patient', name : 'patient', + columnWidth: .25, readOnly : notAllowChanges },{ xtype : 'textfield', fieldLabel : '病区', maxLength : '50', id : 'patientArea', name : 'patientArea', + columnWidth: .25, readOnly : notAllowChanges },{ xtype : 'textfield', @@ -504,6 +514,7 @@ id : 'roomNumber', name : 'roomNumber', hidden : sstsConfig.hideRoomNumber, + columnWidth: .25, readOnly : notAllowChanges },{ xtype : 'textfield', @@ -512,6 +523,7 @@ id : 'bedNumber', name : 'bedNumber', hidden : sstsConfig.hideRoomNumber, + columnWidth: .25, readOnly : notAllowChanges },{ xtype : 'numberfield', @@ -522,6 +534,7 @@ minValue: 1, allowNegative : false, allowDecimals : false, + columnWidth: .25, readOnly: notAllowChanges },{ xtype : 'combo', @@ -534,6 +547,7 @@ triggerAction : 'all', forceSelection : true, editable : false, + columnWidth: .25, store : new top.Ext4.data.SimpleStore({ fields : ['typeName'], data : [['男'],['女']] @@ -545,12 +559,14 @@ maxLength : '16', id : 'ascriptionDepartment', name : 'ascriptionDepartment', + columnWidth: .25, readOnly : notAllowChanges },{ xtype : 'textfield', fieldLabel : '手术名称', id : 'surgery', name : 'surgery', + columnWidth: .25, readOnly : notAllowChanges },{ xtype : 'datefield', @@ -559,6 +575,7 @@ name : 'operationTime', selectOnFocus :true, format : 'Y-m-d H:i', + columnWidth: .25, readOnly : notAllowChanges },{ fieldLabel : '医生', @@ -575,32 +592,36 @@ hideTrigger : false, typeAhead : false, allowBlank : true, + columnWidth: .25, store : commonlyUsedDoctorJsonStore, readOnly : notAllowChanges },{ xtype : 'textfield', fieldLabel : '手术间', id : 'operationRoom', name : 'operationRoom', + columnWidth: .25, readOnly : notAllowChanges },{ xtype : 'textfield', fieldLabel : '外来器械包名称', id : 'foreignTousseName', name : 'foreignTousseName', + columnWidth: .25, readOnly : notAllowChanges },{ xtype : 'textfield', - width: 760, + //width: 760, fieldLabel : '备注', id : 'remark', name : 'remark', + columnWidth: 1, readOnly : notAllowChanges }] },{ xtype: 'container', width: '100%', - height: 170, + height: 165, layout: 'fit', items: { xtype : 'tree-grid', @@ -735,7 +756,7 @@ },{ xtype: 'container', width: '100%', - height: 200, + height: 190, layout: 'fit', items: createWorkFlowApprovalTaskGrid(id) }],