Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js =================================================================== diff -u -r27549 -r28486 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js (.../interfereForeignTousseApplicationForm.js) (revision 27549) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationForm.js (.../interfereForeignTousseApplicationForm.js) (revision 28486) @@ -13,6 +13,8 @@ var tempforeignTousseName=""; +var newPackageType = ''; + var packageTypeStoreExt = new Ext.data.SimpleStore({ fields : [ 'typeName' ], url : WWWROOT + '/disinfectSystem/baseData/expirationDateInfoAction!getPackageType.do' @@ -273,9 +275,8 @@ materialsArray.push(materialObj); } - - var packageName = tempforeignTousseName + "(部分"+j+")"; - var type = packageTypeStoreExt.getAt(0).get('typeName'); + var packageName = tempforeignTousseName; + var type = newPackageType; if(materialsStr != ""){ j++; var record = new addMaterial({ @@ -350,9 +351,10 @@ barcodeField.setValue(""); } -function splitForeignTousse(applicationId,foreignTousseName,supplierName,tousseItemId){ +function splitForeignTousse(applicationId,foreignTousseName,supplierName,tousseItemId,packageType){ //器械报基础信息 tempforeignTousseName = foreignTousseName; + newPackageType = packageType; var isShowDefaultPackerOfSplitForeignTousse = getBoolValueFromJs("sstsConfig.isShowDefaultPackerOfSplitForeignTousse",true); Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.js =================================================================== diff -u -r27549 -r28486 --- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.js (.../interfereForeignTousseApplicationView.js) (revision 27549) +++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereForeignTousseApplicationView.js (.../interfereForeignTousseApplicationView.js) (revision 28486) @@ -25,10 +25,9 @@ }, success : function(response, options) { var result = Ext4.decode(response.responseText); - if(result.success){ if(result.rows.length == 1){ - splitForeignTousse(applicationId,result.rows[0].tousseName,result.rows[0].supplierName,result.rows[0].tousseItemId); + splitForeignTousse(applicationId,result.rows[0].tousseName,result.rows[0].supplierName,result.rows[0].tousseItemId,result.rows[0].packageType); }else { showForeignTousseInfo(applicationId,result.rows); } @@ -46,12 +45,12 @@ function showForeignTousseInfo(applicationId,rows){ Ext4.define('Teams',{ extend:'Ext4.data.Model', - fields:['tousseName','supplierName','tousseItemId'] + fields:['tousseName','supplierName','tousseItemId','packageType'] }); var storeData = new Ext4.data.Store({ model:'Teams', - sorters:['tousseName','supplierName','tousseItemId'], + sorters:['tousseName','supplierName','tousseItemId','packageType'], data:rows }); @@ -71,7 +70,7 @@ header : "操作", width : 100, renderer : function(v,p,record){ - return ""; + return ""; } }] })