Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp
===================================================================
diff -u -r27446 -r27454
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 27446)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/expressRecycleForTouchScreen.jsp (.../expressRecycleForTouchScreen.jsp) (revision 27454)
@@ -103,7 +103,7 @@
-
+
@@ -281,7 +281,7 @@
document.write('');
-function isShowTousseItem(groupId,departGroupIds,tousseGroupId){
+/* function isShowTousseItem(groupId,departGroupIds,tousseGroupId){
var show = false;
//加载全部
if(groupId == ""){
@@ -307,11 +307,13 @@
}
}
return show;
-}
+} */
function filterApplication(){
- var selectDepartGroupId = $("#inputselect").val();
- $('#tousseItemTable').children().first().children().each(function(i,element){
+ var selectDepartGroupId = $("#inputselect").val(); //科室分组过滤
+ var tousseGroupSelect = $('#tousseGroupSelect').val(); //器械包分组过滤
+ loadItem(tousseGroupSelect,selectDepartGroupId);
+ /* $('#tousseItemTable').children().first().children().each(function(i,element){
var departGroupIds = $('#departGroupId'+i).val();
var tousseGroupId = $('#tousseGroupId'+i).val();
var isShow = isShowTousseItem(selectDepartGroupId,departGroupIds,tousseGroupId);
@@ -320,7 +322,7 @@
}else{
$('#tousseItemsTr' + i).hide();
}
- });
+ }); */
}
function showMessage(message){
@@ -916,8 +918,8 @@
var trElement = $('| '+
''+
''+
- ''+
- ''+
+ // ''+
+ // ''+
''+
''+
''+
@@ -939,11 +941,11 @@
' |
');
$("#tousseItemTable").append(trElement);
- var groupId = $("#inputselect").val();
+ /* var groupId = $("#inputselect").val();
var isShow = isShowTousseItem(groupId,departGroupId,tousseGroupId);
if(!isShow){
$('#tousseItemsTr' + row).hide();
- }
+ } */
return true;
}
@@ -1181,7 +1183,9 @@
setTimeout("submintApplication(" + parseInt(val) + ")",50);
}else{
closeDiv();
- loadItem();
+ var selectDepartGroupId = $("#inputselect").val(); //科室分组过滤
+ var tousseGroupSelect = $('#tousseGroupSelect').val(); //器械包分组过滤
+ loadItem(tousseGroupSelect,selectDepartGroupId);
array = new Array();
}
}
@@ -1225,7 +1229,7 @@
}
}
-function loadItem() {
+function loadItem(tousseGroupSelect,selectDepartGroupId) {
$("#tousseItemTable").empty();
$("#basketsUl").empty();
@@ -1247,6 +1251,7 @@
url : WWWROOT
+ '/disinfectSystem/recyclingRecordAction!getAwaitForQuickRecyclingTousse.do',
dataType : 'json',
+ data:{'tousseGroupId':tousseGroupSelect,'departmentGroupId':selectDepartGroupId},
success : function(msg) {
for ( var i = 0; i < msg.length; i++) {
var recycleAmount = msg[i].prepareRecycleAmount;
@@ -1257,7 +1262,7 @@
addToussItem(i, '', msg[i].tousseName,
msg[i].amount, recycleAmount, '',msg[i].isApplyEntireTousse, msg[i].isCleanedEntirely,
msg[i].tousseType, '否', msg[i].depart,
- msg[i].applicationId,msg[i].tousseDefinitionID,msg[i].departGroupId,msg[i].tousseGroupId,msg[i].invoicePlanVersion);
+ msg[i].applicationId,msg[i].tousseDefinitionID,'','',msg[i].invoicePlanVersion);
}
layer.close(index);
},
@@ -1272,6 +1277,12 @@
return encoded;
}
+$(function(){
+ // 售后-中山大学附属第一医院ASSZDFY-48 快速回收响应慢问题,配置项为true,打开快速回收页面时显示空白页，不加载快速回收信息
+ if(!sstsConfig.showBlankPageWhenOpenExpressRecyclePage){
+ loadItem("","");
+ }
+})
//如果用jquery的ready方法会报错,因为dwr的查询需要时间会造成页面的js方法认不到的问题
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r27198 -r27454
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 27198)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 27454)
@@ -275,5 +275,7 @@
//是否显示责任人
showInvoicePersonInCharge: false,
// 是否显示装配界面的打印按钮
- packingView_currentTaskGroup_showPrintBtn: true
+ packingView_currentTaskGroup_showPrintBtn: true,
+ //开快速回收页面时显示空白页,true:启用，打开快速回收页面时显示空白页，不加载快速回收信息,false或者未配置:不启用。打开快速回收页面时，加载全部快速回收的信息
+ showBlankPageWhenOpenExpressRecyclePage :true
}
\ No newline at end of file