Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js
===================================================================
diff -u -r36805 -r36808
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js (.../operationReservationView.js) (revision 36805)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationView.js (.../operationReservationView.js) (revision 36808)
@@ -21,17 +21,36 @@
}
//明细grid删除按钮
function renderDeleteButton(v, p, record, rowIndex) {
- return "
";
+ var tousseDefinitionId = '';
+ var barcode = '';
+ if(record.data && record.data.tousseDefinitionId){
+ tousseDefinitionId = record.data.tousseDefinitionId;
+ }else {
+ tousseDefinitionId = record.tousseDefinitionId;
+ barcode = record.barcode || '';
+ }
+ return "
";
}
//删除grid明细
-function deleteItem(tousseDefinitionId) {
+function deleteItem(tousseDefinitionId,barcode) {
if (top.Ext.getCmp('operationReservationGrid').getRootNode) {
var rootNode = top.Ext.getCmp('operationReservationGrid').getRootNode();
rootNode.eachChild(function (pNode) {
- if (pNode.attributes.tousseDefinitionId == tousseDefinitionId) {
- pNode.remove();
- return false;
+ if(barcode == ''){
+ if (pNode.attributes.tousseDefinitionId == tousseDefinitionId) {
+ pNode.remove();
+ return false;
+ }
+ }else {
+ if(pNode.childNodes.length > 0){
+ pNode.eachChild(function (node) {
+ if (node.attributes.barcode == barcode) {
+ node.remove();
+ return false;
+ }
+ })
+ }
}
});
} else {