Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r28425 -r28450
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 28425)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 28450)
@@ -744,7 +744,7 @@
}
}
}
-deletePackingTask = function(ids,tousseID,amount,missRow) {
+deletePackingTask = function(ids,tousseID,amount,notLossReport) {
top.Ext4.MessageBox.confirm("请确认","是否删除所选择的待装配任务?",
function(button, text) {
if ("yes" == button){
@@ -754,7 +754,7 @@
ids : ids,
tousseID:tousseID,
amount:amount,
- missRow:missRow
+ notLossReport:notLossReport
},success : function(response, options) {
var result = Ext4.decode(response.responseText);
var success = result.success;
@@ -1025,17 +1025,25 @@
var status = record.get('status');
var amount = record.get('amount');
var supplent = true;
+ var notLossReport = true;
if(status == '待装配'){
var errors = record.get('errors');
for(var i = 0;i < errors.length ; i++) {
if(errorTypeAdd != errors[i].errorType && ((errors[i].amount - errors[i].additionalAmount) != 0)) {
supplent = false;
+ notLossReport = false;
}
}
+ if(notLossReport){
+ var damages = record.get('damages');
+ if(damages.length > 0){
+ notLossReport = false;
+ }
+ }
}
if(!SSTS_PackingTask_Delete){
if(taskid != undefined && taskid != null){
- str += "
";
+ str += "
";
}
}
if(status == '待装配'){