Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js =================================================================== diff -u -r28345 -r28353 --- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js (.../returnTousseByInvoice.js) (revision 28345) +++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoice.js (.../returnTousseByInvoice.js) (revision 28353) @@ -109,10 +109,7 @@ // 有且只有二层节点(不包括根节点rootNode) tousseNode.eachChild(function(tousseInstanceNode) { //var depart = tousseInstanceNode.attributes.settleAccountsDepartCode; - var depart = tousseInstanceNode.attributes.location2; - if(isUndefinedOrNullOrEmpty(depart)){ - depart = tousseInstanceNode.attributes.location; - } + var depart = tousseInstanceNode.attributes.location; //alert('depart='+depart); departs.push(depart); // if(typeof(departs[depart]) == 'undefined'){ Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js =================================================================== diff -u -r28352 -r28353 --- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js (.../returnGoodsRecordForm.js) (revision 28352) +++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js (.../returnGoodsRecordForm.js) (revision 28353) @@ -102,10 +102,8 @@ rootNode.eachChild(function(tousseNode) { // 有且只有二层节点(不包括根节点rootNode) tousseNode.eachChild(function(tousseInstanceNode) { - var depart = tousseInstanceNode.attributes.settleAccountsDepartCode; - if(isUndefinedOrNullOrEmpty(depart)){ - depart = tousseInstanceNode.attributes.location; - } + //var depart = tousseInstanceNode.attributes.settleAccountsDepartCode; + var depart = tousseInstanceNode.attributes.location; //alert('depart='+depart); departs.push(depart); // if(typeof(departs[depart]) == 'undefined'){