Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js
===================================================================
diff -u -r20052 -r20081
--- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js	(.../printConfig.js)	(revision 20052)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/print/printConfig.js	(.../printConfig.js)	(revision 20081)
@@ -264,17 +264,17 @@
     	            {label : "记账日期:", dataIndex : 'sendTime', fontSize : 11, position : ["30","58%","90%",5]},
     	            {label : "出库单号:", dataIndex : 'serialNumber2', fontSize : 11, position : ["30","80%","90%",5]},
     	            //页脚
-    	            {label : "制单日期:", dataIndex : 'printDate', fontSize : 11, position : ["320","2%","90%",5]},
-    	        	{label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["320","25%","90%",5]},
-            	    {label : "领用人:", dataIndex : '', fontSize : 11, position : ["320","45%","90%",5]},
-            	    {label : "保管人:", dataIndex : '', fontSize : 11, position : ["320","65%","90%",5]},
-            	    {label : "记账人:", dataIndex : 'sender', fontSize : 11, position : ["320","80%","90%",5]}
+    	            {label : "制单日期:", dataIndex : 'printDate', fontSize : 11, position : ["310","2%","90%",5]},
+    	        	{label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["310","25%","90%",5]},
+            	    {label : "领用人:", dataIndex : '', fontSize : 11, position : ["310","45%","90%",5]},
+            	    {label : "保管人:", dataIndex : '', fontSize : 11, position : ["310","65%","90%",5]},
+            	    {label : "记账人:", dataIndex : 'sender', fontSize : 11, position : ["310","80%","90%",5]}
     	        ],
     	        currentPageNumber : {label : "第#页", fontSize : 11, position : ["30","45%","90%",5]},
     	        totalPageAmount : {label : "共&页", fontSize : 11, position : ["30","50%","90%",5]},
     	        goodsTable :{
     	        	rowHeight : 20,
-    	        	position : ["50","1%","99%","6.5cm"],
+    	        	position : ["50","1%","98%","6.5cm"],
     	        	headRepeat : true,
     	        	columns : [
     	        	    {header : "序号", dataIndex : 'serialNumber', width : 50, align : 'center', fontSize : 11},
Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js
===================================================================
diff -u -r20046 -r20081
--- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js	(.../config.js)	(revision 20046)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js	(.../config.js)	(revision 20081)
@@ -8,12 +8,20 @@
   // 审核器械包必须入篮筐（二级供应室）
   mustScanBasketForTousseReviewOf2ndSupplyRoom : false,
   // 申请表单的类型：1 ： 通用申请单（组合申请单），2：分开的申请单
-  applicationFormType : 1,
+  applicationFormType : 2,
   hidePackageSpec : false,
   // 申请界面是否显示器械包或消毒物品的的单位
   showTousseUnitColumn : true,		
   // 条码类型：1：一维码， 2：二维码
   barcodeType : 1,
+  //一次性物品库存不足时，是否允许申领
+  allowApplyDisposableGoodsWhenUnderstock : false,
+  //一次性物品申请单是否显示一次性物品总价格
+  showDisposableGoodTotalAmount : false,
+  //隐藏申请单搜索出来的一次性物品的参考价
+  hideDiposableGoodsPrice : true,
+  //科室申领模块的填写申请单界面是否隐藏一次性物品价格
+  hideDisposablePriceColumn : true,
   // 申请器械包时是否自动归还待归还物品
   autoReturnTousse : false,
   // 是否隐藏进入审核列表按钮
@@ -29,7 +37,7 @@
   //提交申请单前显示申请的物品清单
   showAppliedGoodsBeforeSubmit : false,
   //是否审核时打印标签，为true时点审核按钮才打印标签；否则在装配时打印标签
-  printLabelWhenReviewing : true,
+  printLabelWhenReviewing : false,
   // 使用记录审核方式， 1: 审核和转换按钮分开； 2：审核和转换按钮合并为1个
   useRecordAuditMode : 1,
   //是否启用自定义回收的篮筐序号。目前就外来器械拆包有用