Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r18231 -r18248
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 18231)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 18248)
@@ -2121,6 +2121,13 @@
      * @returns {boolean}
      */
 	function checkAdd() {
+        var record = Ext.getCmp('applyGrid').getSelectionModel().getSelected();
+        //如果该申请单已经打印了,当前用户不是供应室用户或者没有配置允许修改打印的,则提示不能添加新的物品
+	    if (record.get('printed') === 2 && (isCssdUser === 'false' || !sstsConfig.allowEditApplyFormAfterPrint)){
+            showResult("已经打印了不能添加新的物品!");
+            return true;
+	    }
+
         var package1 = top.Ext4.getCmp('package1');
         if (top.Ext4.isEmpty(package1.getValue())){
             showResult("物品不能为空!");
@@ -3162,7 +3169,7 @@
 		//供应室用户
 		if(isCssdUser == 'true'){
 			//已打印
-			if(printed != unPrint){
+			if(printed != unPrint && !sstsConfig.allowEditApplyFormAfterPrint){
 				hiddenCommitButton = true;
 			//已提交、已回收已发货已终止 不能修改
 			}else if(committedStatus && ((recyclingStatus == partRecycle || recyclingStatus == recycled) || 
@@ -4030,7 +4037,7 @@
 			{type: 'date',  dataIndex: 'applicationTime'},
 			{type: 'date',  dataIndex: 'submitTime'},
 			{type: 'date',  dataIndex: 'printTime'},
-			{type: 'string',  dataIndex: 'type'},
+			{type: 'list',  dataIndex: 'type', phpMode: true, options: applyFormTypeArr},
 			{type: 'string',  dataIndex: 'readed'},
 			{type: 'string',  dataIndex: 'printed'},
 			{type: 'list',dataIndex:'recyclingStatus', phpMode:true ,options:recyclingStatusArr},