Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r36606 -r36685
--- ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 36606)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 36685)
@@ -360,6 +360,7 @@
 	   <operation operationId="SSTS_DisposableGoodsCheck_Manager" operationName="һ������Ʒ�̵����"></operation>
 	   <operation operationId="SSTS_DisposableGoodSsettleAccounts_Manager" operationName="һ������Ʒ�������"></operation>
 	   <operation operationId="SSTS_DisposableGoodPreferredDelivery_Manager" operationName="һ������Ʒ���ȷ�������" mappingConfigPropertyName="enableDisposableGoodsCanBeShippedFirstFunction"></operation>
+	   <operation operationId="SSTS_DisposableGoodsGodownEntryVerifier_Manager" operationName="һ������Ʒ��ⵥ�˶Թ���" mappingConfigPropertyName="godownEntryAddCheckMode"></operation>
     </modelName>
     
     <modelName modleName="�ɹ��ƻ�����ģ��">
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryForm.js
===================================================================
diff -u -r34941 -r36685
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryForm.js	(.../godownEntryForm.js)	(revision 34941)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryForm.js	(.../godownEntryForm.js)	(revision 36685)
@@ -208,7 +208,7 @@
 					anchor : '95%'
 				}]
 			},{
-				hidden : !sstsConfig.showDisposableGoodsGodownEntryVerifier || (commonEntry.isOpen() ? false:true),
+				hidden : (sstsConfig.godownEntryAddCheckMode !== 1 && sstsConfig.godownEntryAddCheckMode !== 2) || (commonEntry.isOpen() ? false:true),
 				columnWidth : .25,
 				layout : 'form',
 				labelWidth : 130,
@@ -231,7 +231,7 @@
 					}
 				}]
 			},{
-				hidden : !sstsConfig.showDisposableGoodsGodownEntryVerifier|| (commonEntry.isOpen() ? false:true),
+				hidden : (sstsConfig.godownEntryAddCheckMode !== 1 && sstsConfig.godownEntryAddCheckMode !== 2) || (commonEntry.isOpen() ? false:true),
 				columnWidth : .25,
 				layout : 'form',
 				labelWidth : 80,
@@ -267,7 +267,7 @@
 					}
 				}]				
 			},{
-				hidden : !sstsConfig.showDisposableGoodsGodownEntryVerifier|| (commonEntry.isOpen() ? false:true),
+				hidden : sstsConfig.godownEntryAddCheckMode == 1 || (commonEntry.isOpen() ? false:true),
 				columnWidth : .25,
 				layout : 'form',
 				labelWidth : 130,
@@ -290,7 +290,7 @@
 					}
 				}]
 			},{
-				hidden : !sstsConfig.showDisposableGoodsGodownEntryVerifier|| (commonEntry.isOpen() ? false:true),
+				hidden : sstsConfig.godownEntryAddCheckMode == 1 || (commonEntry.isOpen() ? false:true),
 				columnWidth : .25,
 				layout : 'form',
 				labelWidth : 80,
@@ -1235,11 +1235,13 @@
 			hidden: !showEntryVerifierButton(),
 			handler : function(){
 				var supplyRoomVerifier = top.Ext.getCmp('supplyRoomVerifier').getValue();//供应室核对员
-				var equipmentVerifier = top.Ext.getCmp('equipmentVerifier').getValue();//设备科核对员
-				if(isUndefinedOrNullOrEmpty(equipmentVerifier)){
-					showResult('设备科核对员不能为空!');
-					return false;
-				};
+				if(sstsConfig.godownEntryAddCheckMode !== 1){
+					var equipmentVerifier = top.Ext.getCmp('equipmentVerifier').getValue();//设备科核对员
+					if(isUndefinedOrNullOrEmpty(equipmentVerifier)){
+						showResult('设备科核对员不能为空!');
+						return false;
+					};
+				}
 				if(isUndefinedOrNullOrEmpty(supplyRoomVerifier)){
 					showResult('供应室核对员不能为空!');
 					return false;
@@ -1257,7 +1259,7 @@
 						grid.dwrReload();
 					},
 					failure : function(form, action) {
-						alert(action.result.message);
+						showResult(action.result.message);
 					}
 				});
 			}
