Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp
===================================================================
diff -u -r31828 -r31891
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp (.../invoiceView.jsp) (revision 31828)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.jsp (.../invoiceView.jsp) (revision 31891)
@@ -125,6 +125,7 @@
+
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r31838 -r31891
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 31838)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js (.../invoiceView.js) (revision 31891)
@@ -2294,6 +2294,9 @@
document.getElementById('invoiceDepartGroup').value ='';
document.getElementById('parm_s_selectedDepartCodes').value ='';
+
+ document.getElementById('tousseGroupName').value ='';
+ document.getElementById('parm_s_selectedTousseGroupID').value ='';
document.getElementById('parm_s_startTime').value ='';
document.getElementById('parm_s_endTime').value ='';
@@ -2536,6 +2539,11 @@
departGroupStore.insert(0, record);
});
+
+ var tousseGroupStore = new Ext.data.JsonStore({
+ fields : [ 'tousseGroupName','id' ],
+ url : WWWROOT + '/disinfectSystem/baseData/tousseGroupAction!getAllTousseGroup.do'
+ });
var columns = [
{header : "流水号",width : 100,dataIndex : 'serialNumber',renderer : renderCallModifyFunction},
@@ -2698,6 +2706,27 @@
}
},
anchor : '95%'
+ },{
+ text : '器械包分组:'
+ },{
+ xtype : 'combo',
+ id : 'tousseGroupName',
+ name : 'tousseGroupName',
+ valueField : 'id',
+ displayField : 'tousseGroupName',
+ allowBlank : false,
+ editable : false,
+ emptyText:'请选择器械包分组',
+ width : 120,
+ store : tousseGroupStore,
+ forceSelection : true,
+ triggerAction : 'all',
+ listeners : {
+ select : function(combo, record, index){
+ reloadConditionPara(combo.getValue(), 'parm_s_selectedTousseGroupID');
+ }
+ },
+ anchor : '95%'
}, {
text : '一次性物品类型:',
hidden : !sstsConfig.invoicePlanExtractedView_showDisposableGoodsType