Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
===================================================================
diff -u -r15987 -r16306
--- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 15987)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js (.../splitForeignTousseView.js) (revision 16306)
@@ -272,7 +272,7 @@
}
var packageName = tempforeignTousseName + "(部分"+j+")";
- var type = packageTypeStoreExt2.getAt(0).get('typeName');
+ var type = top.Ext.getCmp("foreignToussePackageType").getValue();
if(materialsStr != ""){
j++;
var record = new addMaterial({
@@ -347,7 +347,7 @@
barcodeField.setValue("");
}
-function splitForeignTousse(packTaskId,foreignTousseName,showName,applicationid,thizAmount,supplierName,basketBarcode){
+function splitForeignTousse(packTaskId,foreignTousseName,showName,applicationid,thizAmount,supplierName,basketBarcode,packageType){
//器械报基础信息
tempforeignTousseName = showName;
@@ -393,6 +393,11 @@
name : 'sterileCode',
value : sterileUserCode
},{
+ xtype:'hidden',
+ id : 'foreignToussePackageType',
+ name : 'foreignToussePackageType',
+ value : packageType
+ },{
columnWidth : .33,
layout : 'form',
labelWidth : 70,
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r16297 -r16306
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 16297)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 16306)
@@ -449,7 +449,8 @@
var basketBarcode = record.get('basketBarcode');
var showName = tousseName;
var applicationid = record.get('applicationID');
- str += "";
+ var packageType = record.get('packageType');
+ str += "";
}
}
return str;