Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js
===================================================================
diff -u -r34294 -r34676
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js	(.../config.js)	(revision 34294)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js	(.../config.js)	(revision 34676)
@@ -112,7 +112,7 @@
   //是否允许回收数量减小的部分超过待装配数量
   allowDecreaseRecyclingAmountGreatUnPackingAmount : true,
   //回收时，申请数量与回收数量不一致，是否要确认
-  confirmRecyclingAmount:true,
+  //confirmRecyclingAmount:true,
   //器械包定义是否批量修改
   tousseDefinitionCanBatchEdit : true,
   //禁用基数限制
@@ -198,7 +198,7 @@
   //是否启用打印回收清单版本2
   enablePrintRecyclingDetailVersion2 : true,
   //是否启用器械包自动加急功能
-   //enableTousseVoluntarilyUrgent : true,
+   enableTousseVoluntarilyUrgent : true,
   //急物品的提示时间间隔60秒
   urgentGoodsWarningTimeInterval : 1500,
   //打印发货单的版本,如果为2,则表示批量打印使用分组打印方式,并有下拉菜单
@@ -248,7 +248,19 @@
   //PDA快速回收
   enableQuickRecyclelnUseRecordWithPDA:true,
   //当外来器械未归还时能否申请
-  canApplyForForeignTousseNotReturn:false,
+  //canApplyForForeignTousseNotReturn:false,
+  //PDA端病人使用记录是否启用特殊感染类型
+  enableSpecialInfectionOfUseRecordWithPDAFunction:true,
+  //是否启用扫码登录
+  enableScanBarcodeLogin:false,
+  //丢失报损没有补充也能装配
+  allowPackingWhenUnSupplementMaterial:true,
+  //回收丢失报损备注功能
+  enableRecycleMaterialErrorDamageRemark:true,
+  //装配丢失报损备注功能
+  enablePackingMaterialErrorDamageRemark:true,
   //回收数量与申请数量不一致的回收记录的背景颜色
-  backgroundColorOfRecyclingRecordWhichRecyclingAmountNotEqualToAppplyAmount : {"greaterThanColor":"#98FB98","lessThanColor":"#87CEEB","greaterAndLessThanColor":"#CC99CC"}
+  backgroundColorOfRecyclingRecordWhichRecyclingAmountNotEqualToAppplyAmount : {"greaterThanColor":"#98FB98","lessThanColor":"#87CEEB","greaterAndLessThanColor":"#CC99CC"},
+ //回收页面扫描物品唯一条码回收时限制只能在对应的申请单进行回收
+  recyclingOnlyInTheCorrespondingApplicationFormWhenScanningUniqueBarcode:true
 }
\ No newline at end of file