Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r28450 -r28457
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 28450)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 28457)
@@ -744,7 +744,7 @@
}
}
}
-deletePackingTask = function(ids,tousseID,amount,notLossReport) {
+deletePackingTask = function(ids,tousseID,amount,notLossReport,rowId) {
top.Ext4.MessageBox.confirm("请确认","是否删除所选择的待装配任务?",
function(button, text) {
if ("yes" == button){
@@ -775,6 +775,9 @@
Ext4.Array.each(pNode.childNodes,function(cNode){
for(var i = 0;i < idsArray.length;i++){
if(cNode.get('taskId') == idsArray[i]){
+ if(rowId != null && rowId != cNode.id){
+ continue;
+ }
var le = deleteNodes.length;
deleteNodes[le] = cNode;
}
@@ -1043,7 +1046,7 @@
}
if(!SSTS_PackingTask_Delete){
if(taskid != undefined && taskid != null){
- str += "
";
+ str += "
";
}
}
if(status == '待装配'){
@@ -2478,7 +2481,7 @@
ids += taskId;
});
});
- deletePackingTask(ids,null,null,true);
+ deletePackingTask(ids,null,null,true,null);
}
},"-",{
text : '添加报损器械',