Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp
===================================================================
diff -u -r28060 -r28327
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp (.../addTousse.jsp) (revision 28060)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addTousse.jsp (.../addTousse.jsp) (revision 28327)
@@ -128,6 +128,7 @@
var serchValue = '';
var b = false;
function searchTousse(sign,pages,amount) {
+ var appCode = '<%=request.getParameter("appCode") %>';
if(b) {
return false;
}
@@ -137,7 +138,7 @@
inputObj.value = inputValue + sign;
b=false;
if(inputObj.value != null && inputObj.value != ''){
- TousseDefinitionTableManager.getInsideTousseAndDiposableGoods(inputObj.value,pages,amount,function(result){
+ TousseDefinitionTableManager.getInsideTousseAndDiposableGoods(inputObj.value,pages,amount,appCode,function(result){
if(result != null && result.length > 0){
var tousseArray = JSON.parse(result);
var htmlResultCode = "
";
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r28320 -r28327
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28320)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 28327)
@@ -4097,10 +4097,12 @@
offsetTop = offsetTop*zoomRatio+'px';
offsetLeft = ((parseInt(size.width/zoomRatio))/2)+'px';
}
+
+ var appCode = $('#departCode').val();
layerIndex=layer.open({
type : 2,
title : ['添加器械包',true],
- content : 'addTousse.jsp?resolution='+resolution+'&width='+width+'&height='+height+'&tousseName='+tousseName,
+ content : 'addTousse.jsp?resolution='+resolution+'&width='+width+'&height='+height+'&tousseName='+tousseName+'&appCode='+appCode,
area : [ width + 'px' , height +heightExtra+ 'px'],
border : [5, 0.3, '#fff', true],
closeBtn : [2 , true],
@@ -4634,17 +4636,14 @@
$("#departmentTemplate").change(function(){
var requestParms = {};
requestParms.templateId = $('#departmentTemplate').val();
- if($('#departmentTemplate').val() == 0){//当选择全部的时候,需要传科室编码orgUnitCoding和选择的模板templateId 2个参数
- requestParms.orgUnitCoding =$("#departCode").val();
- }
-
+ requestParms.orgUnitCoding = $("#departCode").val();
$.ajax({
type:'get',
url:WWWROOT + '/disinfectSystem/recyclingRecordAction!loadDepartmentAppTemplateForRecycle.do',
data:requestParms,
dataType:'json',
success:function(dataArray){
- if(dataArray.length > 0){
+ //if(dataArray.length > 0){
//获取页面显示的每个包
var tousseItemsTable2 = $('#tousseItemTable').children().first().children();
var tousseItemsTable2length = tousseItemsTable2.length;
@@ -4730,7 +4729,7 @@
setTousseItemLoadedAmountCss(k);
}
}
- }
+ //}
}
})
});