Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp =================================================================== diff -u -r29513 -r29591 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp (.../recyclingErrors.jsp) (revision 29513) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp (.../recyclingErrors.jsp) (revision 29591) @@ -76,10 +76,6 @@ }else{ var totalCount = parseInt($('#totalCount' + row).html(), 10); if(errorAmount > 0){ - if((errorAmount-1) < errorCount && status !== 2){ - parent.layer.msg('减少到的最小数量不能超过已有的丢失数量!'); - return; - } $('#errorAmount' + row).html(errorAmount - 1); $('#unconfirmedAmount'+row).val(unconfirmedAmount - 1) } Index: ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.js =================================================================== diff -u -r28969 -r29591 --- ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.js (.../recyclingErrorView.js) (revision 28969) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.js (.../recyclingErrorView.js) (revision 29591) @@ -75,7 +75,8 @@ {header : "丢失环节",width : 120,dataIndex : 'linkType'}, {header : "报失时间",width : 120,dataIndex : 'operationTime', renderer : myDateFormatByMinute}, {header : "补充数量",width : 80,dataIndex : 'additionalAmount'}, - {header : "补充时间",width : 120,dataIndex : 'additionalTime', renderer : myDateFormatByMinute}, + {header : "补充时间",width : 120,dataIndex : 'additionalTime', renderer : myDateFormatByMinute}, + {header : "补充人",width : 60,dataIndex : 'additionalPerson'}, {header : "清洗完成时间",width : 130,dataIndex : 'washTime',sortable: false,menuDisabled : true}, {header : "备注",width : 150,dataIndex : 'errorRemark'}, {header : "清洗人",width : 120,dataIndex : 'washOperator',sortable: false,menuDisabled : true}, @@ -118,6 +119,13 @@ handler : function() { loadFormData(grid); } + }, '-', { + text : '补充丢失器械', + iconCls : 'btn_ext_application_add', + hidden : SSTS_DamageRecord_Create, + handler : function() { + additionalMaterial(type_lost,""); + } },"-",{ text : '删除', iconCls : 'btn_ext_application_del', Index: ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordView.js =================================================================== diff -u -r26452 -r29591 --- ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordView.js (.../recyclingDamageRecordView.js) (revision 26452) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingdamagerecord/recyclingDamageRecordView.js (.../recyclingDamageRecordView.js) (revision 29591) @@ -137,7 +137,7 @@ loadFormData(grid); } }, '-', { - text : '补充器械', + text : '补充报损器械', iconCls : 'btn_ext_application_add', hidden : SSTS_DamageRecord_Create, handler : function() { Index: ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorForm.js =================================================================== diff -u -r26452 -r29591 --- ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorForm.js (.../recyclingErrorForm.js) (revision 26452) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorForm.js (.../recyclingErrorForm.js) (revision 29591) @@ -33,7 +33,7 @@ labelWidth : 70, items : [ { xtype : 'numberfield', - fieldLabel : "报失数量", + fieldLabel : "丢失数量", name : "amount", id : "amount", allowBlank: false, @@ -61,7 +61,7 @@ labelWidth : 70, items : [ { xtype : 'textfield', - fieldLabel : "报失科室", + fieldLabel : "丢失科室", readOnly : true, name : "depart", id : "depart", @@ -74,7 +74,7 @@ labelWidth : 70, items : [ { xtype : 'textfield', - fieldLabel : "报失时间", + fieldLabel : "丢失时间", readOnly : true, name : "operationTime", id : "operationTime", Index: ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.jsp =================================================================== diff -u -r29513 -r29591 --- ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.jsp (.../recyclingErrorView.jsp) (revision 29513) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.jsp (.../recyclingErrorView.jsp) (revision 29591) @@ -1,6 +1,7 @@ <%@ page contentType="text/html; charset=UTF-8"%> <%@ include file="/common/taglibs.jsp"%> <%@ page import="java.util.Date,com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager,com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError" %> +<%@page import="com.forgon.disinfectsystem.entity.packing.PackingTask"%> <% SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager"); String orgUnitCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig(); @@ -15,14 +16,19 @@
<%@ include file="/common/includeExtJsAndCss.jsp"%> + + + - + + + @@ -40,7 +46,7 @@