Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r40725 -r40728 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 40725) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 40728) @@ -6931,6 +6931,8 @@ */ function isConfirmRequestPackingTousse(params, index, isTrue) { var len = params.length; + console.log(index) + console.log(len) if (index == len) { if (isTrue) { printLabelsAfterPacking(params); @@ -6964,6 +6966,29 @@ requestPackingTousse(params, index, isTrue); } }); + }else if (sstsConfig.enableDepartmentToWardAssociation && sstsConfig.enablePatientAreaSetting && params[index].tousseType == '外来器械包') { + Ext4.Ajax.request({ + url: WWWROOT + '/disinfectSystem/core/orgUnitPatientAreaRelationController/checkPackingTaskApplyOrgUnitPatientAreaRelation.mhtml', + params: { + packingTaskIds:params[index].taskIds + }, + success: function (result) { + var jsonObj = Ext4.JSON.decode(result.responseText); + if(jsonObj.success){ + onPackingTousseBtnClickComplete(); + showPackingTousseBtnClick_mask(); + requestPackingTousse(params, index, isTrue); + }else { + Ext4.MessageBox.confirm("请确认", jsonObj.message, function (btn) { + if (btn == 'yes') { + onPackingTousseBtnClickComplete(); + showPackingTousseBtnClick_mask(); + requestPackingTousse(params, index, isTrue); + } + }); + } + } + }); } else { requestPackingTousse(params, index, isTrue); }