Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js =================================================================== diff -u -r31184 -r31863 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 31184) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js (.../supplyRoomTypeForm.js) (revision 31863) @@ -1753,7 +1753,21 @@ allowBlank : true, triggerAction : 'all' }] - } + },{ + layout:'form', + labelWidth : 180, + columnWidth: .25, + items:[{ + xtype :'timefield', + fieldLabel :'外来器械包申请截止时间', + id :'foreignTousseAppEndTime', + name :'foreignTousseAppEndTime', + format : 'H:i', + anchor : '100%', + allowBlank : true, + emptyText :'时间格式如:05:30' + }] + } ] }, @@ -3200,7 +3214,8 @@ showResult('高值耗材发票预警期天数不能为空!'); return false; } - } + } + var foreignTousseAppEndTime = Ext.getCmp("foreignTousseAppEndTime").getValue(); var unitName = Ext.getCmp("unitName").getValue(); var basketLoadeTousseAmount = Ext.getCmp("basketLoadeTousseAmount").getValue(); var customTousseDefaultTaskGroup = Ext.getCmp("customTousseDefaultTaskGroup").getValue(); @@ -3292,6 +3307,7 @@ foreignTousseCleanedEntirely:foreignTousseCleanedEntirely,// foreignTousseNeedReview:foreignTousseNeedReview,// foreignTousseIsSecondRecycle:foreignTousseIsSecondRecycle, + foreignTousseAppEndTime:foreignTousseAppEndTime, ftDefaultSterilingMethod:ftDefaultSterilingMethod,// ftPrintOrgSource:ftPrintOrgSource, ftPrintAmount:ftPrintAmount, @@ -3585,12 +3601,12 @@ } Ext.getCmp('mergeTousseRuleForInvoiceBatchPrint').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint); - Ext.getCmp('mergeTousseRuleForInvoiceBatchPrintStr').setValue(supplyRoomConfig.mergeTousseRuleForInvoiceBatchPrint); Ext.getCmp('isCustomTousseCleanEntirely').setValue(supplyRoomConfig.isCustomTousseCleanEntirely); Ext.getCmp('foreignTousseCleanedEntirely').setValue(supplyRoomConfig.foreignTousseCleanedEntirely); Ext.getCmp('foreignTousseNeedReview').setValue(supplyRoomConfig.foreignTousseNeedReview); Ext.getCmp('foreignTousseIsSecondRecycle').setValue(supplyRoomConfig.foreignTousseIsSecondRecycle); + Ext.getCmp('foreignTousseAppEndTime').setValue(supplyRoomConfig.foreignTousseAppEndTime); Ext.getCmp('ftPrintOrgSource').setValue(supplyRoomConfig.ftPrintOrgSource); Ext.getCmp('ftPrintAmount').setValue(supplyRoomConfig.ftPrintAmount); Ext.getCmp('ftPrintAmountSource').setValue(supplyRoomConfig.ftPrintAmountSource); Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js =================================================================== diff -u -r31594 -r31863 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 31594) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js (.../foreignTousseApplicationView.js) (revision 31863) @@ -330,7 +330,17 @@ iconCls : 'btn_ext_application_add', hidden : SSTS_ForeignTousseApplication_Create, handler : function() { - openForeignTousseForm("","apply"); + Ext.Ajax.request({ + url: WWWROOT + '/disinfectSystem/recyclingApplicationAction!verifyAddForeignTousse.do', + success: function(response, options) { + var result = Ext.decode(response.responseText); + if (result.success) { + openForeignTousseForm("","apply"); + } else { + showResult(result.message); + } + } + }); } }, '-', { text : '修改', Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r31170 -r31863 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 31170) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 31863) @@ -3934,8 +3934,18 @@ iconCls : 'btn_ext_add_customTousse', hidden : SSTS_ForeignTousseApplication_Create || sstsConfig.recyclingApplicationVersion == 3, handler : function() { - formPrinted = 1; - openForeignTousseForm("","apply"); + Ext.Ajax.request({ + url: WWWROOT + '/disinfectSystem/recyclingApplicationAction!verifyAddForeignTousse.do', + success: function(response, options) { + var result = Ext.decode(response.responseText); + if (result.success) { + formPrinted = 1; + openForeignTousseForm("","apply"); + } else { + showResult(result.message); + } + } + }); } },{ text : '申请自定义器械包',