Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js =================================================================== diff -u -r18252 -r18253 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 18252) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 18253) @@ -44,6 +44,8 @@ tousseType : '', form : '' } +//表单的打印状态(1是未打印,2是已打印) +var formPrinted = 1; /** * 打开对应的表单 * @param form 对应的表单 @@ -2121,12 +2123,11 @@ * @returns {boolean} */ function checkAdd() { - // var record = Ext.getCmp('applyGrid').getSelectionModel().getSelected(); - // //如果该申请单已经打印了,当前用户不是供应室用户或者没有配置允许修改打印的,则提示不能添加新的物品 - // if (record.get('printed') === 2 && (isCssdUser === 'false' || !sstsConfig.allowEditApplyFormAfterPrint)){ - // showResult("已经打印了不能添加新的物品!"); - // return true; - // } + //如果该申请单已经打印了,当前用户不是供应室用户或者没有配置允许修改打印的,则提示不能添加新的物品 + if (formPrinted === 2 && (isCssdUser === 'false' || !sstsConfig.allowEditApplyFormAfterPrint)){ + showResult("已经打印了不能添加新的物品!"); + return true; + } var package1 = top.Ext4.getCmp('package1'); if (top.Ext4.isEmpty(package1.getValue())){ @@ -3131,6 +3132,8 @@ } var id = records[0].data['id']; var type = records[0].data['type']; + //打开表单读取数据的时候给是否打印设值 + formPrinted = records[0].data['printed']; if (type == comboApplicationForm || type == recyclingCreateApplicationForm){ RecyclingApplicationTableManager.getRecyclingApplicationAndVerifyEdit(id,setRecyclingApplicationForm); }