@@ -1568,7 +1570,7 @@
 *是否显示保存审核人
 */
 function showEntryVerifierButton(){
-	if(!verifierUpdateButton && sstsConfig.showDisposableGoodsGodownEntryVerifier){
+	if(!verifierUpdateButton && (sstsConfig.godownEntryAddCheckMode == 1 || sstsConfig.godownEntryAddCheckMode == 2)){
 		if(commonEntry.isOpen() && !commonEntry.hasEquipmentVerifier() && !commonEntry.hasSupplyRoomVerifier()){
 			return true;
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp
===================================================================
diff -u -r29513 -r36685
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp	(.../godownEntryView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.jsp	(.../godownEntryView.jsp)	(revision 36685)
@@ -71,7 +71,13 @@
     <operation:authorize ifAnyGranted="SSTS_WarehouseEntryVerifier_Update">
     SSTS_WarehouseEntryVerifier_Update = false;
     </operation:authorize>
-    
+    var SSTS_DisposableGoodsGodownEntryVerifier_Manager = true;
+    <operation:authorize ifAnyGranted="SSTS_DisposableGoodsGodownEntryVerifier_Manager">
+    SSTS_DisposableGoodsGodownEntryVerifier_Manager = false;
+    </operation:authorize>
+    if(sstsConfig.godownEntryAddCheckMode !== 1){
+        SSTS_DisposableGoodsGodownEntryVerifier_Manager = true;
+    }
     var verifierUpdateButton = SSTS_WarehouseEntryVerifier_Update;
     var saveButton = SSTS_WarehouseEntry_Create && SSTS_WarehouseEntry_Update && SSTS_WarehouseEntry_Delete;
     
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
===================================================================
diff -u -r34992 -r36685
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 34992)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 36685)
@@ -22,7 +22,7 @@
 	}, [
 	    {name : 'id',mapping : 'id'},
 	    {name : 'name',mapping : 'name'},
-	    {name : 'orgUnitCode',mapping : 'orgUnitCode'},
+	    {name : 'orgUnitCode',mapping : 'orgUnitCode'}
 	]),
 	listeners : {
 		load : function(store,records) {
@@ -180,7 +180,6 @@
 			beforeload: function(s,options){
 				var disposableGoodsID = top.Ext.getCmp('disposableGoodsID').getValue();//一次性物品id
 				var manufacturerId = top.Ext.getCmp('manufacturerId').getValue();//生产厂家id
-//				console.log(disposableGoodsID);
 				s.baseParams.manufacturerId ="";
 				s.baseParams.disposableGoodsID ="";
 				s.baseParams.needVerify = true;//需要校验用
@@ -255,7 +254,6 @@
 			},
 			load : function(store,records) {
 				//注册证自动填入
-//				console.log(records);
 				if(records.length > 0){
 					var combo = top.Ext.getCmp('certification1');
 					combo.setValue(records[0].data.id);
@@ -1051,7 +1049,7 @@
  * 页面中需要定义 modify(v,data) 函数
  */
 function modify(v,data){
-	if(sstsConfig.showDisposableGoodsGodownEntryVerifier){
+	if(sstsConfig.godownEntryAddCheckMode == 2){
 		commonEntry.setSupplyRoomVerifier(data['supplyRoomVerifier']);
 		commonEntry.setEquipmentVerifier(data['equipmentVerifier']);
 	};
@@ -1070,12 +1068,20 @@
 				return modifyRecord(v,p,record);
 			}
 		},
-		{header : "操作员",width : 200,dataIndex : 'operator'},
-		{header : "入库时间",width : 200,dataIndex : 'time' , renderer : myDateFormatByMinute},
-		{header : "HRP入库时间",width : 200,dataIndex : 'hrpTime' , renderer : myDateFormatByMinute, hidden : !sstsConfig.godownEntryShowHrpTime},
+		{header : "操作员",width : 120,dataIndex : 'operator'},
+		{header : "入库时间",width : 160,dataIndex : 'time' , renderer : myDateFormatByMinute},
+		{header : "HRP入库时间",width : 160,dataIndex : 'hrpTime' , renderer : myDateFormatByMinute, hidden : !sstsConfig.godownEntryShowHrpTime},
 		{header : "金额",width : 200,dataIndex : 'totalPrice'},
 		{header : "供应商",width : 200,dataIndex : 'supplierName'},
-		{header : "是否已有双人核对",width : 120,dataIndex : 'isHasVerifier', hidden : !sstsConfig.showDisposableGoodsGodownEntryVerifier},
+		{header : "是否已核对",width : 80,dataIndex : 'isHasVerifier', hidden : (sstsConfig.godownEntryAddCheckMode !== 1 && sstsConfig.godownEntryAddCheckMode !== 2), renderer : function(v,p,record){
+			if(v != STR_YES ){
+				return "<div style='background:red;color:#fff'>"+v+"</div>";
+			}else {
+				return "<div>"+v+"</div>";
+			}
+		}},
+		{header : "核对人",width : 120,dataIndex : 'supplyRoomVerifier', hidden : !(sstsConfig.godownEntryAddCheckMode == 1)},
+		{header : "核对时间",width : 160,dataIndex : 'verifierTime', hidden : !(sstsConfig.godownEntryAddCheckMode == 1)},
 		{id : 'operationRemark',header : "备注",width : 120,dataIndex : 'remark'}
 	];
 
@@ -1092,14 +1098,17 @@
 	    {name : 'supplierName'},
 	    {name : 'dataStatus'},
 	    {name : 'subType'},
+		{name : 'verifierTime'},
 	    {name : 'hrpTime'}
 	];
 	
 	var filters = new Ext.grid.GridFilters({
 		filters:[
 	        {type: 'string',  dataIndex: 'serialNumber'},
 	        {type: 'string',  dataIndex: 'operator'},
+			{type: 'string',  dataIndex: 'supplyRoomVerifier'},
 	        {type: 'date',  dataIndex: 'time'},
+			{type: 'date',  dataIndex: 'verifierTime'},
 	        {type: 'string',  dataIndex: 'remark'},
 	        {type: 'string',  dataIndex: 'totalPrice'},
 	        {type: 'string',  dataIndex: 'supplierName'},
@@ -1189,6 +1198,43 @@
 			commonEntry.printGodownEntryNewBatch(ids);
 			}
 		}
+	},'-',{
+		text : '设为已核对',
+		iconCls : 'btn_ext_application_edit',
+		hidden : SSTS_DisposableGoodsGodownEntryVerifier_Manager,
+		handler : function(){
+			var records = grid.getSelectionModel().getSelections();
+			if(records.length == 0){
+				showResult("请勾选需要核对的记录后再操作。");
+			}else{
+				top.Ext.MessageBox.confirm("请确认","确定要将选中的记录设为已核对吗？",function(button, text){
+					if("yes" == button){
+						var ids = "";
+						for(var i = 0;i<records.length;i++){
+							if(ids != ''){
+								ids += ";";
+							}
+							ids += records[i].data['id'];
+						}
+						Ext.Ajax.request({
+							url : WWWROOT + '/disinfectSystem/godownEntryAction!batchSaveGodownEntryVerifier.do',
+							params : {
+								ids : ids
+							},
+							success : function(response, options) {
+								var result = Ext.util.JSON.decode(response.responseText);
+								if (result.success) {
+									showResult('核对成功');
+									grid.dwrReload();
+								}else {
+									showResult(result.message);
+								}
+							}
+						})
+					}
+				});
+			}
+		}
 	});
 	
 	//导入入库单excel
@@ -1219,14 +1265,7 @@
 		plugins: filters,
 		autoExpandColumn : 'operationRemark',
 		renderTo : 'gridDiv',
-		frame : false,
-		viewConfig:{
-			getRowClass : function(record,rowIndex,rowParams,store){
-	            if(sstsConfig.showDisposableGoodsGodownEntryVerifier && record.data.isHasVerifier != STR_YES ){
-	                return 'my_row_red div';
-	            }
-			}
-		}
+		frame : false
 	}, readerDetail,
 		GodownEntryTableManager.findGodownEntryTableList,
 		null 
Index: ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js
===================================================================
diff -u -r36354 -r36685
--- ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js	(.../config.js)	(revision 36354)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zjyy/config.js	(.../config.js)	(revision 36685)
@@ -308,6 +308,8 @@
 enableInstrumentRepairManagement:true,
 //启用库位管理模块
 enableWarehousePositionModule:true,
+//一次性物品入库单核对模式
+godownEntryAddCheckMode:2,
 //开启质量监测记录审核功能
 enableQualityMonitoringReview:true
   }
\ No newline at end of file