Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.jsp
===================================================================
diff -u -r18462 -r23264
--- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.jsp	(.../borrowingTousseView.jsp)	(revision 18462)
+++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.jsp	(.../borrowingTousseView.jsp)	(revision 23264)
@@ -72,6 +72,13 @@
 </operation:authorize>
 //归还所有物品end
 
+//借物单审核start
+var SSTS_borrow_Review = true;
+<operation:authorize ifAnyGranted="SSTS_borrow_Review">
+SSTS_borrow_Review = false;
+</operation:authorize>
+//借物单审核end
+
 var returnStatusArr = new Array();
 returnStatusArr.push('<%=InvoicePlan.RETURN_STATUS_UNRETURNED%>');//未归还
 returnStatusArr.push('<%=InvoicePlan.RETURN_STATUS_PARTIALLY_RETURNED%>');//部分归还
Index: ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js
===================================================================
diff -u -r18561 -r23264
--- ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js	(.../borrowingTousseView.js)	(revision 18561)
+++ ssts-web/src/main/webapp/disinfectsystem/borrow/borrowingTousseView.js	(.../borrowingTousseView.js)	(revision 23264)
@@ -9,10 +9,12 @@
  * @returns {boolean}
  */
 function hideConfirmBtn() {
-	if (!validateIsSupplyRoomUser()){
-		return true;
+	//如果审核方式为按权限审核且有审核权限 或者 未配置审核方式属当前操作人为供应室用户时,可提供审核权限
+	if(sstsConfig.isNeedApplyRoomConfirm && (sstsConfig.borrowInvoicePlanReviewType == 'operation' && !SSTS_borrow_Review 
+			|| !sstsConfig.borrowInvoicePlanReviewType && validateIsSupplyRoomUser())){
+		return false;
 	}
-	return !sstsConfig.isNeedApplyRoomConfirm;
+	return true;
 }
 
 function printBorrowApplication(grid) {
@@ -228,7 +230,7 @@
 	var rows = grid.getSelectedRow();
 	var length = rows.length;
 	if (length < 1){
-		Ext.Msg.alert('警告','请至少选中一个!');
+		Ext.Msg.alert('警告','请至少选中一条借物单!');
 		return;
 	}
 	var ids = getRowsPropertiesWithComma(rows,'id');
@@ -264,7 +266,9 @@
 					{header : "发货状态",width : 70,dataIndex : 'deliverStatus',renderer : renderColor},
 					{header : "归还状态",width : 70,dataIndex : 'returnStatus',renderer : renderColor2},
 					{header : "科室",width : 100,dataIndex : 'depart'},
-					{header : "供应室确认状态",width : 100,dataIndex : 'borrowConfirmStatus',hidden : !sstsConfig.isNeedApplyRoomConfirm},
+					{header : sstsConfig.borrowInvoicePlanReviewType == 'operation' ? '审核状态' : "供应室确认状态",width : 100,dataIndex : 'borrowConfirmStatus',hidden : !sstsConfig.isNeedApplyRoomConfirm},
+					{header : "审核人",width : 100,dataIndex : "borrowReviewer",hidden : !sstsConfig.isNeedApplyRoomConfirm},
+					{header : "审核时间",width : 150,dataIndex : "borrowReviewTime",hidden : !sstsConfig.isNeedApplyRoomConfirm},
 					{header : "发货单状态",dataIndex : 'invoiceStatus',hidden : true},
 					{header : "操作",width : 350,renderer : function(v, p, record) {
 							var invoiceStatus = record.data.invoiceStatus;
@@ -277,8 +281,12 @@
 							var returnButton = "";
 							if (invoiceStatus == '') {
 								//东莞东华医院要求:借物申请单供应室要增加审核功能
-								if (sstsConfig.isNeedApplyRoomConfirm && validateIsSupplyRoomUser() && borrowConfirmStatus == '待审核'){
-									return "<input type=\"button\" value=\"审核\" onclick=\"confirmBorrowObj.confirmBorrowById('" + id + "')\">";
+								if (sstsConfig.isNeedApplyRoomConfirm && borrowConfirmStatus == '待审核'){
+									//如果审核方式为按权限审核且有审核权限 或者 未配置审核方式属当前操作人为供应室用户时,可提供审核权限
+									if(sstsConfig.borrowInvoicePlanReviewType == 'operation' && !SSTS_borrow_Review 
+											|| !sstsConfig.borrowInvoicePlanReviewType && validateIsSupplyRoomUser()){
+										return "<input type=\"button\" value=\"审核\" onclick=\"confirmBorrowObj.confirmBorrowById('" + id + "')\">";
+									}
 								}
 								return null;
 							} else if (invoiceStatus == '部分签收') {
@@ -320,6 +328,8 @@
 				{name : 'remark'}, 
 				{name : 'lendGoodsBrief'}, 
 				{name : 'borrowConfirmStatus'},
+				{name : 'borrowReviewer'},
+				{name : 'borrowReviewTime'},
 				{name : 'invoiceStatus'}
 			];
 
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r23258 -r23264
--- ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 23258)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 23264)
@@ -44,6 +44,7 @@
       <operation operationId="SSTS_borrow_Delete" operationName="���ﵥɾ��"></operation>
       <operation operationId="SSTS_borrow_InsteadReturn" operationName="���黹��Ʒ"></operation>
       <operation operationId="SSTS_borrow_returnAll" operationName="�黹������Ʒ"></operation>
+      <operation operationId="SSTS_borrow_Review" operationName="���"></operation>
     </modelName>
     
     <modelName modleName="�������ģ��">
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java
===================================================================
diff -u -r23246 -r23264
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java	(.../InvoicePlan.java)	(revision 23246)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/invoicemanager/InvoicePlan.java	(.../InvoicePlan.java)	(revision 23264)
@@ -138,6 +138,16 @@
 	 */
 	private String borrowConfirmStatus;
 	
+	/**
+	 * 借物单审核人
+	 */
+	private String borrowReviewer;
+	
+	/**
+	 * 借物单审核时间
+	 */
+	private Date borrowReviewTime;
+	
 	public static final Integer UNREAD = 0;
 	public static final Integer READED = 1;
 	
@@ -1077,6 +1087,22 @@
 		this.borrowConfirmStatus = borrowConfirmStatus;
 	}
 	
+	public String getBorrowReviewer() {
+		return borrowReviewer;
+	}
+
+	public void setBorrowReviewer(String borrowReviewer) {
+		this.borrowReviewer = borrowReviewer;
+	}
+
+	public Date getBorrowReviewTime() {
+		return borrowReviewTime;
+	}
+
+	public void setBorrowReviewTime(Date borrowReviewTime) {
+		this.borrowReviewTime = borrowReviewTime;
+	}
+
 	@Column(length = 4000)
 	public String getTousseBarcodes() {
 		return tousseBarcodes;
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java
===================================================================
diff -u -r20702 -r23264
--- ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java	(.../BorrowRecordManagerImpl.java)	(revision 20702)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/service/BorrowRecordManagerImpl.java	(.../BorrowRecordManagerImpl.java)	(revision 23264)
@@ -26,6 +26,7 @@
 import com.forgon.directory.vo.LoginUserData;
 import com.forgon.disinfectsystem.barcode.service.BarcodeManager;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
+import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveDisposablegoods;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.borrowrecord.BorrowRecord;
@@ -38,6 +39,7 @@
 import com.forgon.log.model.Log;
 import com.forgon.log.service.LogManager;
 import com.forgon.tools.SqlBuilder;
+import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.ObjectDao;
 
 public class BorrowRecordManagerImpl implements BorrowRecordManager {
@@ -244,8 +246,13 @@
 		try {
 			this.checkIsSupplyRoom("你不是供应室用户!不能审核该借物单!");
             if (StringUtils.isNotBlank(ids)){
-                String hql = "update InvoicePlan po set po.borrowConfirmStatus = ? where 1=1 and ";
-                String idsHql = SqlBuilder.createStatusIn("id", ids, null);
+                String hql = "update InvoicePlan po set borrowConfirmStatus = ? , borrowReviewer = '"+ AcegiHelper.getLoginUserFullName() +"' ";
+                if(DatabaseUtil.isSqlServer(CssdUtils.getConfigProperty("database"))){
+                	hql += " , borrowReviewTime = GETDATE() ";
+                }else if(DatabaseUtil.isSqlServer(CssdUtils.getConfigProperty("database"))){
+                	hql += " , borrowReviewTime = sysdate ";
+                }
+                String idsHql = " where " + SqlBuilder.createStatusIn("id", ids, null);
                 String[] split = ids.split(Constants.SQL_IN_SEPARATOR);
 				if (!this.checkIsNeedToConfirm(split)){
 					throw new ParameterException("有不符合审核的单据存在!");
Index: ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/config.js
===================================================================
diff -u -r23252 -r23264
--- ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/config.js	(.../config.js)	(revision 23252)
+++ ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/config.js	(.../config.js)	(revision 23264)
@@ -1,4 +1,4 @@
-var sstsConfig = {
+var sstsConfig = {
   // 禁用标识牌功能
   disableIdCard : false,
   // 回收时科室显示结算科室
@@ -62,6 +62,10 @@
   recyclingUserDefault : true ,
   //添加回收申请单是否加载申领模版
   isLoadApplyTemplateForAddRecycleRecord : true,
+  //借物单是否需要审核
+  isNeedApplyRoomConfirm : true,
+  //借物单审核类型(默认为由供应室用户审核),配置为有审核权限的用户审核
+  borrowInvoicePlanReviewType : 'operation',
   //是否启用灭菌区工作量报表
   enableSterilizationAreaWorkLoadReport : true,
   //标识牌绑定篮筐