Index: ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js
===================================================================
diff -u -r36474 -r37114
--- ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js (.../config.js) (revision 36474)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zd5y/config.js (.../config.js) (revision 37114)
@@ -220,6 +220,8 @@
recyclingStatusOfIdCardBarcode:"已使用,已废弃",
//启用消毒物品灵活计算价格的功能
enableFlexiblePriceCalculationOfDisinfectionGoodsFunction:true,
+ //回收界面点击消毒物品的回收数量单元格的响应方式
+ respondModeWhenClickRecycleAmounCellOfDisinfectedItem:1,
//启用明细核算月报的扩展查询项
enableExtendedQueryItemsOfDetailedAccountingMonthlyReport:["urgentLevel"]
}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r37067 -r37114
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 37067)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js (.../recycleForTouchScreen.js) (revision 37114)
@@ -4377,21 +4377,45 @@
clearTimeout(timeoutAmount);
//执行延时
timeoutAmount = setTimeout( function () {
- openUpdateAmount(obj, row, 1)
+ openUpdateAmount(obj, row)
}, 200);
}
-function dblClickAmount(obj, row){
- clearTimeout(timeoutAmount);
- //执行延时
- timeoutAmount = setTimeout( function () {
- openUpdateAmount(obj, row, 2)
- }, 200);
+function changeShowAmountType(obj, row){
+ lock = true;
+ ab = new AlertBox("changeAmount");
+ ab.onShow = function(){
+ if (lock) {
+ $$E.addEvent(document, "keydown", lockup);
+ $$E.addEvent(this.box, "keydown", lockout);
+ OverLay.show();
+ $('#updateTousseAmount').on('click',function(){
+ closeLayer();
+ obj.blur();
+ openElement = obj;
+ openUpdateAmountWin(row);
+ closeDiv();
+ })
+ $('#updateMaterialsAmount').on('click',function(){
+ closeLayer();
+ amendDisinfectionTousse(row,'updateAmount');
+ closeDiv();
+ })
+ }
+ };
+ ab.onClose = function () {
+ $$E.removeEvent(document, "keydown", lockup);
+ $$E.removeEvent(this.box, "keydown", lockout);
+ OverLay.close();
+ };
+
+ ab.center = true;
+ ab.show();
}
// 打开编辑数量的窗口
var openElement;
-function openUpdateAmount(obj, row, clickType) {
+function openUpdateAmount(obj, row) {
var isApplyEntireTousse = $('#isApplyEntireTousse' + row).val();
var tousseType = $('#tousseType' + row).val();
@@ -4400,64 +4424,37 @@
return;
}
if (tousseType == '消毒物品') {
- if(isApplyEntireTousse !== '是' && clickType == 2){
+ if(isApplyEntireTousse !== '是'){
alertDiv("拆包申请的消毒物品回收数量不能大于1，请点击器械包名修改材料数量!");
return;
}
- if(clickType == 1){
+ if(sstsConfig.respondModeWhenClickRecycleAmounCellOfDisinfectedItem == 1){
+ obj.blur();
+ openElement = obj;
+ openUpdateAmountWin(row);
+ return;
+ }else if(sstsConfig.respondModeWhenClickRecycleAmounCellOfDisinfectedItem == 2){
+ changeShowAmountType(obj, row)
+ return
+ }else {
amendDisinfectionTousse(row,'updateAmount');
return;
}
}
+
obj.blur();
- var width = 750;
- var height = 400;
openElement = obj;
- var boxHeight = window.screen.height;
- var offsetTop = ((boxHeight - height) / 2) + 'px';
- if (isIE()) {
- var screenWidth = ChangeRatio('width');
- var screenHeight = ChangeRatio('height');
- if (screenWidth < 1030) {
- width = width * 0.6;
- height = height * 0.6;
- offsetTop = ((boxHeight - height) / 2) + 'px';
- } else if (screenWidth > 1270 && screenWidth < 1300) {
- width = width * 0.8;
- height = height * 0.8;
- offsetTop = ((boxHeight - height) / 2) + 'px';
- } else if (screenWidth > 1350 && screenWidth < 1370) {
- width = width * 0.8;
- height = height * 0.8;
- offsetTop = ((boxHeight - height) / 2) + 'px';
- } else if (screenWidth > 1390) {
- width = width * 0.9;
- height = height * 0.9;
- offsetTop = ((boxHeight - height) / 2) + 'px';
- }
- }
- layerIndex = layer.open({
- type: 2,
- title: ['修改数量', true],
- content: 'updateAmount.jsp?resolution=' + resolution + '&row=' + row,
- area: [width + 'px', height + 'px'],
- border: [5, 0.3, '#fff', true],
- closeBtn: [2, true],
- offset: [offsetTop, '']
- });
+ openUpdateAmountWin(row);
}
// 打开修改数量的窗口
-function openUpdateStuffInTheBasketAmount(obj, tousseName, name, type) {
- obj.blur();
- var width = 550;
- var height = 300;
+function openUpdateAmountWin(row){
+ var width = 750;
+ var height = 400;
var boxHeight = window.screen.height;
- openElement = obj;
var offsetTop = ((boxHeight - height) / 2) + 'px';
if (isIE()) {
var screenWidth = ChangeRatio('width');
- var screenHeight = ChangeRatio('height');
if (screenWidth < 1030) {
width = width * 0.6;
height = height * 0.6;
@@ -4479,7 +4476,7 @@
layerIndex = layer.open({
type: 2,
title: ['修改数量', true],
- content: 'updateAmount.jsp?resolution=' + resolution + '&tousseName=' + tousseName + '&name=' + name + '&type=' + type,
+ content: 'updateAmount.jsp?resolution=' + resolution + '&row=' + row,
area: [width + 'px', height + 'px'],
border: [5, 0.3, '#fff', true],
closeBtn: [2, true],