Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r19570 -r19603
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 19570)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 19603)
@@ -350,6 +350,7 @@
{name : 'taskId'},
{name : 'tousseName'},
{name : 'tousseID'},
+ {name : 'invoicePlanId'},
{name : 'unPackingAmount'},
{name : 'amount'},
{name : 'urgentAmount'},
@@ -489,10 +490,10 @@
var amount = record.get('amount');
var basketBarcode = record.get('basketBarcode');
var showName = tousseName;
- var applicationid = record.get('applicationID');
+ var invoicePlanId = record.get('invoicePlanId');
var packageType = record.get('packageType');
var sterilingMethod = record.get('sterilingMethod');
- str += "";
+ str += "";
}
}
return str;
@@ -1771,7 +1772,7 @@
//赋值给全局变量
onErrorDamageBtnClick = errorDamageBtnClick;
-function addTaskNode(taskId,td_id,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
+function addTaskNode(taskId,td_id,invoicePlanId,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
taskStatus,department,tousseType, packageType,
sterilingMethod,recyclingTime,isTraceable,isPrint,isReview,errors,
damages,replenishMaterils,taskType,supplierName,haveIDCard,urgentAmount,idCardBarcode,
@@ -1783,6 +1784,7 @@
var node = Ext4.create('cModel',{
taskId : taskId,
tousseID : td_id,
+ invoicePlanId : invoicePlanId,
tousseName : tousseName,
amount : amount,
urgentAmount : urgentAmount,
@@ -3117,6 +3119,7 @@
var haveIDCard = taskVO.haveIDCard;
var errorRemark = taskVO.errorRemark;
var damageRemark = taskVO.damageRemark;
+
var parentNode = null;
rootNode.cascade(function(n) {
if(!n.get('leaf') && n.get('tousseName') == tousseName){
@@ -3129,7 +3132,7 @@
if(n == 0){
checked = true;
}
- parentNode = addTaskNode('',td_id,videoNames,tousseName,0,'','','',
+ parentNode = addTaskNode('',td_id,'',videoNames,tousseName,0,'','','',
'','',tousseType, packageType,
sterilingMethod,'',isTraceable,isPrint,isReview,'','',rMaterils,'','',haveIDCard,urgentAmount,
taskVO.idCardBarcode,taskVO.allowModifyPackageType,taskVO.errorRemark,taskVO.damageRemark,taskVO.urgentLevel,'','');
@@ -3159,6 +3162,7 @@
for (var j = 0; j < cLength; j++) {
var task = taskVO.children[j];
var taskId = task.taskId;
+ var invoicePlanId = task.invoicePlanId;
var tousseName = task.tousseName;
var amount = task.amount;
var childUrgentAmount = task.urgentAmount;
@@ -3191,7 +3195,7 @@
}
}
if(sigle){
- var childNode = addTaskNode(taskId,td_id,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
+ var childNode = addTaskNode(taskId,td_id,invoicePlanId,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
taskStatus,department,tousseType, packageType,sterilingMethod,dateTime,isTraceable,isPrint,isReview,
errors,damages,replenishMaterils,taskType,supplierName,task.haveIDCard,childUrgentAmount,task.idCardBarcode,
task.allowModifyPackageType,task.errorRemark,task.damageRemark,task.urgentLevel,task.serialNumber,task.recyclingItemRemark);