@@ -191,7 +222,10 @@
@@ -670,8 +704,12 @@
basketElement += '
删除';
basketElement += '';
basketElement += '
';
- basketElement += '
'+basketItem.containerName+'';
- basketElement += '
' + 0 + '';
+ basketElement += '
'+basketItem.containerName+'';
+ if(basketItem.sumCount) {
+ basketElement += '
0/'+basketItem.sumCount+'';
+ }else {
+ basketElement += '
' + 0 + '';
+ }
basketElement += '
';
basketElement += '';
var obj = $(basketElement);
@@ -1390,7 +1428,340 @@
loadItem("","");
}
})
- //如果用jquery的ready方法会报错,因为dwr的查询需要时间会造成页面的js方法认不到的问题
+
+function isIE(value) {
+ var vals = value || '';
+ if(!!window.ActiveXObject || "ActiveXObject" in window){
+ if(vals !== ''){
+ var DEFAULT_VERSION = 8.0;
+ var ua = navigator.userAgent.toLowerCase();
+ var safariVersion = ua.match(/msie ([\d.]+)/) || '';
+ if(safariVersion == ''){
+ return false;
+ }
+ if(safariVersion[1] <= DEFAULT_VERSION ){
+ return true;
+ }else {
+ return false;
+ }
+ }
+
+ return true;
+ }else{
+ return false;
+ }
+ }
+
+ function ChangeRatio(type){
+ var ratio=0;
+ var screen=window.screen;
+ var ua=navigator.userAgent.toLowerCase();
+
+ if(window.devicePixelRatio !== undefined){
+ ratio=window.devicePixelRatio;
+ }else if(~ua.indexOf('msie')){
+ if(screen.deviceXDPI && screen.logicalXDPI)
+ {
+ ratio=screen.deviceXDPI/screen.logicalXDPI;
+ }
+ }else if(window.outerWidth !== undefined && window.innerWidth !== undefined){
+ ratio=window.outerWidth/window.innerWidth;
+ }
+
+ if(ratio){
+ ratio=Math.round(ratio*100);
+ }
+
+ var value;
+ if(type == 'width'){
+ var width = window.screen.width;
+ if(isIE()){
+ value = width*ratio/100;
+ }else {
+ value = width;
+ }
+ }else {
+ var height = window.screen.height;
+ if(isIE()){
+ value = height*ratio/100;
+ }else {
+ value = height;
+ }
+ }
+
+ return parseInt(value);
+ }
+
+ var screenWidth = ChangeRatio('width');
+ var screenHeight = ChangeRatio('height');
+ var htmlHeight = $('html').height();
+ $('.mbody').css('width','100%');
+
+ if(screenWidth < 1030){
+ $('.mbody').css({'width':'2600px','height':'1717px'});
+ $('.data-table').css({'width':'1540px','height':'1110px','bottom':'100px','left':'56px'});
+ $('.data-table .box').css({'height':'1030px'});
+ $('#tousseItemTable').css({'width':'1520px'});
+ $('.zhuangzai-table').css({'width':'820px','height':'1100px','bottom':'90px','right':'80px'});
+ $('.zhuangzai-table .box').css({'height':'1080px'});
+ $('.add-form').css({'top':'295px'});
+ $('#allIntoBasket').css({'top':'415px','left':'770px'});
+ $('#divselect').css({'left':'50px'});
+ $('#divTousseGroup').css({'left':'1060px'});
+ if(isIE()){
+ var height = htmlHeight + 100;
+ $('.mbody').css({'width':'1040px','height':'740px'});
+ $('.data-table').css({'width':'610px','height':(height-298)+'px','top':'210px','left':'25px'});
+ $('.data-table .box').css({'height':(height-388)+'px'});
+ $('#tousseItemTable').css({'width':'590px'});
+ $('.zhuangzai-table').css({'width':'340px','height':(height-338)+'px','top':'230px','right':'30px'});
+ }
+ }else if(screenWidth>1270 && screenWidth<1300){
+ if(screenHeight<730){
+ $('.mbody').css({'width':'2750px','height':'1350px'});
+ $('.data-table').css({'width':'1630px','height':'860px','bottom':'80px','left':'56px'});
+ $('.data-table .box').css({'height':'780px'});
+ $('#tousseItemTable').css({'width':'1610px'});
+ $('.zhuangzai-table').css({'width':'880px','height':'840px','bottom':'90px','right':'80px'});
+ $('.zhuangzai-table .box').css({'height':'840px'});
+ $('#allIntoBasket').css({'top':'315px','left':'800px'});
+ $('#divselect').css({'left':'50px'});
+ $('#divTousseGroup').css({'left':'1060px'});
+ if(isIE()){
+ var height = htmlHeight + 100;
+ $('.mbody').css({'width':'1280px','height':'700px'});
+ $('.data-table').css({'width':'780px','height':(height-318)+'px','top':'210px','left':'20px'});
+ $('.data-table .box').css({'height':(height-408)+'px'});
+ $('#tousseItemTable').css({'width':'780px'});
+ $('.zhuangzai-table').css({'width':'410px','height':(height-318)+'px','top':'220px','right':'40px'});
+ }
+ }else if(screenHeight>730 && screenHeight<780){
+ $('.mbody').css({'width':'2600px','height':'1420px'});
+ $('.data-table').css({'width':'1540px','height':'920px','bottom':'80px','left':'56px'});
+ $('.data-table .box').css({'height':'840px'});
+ $('#tousseItemTable').css({'width':'1520px'});
+ $('.zhuangzai-table').css({'width':'825px','height':'890px','bottom':'90px','right':'80px'});
+ $('.zhuangzai-table .box').css({'height':'890px'});
+ $('#allIntoBasket').css({'top':'340px','left':'770px'});
+ $('#divselect').css({'left':'50px'});
+ $('#divTousseGroup').css({'left':'1060px'});
+ if(isIE()){
+ var height = htmlHeight + 100;
+ $('.mbody').css({'width':'1280px','height':'700px'});
+ $('.data-table').css({'width':'780px','height':(height-318)+'px','top':'210px','left':'20px'});
+ $('.data-table .box').css({'height':(height-408)+'px'});
+ $('#tousseItemTable').css({'width':'780px'});
+ $('.zhuangzai-table').css({'width':'410px','height':(height-318)+'px','top':'220px','right':'40px'});
+ }
+ }else if(screenHeight>790 && screenHeight<810){
+ $('.mbody').css({'width':'2600px','height':'1450px'});
+ $('.data-table').css({'width':'1540px','height':'920px','bottom':'80px','left':'56px'});
+ $('.data-table .box').css({'height':'840px'});
+ $('#tousseItemTable').css({'width':'1520px'});
+ $('.zhuangzai-table').css({'width':'825px','height':'890px','bottom':'90px','right':'80px'});
+ $('.zhuangzai-table .box').css({'height':'890px'});
+ $('#allIntoBasket').css({'top':'460px','left':'770px'});
+ $('#divselect').css({'left':'50px'});
+ $('#divTousseGroup').css({'left':'1060px'});
+ if(isIE()){
+ var height = htmlHeight + 100;
+ $('.mbody').css({'width':'1280px','height':'700px'});
+ $('.data-table').css({'width':'780px','height':(height-318)+'px','top':'210px','left':'20px'});
+ $('.data-table .box').css({'height':(height-408)+'px'});
+ $('#tousseItemTable').css({'width':'780px'});
+ $('.zhuangzai-table').css({'width':'410px','height':(height-318)+'px','top':'220px','right':'40px'});
+ }
+ }else {
+ $('.mbody').css({'width':'2600px','height':'1900px'});
+ $('.data-table').css({'width':'1550px','height':'1240px','bottom':'120px','left':'56px'});
+ $('.data-table .box').css({'height':'1160px'});
+ $('#tousseItemTable').css({'width':'1530px'});
+ $('.zhuangzai-table').css({'width':'840px','height':'1200px','bottom':'115px','right':'70px'});
+ $('.zhuangzai-table .box').css({'height':'1200px'});
+ $('.add-form').css({'top':'335px'});
+ $('#allIntoBasket').css({'top':'460px','left':'770px'});
+ $('#divselect').css({'left':'50px'});
+ $('#divTousseGroup').css({'left':'1060px'});
+ if(isIE()){
+ var height = htmlHeight + 100;
+ $('.mbody').css({'width':'1280px','height':'1000px'});
+ $('.data-table').css({'width':'780px','height':(height-388)+'px','top':'280px','left':'20px'});
+ $('.data-table .box').css({'height':(height-478)+'px'});
+ $('#tousseItemTable').css({'width':'780px'});
+ $('.zhuangzai-table').css({'width':'410px','height':(height-408)+'px','top':'310px','right':'40px'});
+ }
+ }
+ }else if(screenWidth>1350 && screenWidth<1370){
+ $('.mbody').css({'width':'2745px','height':'1360px'});
+ $('.data-table').css({'width':'1660px','height':'860px','bottom':'90px','left':'56px'});
+ $('.data-table .box').css({'height':'780px'});
+ $('#tousseItemTable').css({'width':'1640px'});
+ $('.zhuangzai-table').css({'width':'880px','height':'850px','bottom':'90px','right':'90px'});
+ $('.zhuangzai-table .box').css({'height':'855px'});
+ $('#allIntoBasket').css({'top':'315px','left':'800px'});
+ $('#divselect').css({'left':'50px'});
+ $('#divTousseGroup').css({'left':'1060px'});
+ if(isIE()){
+ var height = htmlHeight + 100;
+ $('.mbody').css({'width':'1370px','height':'700px'});
+ $('.data-table').css({'width':'810px','height':(height-318)+'px','top':'210px','left':'40px'});
+ $('.data-table .box').css({'height':(height-408)+'px'});
+ $('#tousseItemTable').css({'width':'790px'});
+ $('.zhuangzai-table').css({'width':'440px','height':(height-318)+'px','top':'220px','right':'40px'});
+ }
+ }else if(screenWidth>1390 && screenWidth<1450){
+ $('.mbody').css({'width':'2600px','height':'1460px'});
+ $('.data-table').css({'width':'1560px','height':'930px','bottom':'90px','left':'56px'});
+ $('.data-table .box').css({'height':'850px'});
+ $('#tousseItemTable').css({'width':'1540px'});
+ $('.zhuangzai-table').css({'width':'830px','height':'920px','bottom':'90px','right':'80px'});
+ $('.zhuangzai-table .box').css({'height':'920px'});
+ $('#allIntoBasket').css({'top':'350px','left':'800px'});
+ $('#divselect').css({'left':'50px'});
+ $('#divTousseGroup').css({'left':'1060px'});
+ if(isIE()){
+ var height = htmlHeight + 100;
+ $('.mbody').css({'width':'1440px','height':'900px'});
+ $('.data-table').css({'width':'850px','height':(height-348)+'px','top':'250px','left':'40px'});
+ $('.data-table .box').css({'height':(height-438)+'px'});
+ $('#tousseItemTable').css({'width':'790px'});
+ $('.zhuangzai-table').css({'width':'460px','height':(height-378)+'px','top':'280px','right':'40px'});
+ }
+ }else if(screenWidth>1590 && screenWidth<1610){
+ $('.mbody').css({'width':'2720px','height':'1400px'});
+ $('.data-table').css({'width':'1620px','height':'900px','bottom':'80px','left':'56px'});
+ $('.data-table .box').css({'height':'820px'});
+ $('#tousseItemTable').css({'width':'1600px'});
+ $('.zhuangzai-table').css({'width':'875px','height':'875px','bottom':'90px','right':'80px'});
+ $('.zhuangzai-table .box').css({'height':'870px'});
+ $('#allIntoBasket').css({'top':'335px','left':'800px'});
+ $('#divselect').css({'left':'50px'});
+ $('#divTousseGroup').css({'left':'1060px'});
+ if(isIE()){
+ var height = htmlHeight + 100;
+ $('.mbody').css({'width':'1600px','height':'900px'});
+ $('.data-table').css({'width':'960px','height':(height-348)+'px','top':'250px','left':'40px'});
+ $('.data-table .box').css({'height':(height-438)+'px'});
+ $('#tousseItemTable').css({'width':'940px'});
+ $('.zhuangzai-table').css({'width':'510px','height':(height-378)+'px','top':'280px','right':'40px'});
+ }
+ }else if(screenWidth>1910 && screenWidth<1930){
+ $('.mbody').css({'width':'2700px','height':'1400px'});
+ $('.data-table').css({'width':'1620px','height':'890px','bottom':'80px','left':'56px'});
+ $('.data-table .box').css({'height':'810px'});
+ $('.zhuangzai-table').css({'width':'875px','height':'880px','bottom':'85px','right':'75px'});
+ $('.zhuangzai-table .box').css({'height':'880px'});
+ $('#allIntoBasket').css({'top':'335px','left':'800px'});
+ $('#divselect').css({'left':'50px'});
+ $('#divTousseGroup').css({'left':'1060px'});
+ if(isIE()){
+ var height = htmlHeight + 100;
+ $('.mbody').css({'width':'1920px','height':'1062px'});
+ $('.data-table').css({'width':'1150px','height':(height-408)+'px','top':'310px','left':'40px'});
+ $('.data-table .box').css({'height':(height-498)+'px'});
+ $('.zhuangzai-table').css({'width':'620px','height':(height-428)+'px','top':'330px','right':'60px'});
+ $('#allIntoBasket').css({'top':'335px','left':'800px'});
+ $('#divselect').css({'left':'50px'});
+ $('#divTousseGroup').css({'left':'1060px'});
+ }
+ }
+ function userContainer(that,user,basketName,basketBarcode,classifyBasketId){
+ if ( event && event.preventDefault ){
+ event.preventDefault();
+ }else{//IE中阻止函数器默认动作的方式
+ window.event.returnValue = false;
+ }
+ if(user == 1){
+ var sumCount = $(that).parent().parent().find('.totalAmount').text();
+ var msg = {
+ basket:{
+ containerBarcode:basketBarcode,
+ id:classifyBasketId,
+ containerName:basketName,
+ washClassifyType:'',
+ sumCount:parseInt(sumCount)
+ }
+ }
+ addBasketElement(msg);
+ $(that).parent().parent().remove();
+ }else {
+ var sumCount = $(that).parent().find('.totalAmount').text();
+ addBasketElement(msg);
+ $(that).parent().remove();
+ }
+ }
+ if(sstsConfig.loadWashLoadingStatusBasketsWhenRecycling){
+ getWashLoadingStatusBaskets()
+ }
+ //获取清洗装载状态的篮筐
+ function getWashLoadingStatusBaskets(){
+ $.ajax({
+ type : "post",
+ url : WWWROOT + '/disinfectSystem/recyclingRecordAction!getWashLoadingStatusBaskets.do',
+ dataType:'json',
+ async:true,
+ success:function(result){
+ if(result.length > 0){
+ for(var i=0;i
使用';
+ basketElement += '';
+ basketElement += '';
+
+ var showBasketLoadMaterialAmount = sstsConfig.showBasketLoadMaterialAmount;
+ var imageButton = '';
+ if(showBasketLoadMaterialAmount == true){
+ imageButton = '
';
+ }
+
+ if(text !== ''){
+ if(text.split('，').length > 4){
+ sumText = text.split('，')[0]+'，'+text.split('，')[1]+'，'+text.split('，')[2]+'......';
+ }else {
+ if(text.split('，').length == 2){
+ sumText = text.split('，')[0];
+ }else if(text.split('，').length == 3){
+ sumText = text.split('，')[0]+'，'+text.split('，')[1];
+ }else if(text.split('，').length == 4){
+ sumText = text.split('，')[0]+'，'+text.split('，')[1]+'，'+text.split('，')[2]
+ }
+ }
+ }
+
+ var amountStyle = (result[i].percentage == 1)?'color:red':'';
+
+ basketElement += '' + (containerName) + '' + imageButton +'';
+ basketElement += '' + sumAmount + '';
+ basketElement += ''+sumText+'
';
+ basketElement += '';
+ var obj = $(basketElement);
+ $("#loadingPutBasket").prepend(obj);
+ }
+ $("#scanContainerBarcodeTipUl").hide();
+ }else {
+ if($("#basketsUl > li").length == 0){
+ $("#scanContainerBarcodeTipUl").show();
+ }else{
+ $("#scanContainerBarcodeTipUl").hide();
+ }
+ }
+ }
+ })
+ }
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r29115 -r29136
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 29115)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 29136)
@@ -15,6 +15,10 @@
* 不回收的器械包的集合。这个是由绑定带出来的器械包,并且不回收,在回收这里本来是不做处理的。现在要能修改原来的申请数量，相关的还有装配任务
*/
var unrecycleTousseItemArray = new Array();
+//回收时自动加载清洗装载状态的篮筐
+if(sstsConfig.loadWashLoadingStatusBasketsWhenRecycling){
+ getWashLoadingStatusBaskets()
+}
//左边的器械包重新排序
function tousseItemTableSort(name){
@@ -815,7 +819,7 @@
});
//如果篮筐全被删除完时,则提示信息放开
- if($("#basketsUl > li").length == 0){
+ if($("#basketsUl > li").length == 0 && $("#loadingPutBasket > li").length == 0){
$("#scanContainerBarcodeTipUl").show();
}
@@ -902,7 +906,7 @@
total += num;
}
});
- liElement.find('font.totalnum').html(total);
+ liElement.find('span.totalnum').html(total);
}
}
/**
@@ -917,11 +921,12 @@
/**
* 入框时重新计算该篮筐的数量
*/
-function addAllBasketTotalNum(){
+function addAllBasketTotalNum(amount){
+ console.log(amount)
var that = $("#basketsUl li").eq(0);
if(that){
- var total = that.find('font.totalnum').text();
- that.find('font.totalnum').html(parseInt(total)+newAmount);
+ var sumCount = that.find('span.sumCount').text();
+ that.find('span.sumCount').text(parseInt(sumCount)+parseInt(amount));
}
}
@@ -1020,6 +1025,7 @@
addOrDelTousse(tousse);
}
}
+ addAllBasketTotalNum(0-parseInt(amount))
checkLoadedAmount();
refreshSequence(delElement.parent().parent(),0);
tousseItemTableSort(name);
@@ -1318,6 +1324,7 @@
}
}
}
+
function basketLoadGoods(basketName,basketBarcode,classifyBasketId){
var width = 740;
var height = 400;
@@ -1357,7 +1364,24 @@
});
}
-function createBasketUiElement(basketBarcode,classifyBasketId,basketName,washClassifyType,sequence,isIdCard){
+function userContainer(that,user,basketName,basketBarcode,classifyBasketId){
+ if ( event && event.preventDefault ){
+ event.preventDefault();
+ }else{//IE中阻止函数器默认动作的方式
+ window.event.returnValue = false;
+ }
+ if(user == 1){
+ var sumCount = $(that).parent().parent().find('.totalAmount').text();
+ createBasketUiElement(basketBarcode,classifyBasketId,basketName,'',undefined,false,parseInt(sumCount));
+ $(that).parent().parent().remove();
+ }else {
+ var sumCount = $(that).parent().find('.totalAmount').text();
+ createBasketUiElement(basketBarcode,classifyBasketId,basketName,'',undefined,false,parseInt(sumCount));
+ $(that).parent().remove();
+ }
+}
+
+function createBasketUiElement(basketBarcode,classifyBasketId,basketName,washClassifyType,sequence,isIdCard,sumCount){
var basketElement = '';
basketElement += '';
basketElement += '';
@@ -1366,13 +1390,17 @@
basketElement += '';
var showBasketLoadMaterialAmount = sstsConfig.showBasketLoadMaterialAmount;
- var imageButton = '';
+ var imageButton = '';
if(showBasketLoadMaterialAmount == true){
imageButton = '';
}
- basketElement += '' + (sequence&&sequence>0?(sequence+'.' + basketName):basketName) + '' + imageButton +'';
- basketElement += '' + 0 + '';
+ basketElement += '' + (sequence&&sequence>0?(sequence+'.' + basketName):basketName) + '' + imageButton +'';
+ if(sumCount){
+ basketElement += '0/'+sumCount+'';
+ }else {
+ basketElement += '0';
+ }
basketElement += '
';
basketElement += '';
var obj = $(basketElement);
@@ -1422,13 +1450,17 @@
}
// 广州市第八人民医院 篮筐重新置顶作为优先载入篮筐
-function topScannedBasket(event,that){
+function topScannedBasket(event,that,user){
if ( event && event.preventDefault ){
event.preventDefault();
}else{//IE中阻止函数器默认动作的方式
window.event.returnValue = false;
}
- $("#basketsUl").prepend($(that).parent());
+ if(user){
+ $("#basketsUl").prepend($(that).parent().parent());
+ }else {
+ $("#basketsUl").prepend($(that).parent());
+ }
}
/**
@@ -2777,8 +2809,9 @@
$('#loadedAmount'+row).val(loadedAmountSum);
}
setTousseItemLoadedAmountCss(row);
- addAllBasketTotalNum();
+ refreshAllBasketTotalNum();
refreshSplitBasketView();
+ addAllBasketTotalNum(recycleAmount)
return;
}else if(recycleAmount > 0){
var loadedAmount = data.amount;
@@ -2822,6 +2855,7 @@
}
}
}
+ addAllBasketTotalNum(recycleAmount)
}
var speakBasket = new SpeakBasket();
if(smartSpeaker.type == "滴声提示"){
@@ -3089,7 +3123,8 @@
newAmount = 0;
}
setTousseItemLoadedAmountCss(row);
- addAllBasketTotalNum();
+ refreshAllBasketTotalNum();
+
refreshSplitBasketView();
tousseItemTableSort();
}else{
@@ -5272,7 +5307,7 @@
}
}else{
- if(isSwitchingDepartments){
+ if(isSwitchingDepartments && $("#loadingPutBasket > li").length == 0){
$("#basketsUl").empty();
$('#scanContainerBarcodeTipUl').show();
}
@@ -5710,14 +5745,15 @@
//二级供应室回收时科室名称与编码改为也不赋值
//$("#depart").val(secondOrgUnitName);
//$("#departCode").val(secondOrgUnitCoding);
- }
-
- //如果篮筐为空,隐藏扫描篮筐提示
- if($("#basketsUl > li").length == 0){
- $("#scanContainerBarcodeTipUl").show();
- }else{
- $("#scanContainerBarcodeTipUl").hide();
- }
+ }
+ //如果篮筐为空,隐藏扫描篮筐提示
+ if(!sstsConfig.loadWashLoadingStatusBasketsWhenRecycling){
+ if($("#basketsUl > li").length == 0){
+ $("#scanContainerBarcodeTipUl").show();
+ }else{
+ $("#scanContainerBarcodeTipUl").hide();
+ }
+ }
checkLoadedAmount();
@@ -6070,7 +6106,7 @@
var element = '';
element += ''+materialName+'';
element += ' '+showBarcode+'';
- element += ''+ci.amount+'';
+ element += '/'+ci.amount+'';
element += '删除';
$('dl[class="sed clearfix"]:eq(0)').prepend(element);
@@ -6251,4 +6287,74 @@
window.opener.isRecyclingWindow = 1;
}
window.onunload = cleanIsRecyclingFun;
+}
+
+//获取清洗装载状态的篮筐
+function getWashLoadingStatusBaskets(){
+ $.ajax({
+ type : "post",
+ url : WWWROOT + '/disinfectSystem/recyclingRecordAction!getWashLoadingStatusBaskets.do',
+ dataType:'json',
+ async:true,
+ success:function(result){
+ if(result.length > 0){
+ for(var i=0;i使用';
+ basketElement += '';
+ basketElement += '';
+
+ var showBasketLoadMaterialAmount = sstsConfig.showBasketLoadMaterialAmount;
+ var imageButton = '';
+ if(showBasketLoadMaterialAmount == true){
+ imageButton = '';
+ }
+
+ if(text !== ''){
+ if(text.split('，').length > 4){
+ sumText = text.split('，')[0]+'，'+text.split('，')[1]+'，'+text.split('，')[2]+'......';
+ }else {
+ if(text.split('，').length == 2){
+ sumText = text.split('，')[0];
+ }else if(text.split('，').length == 3){
+ sumText = text.split('，')[0]+'，'+text.split('，')[1];
+ }else if(text.split('，').length == 4){
+ sumText = text.split('，')[0]+'，'+text.split('，')[1]+'，'+text.split('，')[2]
+ }
+ }
+ }
+
+ var amountStyle = (result[i].percentage == 1)?'color:red':'';
+
+ basketElement += '' + (containerName) + '' + imageButton +'';
+ basketElement += '' + sumAmount + '';
+ basketElement += ''+sumText+'
';
+ basketElement += '';
+ var obj = $(basketElement);
+ $("#loadingPutBasket").prepend(obj);
+ }
+ $("#scanContainerBarcodeTipUl").hide();
+ }else {
+ if($("#basketsUl > li").length == 0){
+ $("#scanContainerBarcodeTipUl").show();
+ }else{
+ $("#scanContainerBarcodeTipUl").hide();
+ }
+ }
+ }
+ })
}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
===================================================================
diff -u -r28969 -r29136
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 28969)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css (.../style.css) (revision 29136)
@@ -136,6 +136,8 @@
.zhuangzai-table .list-item li i{ width:129px; text-align:center}
.zhuangzai-table .list-item li .btn{ background:url(pic_bg.jpg) no-repeat -86px -417px; width:84px; height:58px; display:block; line-height:200px; overflow:hidden; margin:0 auto}
.zhuangzai-table .list-item li .btn:hover{ background-position: -86px -475px; }
+.zhuangzai-table .list-item li .btn1{ background:url(user.png) no-repeat 0px -2px; width:84px; height:58px; display:block; line-height:200px; overflow:hidden; margin:0 auto}
+.zhuangzai-table .list-item li .btn1:hover{ background-position: 0px -60px; }
.zhuangzai-table .list-item dl{ margin-top:7px; width:625px; background:#f9fce8; }
.zhuangzai-table .list-item dd{ float:left; border-bottom:1px solid #ddd;border-right:1px solid #ddd; padding:7px 0; text-align:center; }
.zhuangzai-table .list-item .name{ width:235px;height:58px;line-height:25px;overflow:hidden;}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/expressStyle.css
===================================================================
diff -u -r26112 -r29136
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/expressStyle.css (.../expressStyle.css) (revision 26112)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/expressStyle.css (.../expressStyle.css) (revision 29136)
@@ -107,6 +107,8 @@
.zhuangzai-table .list-item li i{ width:129px; text-align:center}
.zhuangzai-table .list-item li .btn{ background:url(pic_bg.jpg) no-repeat -86px -417px; width:84px; height:58px; display:block; line-height:200px; overflow:hidden; margin:0 auto}
.zhuangzai-table .list-item li .btn:hover{ background-position: -86px -475px; }
+.zhuangzai-table .list-item li .btn1{ background:url(user.png) no-repeat 0px -2px; width:84px; height:58px; display:block; line-height:200px; overflow:hidden; margin:0 auto}
+.zhuangzai-table .list-item li .btn1:hover{ background-position: 0px -60px; }
.zhuangzai-table .list-item dl{ margin-top:7px; width:625px; background:#f9fce8; }
.zhuangzai-table .list-item dd{ float:left; border-bottom:1px solid #ddd;border-right:1px solid #ddd; padding:7px 0; text-align:center; }
.zhuangzai-table .list-item .name{ width:397px;}
@@ -119,6 +121,7 @@
.zhuangzai-table .list-item .materialName{ width:190px;}
.zhuangzai-table .list-item .materialNum{ width:86px;}
.zhuangzai-table .list-item .delBtn{ width:114px;}
+.zhuangzai-table .list-item .totalAmount{ display:inline-block;text-align:center;float:right; width:86px;height:58px;overflow:hidden;margin: 0px;}
.copyRight{ position:absolute; bottom:0; height:29px; text-align:center; font-family:Tahoma, Geneva, sans-serif; width:1980px; font-size:16px; line-height:29px;}
Index: ssts-web/src/main/webapp/disinfectsystem/config/hbsxkyy/config.js
===================================================================
diff -u -r28856 -r29136
--- ssts-web/src/main/webapp/disinfectsystem/config/hbsxkyy/config.js (.../config.js) (revision 28856)
+++ ssts-web/src/main/webapp/disinfectsystem/config/hbsxkyy/config.js (.../config.js) (revision 29136)
@@ -151,5 +151,9 @@
//启用灭菌暂存状态
enableSterilizationDraftStatus:true,
//装配人与审核人是否相同的检查方式,值为1：相同时只进行提示，让用户选择是否继续操作。用户选择【是】，则进行下一步操作；选择【否】，则取消本次操作, 值为2：相同时进行提示，并且不允许进行下一步操作。值为其它或者没有配置：不进行检查和提示。
- operatorAndReviewerIsSameCheckMode:2
+ operatorAndReviewerIsSameCheckMode:2,
+ //清洗篮筐名称的右侧会显示放大镜图标
+ showBasketLoadMaterialAmount:true,
+ //回收时自动加载清洗装载状态的篮筐
+ loadWashLoadingStatusBasketsWhenRecycling:true
}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js
===================================================================
diff -u -r28987 -r29136
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 28987)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js (.../customIntoBasket.js) (revision 29136)
@@ -1218,4 +1218,98 @@
liElement.find('div.basketName div:last').html(showName);
}
}
+}
+
+function userContainer(that,sumAmount,basketName,basketBarcode,classifyBasketId){
+ var basketElement = '';
+ basketElement += '';
+ basketElement += '';
+ basketElement += '删除';
+ basketElement += '';
+ basketElement += '';
+ basketElement += ''
+ basketElement += '0/'+sumAmount+'';
+ basketElement += '
';
+ basketElement += '';
+ var obj = $(basketElement);
+ $("#basketsUl").prepend(obj);
+ var json = getBasketJSON(classifyBasketId,basketBarcode,basketName,'');
+ $("#basketsUl li:first").find('input').val(json);
+ updateRemoveImplantBtn($("#basketsUl li:first"),false);
+ toggleItems(obj.find('span')[0]);
+
+ $(that).parent().parent().remove();
+}
+if(sstsConfig.loadWashLoadingStatusBasketsWhenRecycling){
+ getWashLoadingStatusBaskets()
+}
+//获取清洗装载状态的篮筐
+function getWashLoadingStatusBaskets(){
+ $.ajax({
+ type : "post",
+ url : WWWROOT+'/disinfectSystem/recyclingRecordAction!getWashLoadingStatusBaskets.do',
+ dataType:'json',
+ async:true,
+ success:function(result){
+ if(result.length > 0){
+ for(var i=0;i使用';
+ basketElement += '';
+ basketElement += '';
+
+ var showBasketLoadMaterialAmount = sstsConfig.showBasketLoadMaterialAmount;
+ var imageButton = '';
+ if(showBasketLoadMaterialAmount == true){
+ imageButton = '';
+ }
+
+ if(text !== ''){
+ if(text.split('，').length > 4){
+ sumText = text.split('，')[0]+'，'+text.split('，')[1]+'，'+text.split('，')[2]+'......';
+ }else {
+ if(text.split('，').length == 2){
+ sumText = text.split('，')[0];
+ }else if(text.split('，').length == 3){
+ sumText = text.split('，')[0]+'，'+text.split('，')[1];
+ }else if(text.split('，').length == 4){
+ sumText = text.split('，')[0]+'，'+text.split('，')[1]+'，'+text.split('，')[2]
+ }
+ }
+ }
+
+ var amountStyle = (result[i].percentage == 1)?'color:red':'';
+
+ basketElement += '' + (containerName) + '' + imageButton +'';
+ basketElement += '' + sumAmount + '';
+ basketElement += ''+sumText+'
';
+ basketElement += '';
+ var obj = $(basketElement);
+ $("#loadingPutBasket").prepend(obj);
+ }
+ $("#scanContainerBarcodeTipUl").hide();
+ }else {
+ if($("#basketsUl > li").length == 0){
+ $("#scanContainerBarcodeTipUl").show();
+ }else{
+ $("#scanContainerBarcodeTipUl").hide();
+ }
+ }
+ }
+ })
}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/user.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r28784 -r29136
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 28784)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 29136)
@@ -103,7 +103,7 @@
}
.data-table .tousseDetailTable td{ padding:0px;text-align:left;vertical-align:middle;}
.data-table .tousseDetailTable .input-a{padding:0 2px;width:335px;}
-.zhuangzai-table .list-item .totalnum{ display:inline-block;text-align:center;float:right; width:86px;height:58px;overflow:hidden;margin: 0px;}
+.zhuangzai-table .list-item .totalAmount{ display:inline-block;text-align:center;float:right; width:86px;height:58px;overflow:hidden;margin: 0px;}
.autoCloseText,.autoCloseBtn{margin:0px;padding:0px;}
.autoCloseAlert{border: 1px solid #dcdcdc;background:#eeeeee;padding: 12px 10px; width:300px;position:absolute;z-index:222220000;top:8px;margin-left: -150px;left:50%;border-radius:5px;display: none;}
@@ -560,6 +560,9 @@
+
