Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js =================================================================== diff -u -r40302 -r40597 --- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 40302) +++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 40597) @@ -787,6 +787,31 @@ var packingRecordId = record.get('id'); rePrintBarcodeWinForPacking(packingRecordId,SSTS_HistoryPacking_Update,SSTS_HistoryPacking_Change_Patient); }); + + var urgentLevelItems = Ext.data.Record.create([ + { name: 'id', type: 'string' }, + { name: 'urgentLevel', type: 'string' } + ]); + + var urgentLevelStore = new top.Ext.data.Store({ + proxy : new top.Ext.data.HttpProxy({ + url : WWWROOT + '/disinfectSystem/baseData/urgentLevelAction!getUrgentsForSelect.do', + method : "POST" + }), + reader: new Ext.data.JsonReader({ + root: 'data' + },[ + {name: 'id'}, + {name: 'urgentLevel'} + ]), + listeners : { + load : function(thiz,records,options){ + urgentLevelStore.insert(0, new urgentLevelItems({ 'id': 0, 'urgentLevel': '空值' })); + } + } + }); + urgentLevelStore.load() + var formObj = new Ext.form.FormPanel({ labelAlign : 'right', buttonAlign : 'center', @@ -1437,6 +1462,37 @@ } } }] + },{ + columnWidth : .33, + layout : 'form', + cls:'edit-5char-labelwidth', + hidden : !sstsConfig.enableSetUrgentOfPackin, + items : [{ + xtype:'hidden', + id : 'urgentLevelId', + name : 'urgentLevelId' + },{ + xtype : 'combo', + fieldLabel : '加急等级', + id : 'urgentLevelName', + name : 'urgentLevelName', + store : urgentLevelStore, + valueField : 'urgentLevel', + displayField : 'urgentLevel', + minChars : 0, + forceSelection : true, + lazyInit : true, + editable:false, + triggerAction : 'all', + anchor : '100%', + typeAhead : false, + listeners:{ + select : function(combo, record, index){ + //首尾条码全部清空,且让首条码得到焦点 + Ext.getCmp('urgentLevelId').setValue(record.data.id); + } + } + }] }], buttons : [{ text : '装配并打印标签',