Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r20562 -r20846
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 20562)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 20846)
@@ -169,8 +169,10 @@
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="${ctx}/js/Ext2CompUtil.js"></script>
 <script type="text/javascript">
-var curUserName = '${userName}';
-var currentOrgUnitName = '${depart}';
+var curUserName = '${userName}';  //登录用户全名
+var currentOrgUnitName = '${depart}';  //登录用户的当前科室名称
+var dirOrgCode = '<%=request.getAttribute("departCoding")%>';  //登录用户的当前科室编码
+
 var comboApplicationForm = '<%=InvoicePlan.TYPE_COMBO_FORM%>';//通用申请单
 var recyclingCreateApplicationForm = '<%=InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION%>';//回收申请单
 var tousseApplicationForm = '<%=InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM%>';//器械包申请单
@@ -183,7 +185,7 @@
 var foreignPorxyApplicationForm = '<%=InvoicePlan.TYPE_FOREIGNPROXYDISINFECTION%>';//外部代理灭菌单
 var foreignTousseApplicationForm = '<%=InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION%>';//外来器械包申请单
 var expansionTousseForm = '<%=InvoicePlan.TYPE_TOUSSE_EXPANSION_FORM%>';//普通器械包扩充申请单
-var dirOrgCode = '<%=request.getAttribute("departCoding")%>';
+var expensiveGoodsForm = '<%=InvoicePlan.TYPE_EXPENSIVEGOODS_FORM%>';//高值耗材申请单
 var tousseTypeCustom = '<%=TousseDefinition.PACKAGE_TYPE_CUSTOM%>';//自定义器械包
 var tousseTypeDisinfect = '<%=TousseDefinition.PACKAGE_TYPE_DISINFECTION%>;<%=TousseDefinition.PACKAGE_TYPE_STERILIZATION%>';//消毒物品和灭菌物品
 var endCause = ${endCause};
@@ -335,6 +337,49 @@
 	SSTS_ForeignTousseApplication_Return = false;
 </operation:authorize>
 
+
+/**
+ * 《高值耗材申请单添加》权限
+ */
+var SSTS_ExpensiveGoodsApplication_Create = true;
+<operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsApplication_Create">
+	SSTS_ExpensiveGoodsApplication_Create = false;
+</operation:authorize>
+
+/**
+ * 《高值耗材申请单修改》权限
+ */
+var SSTS_ExpensiveGoodsApplication_Update = true;
+<operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsApplication_Update">
+	SSTS_ExpensiveGoodsApplication_Update = false;
+</operation:authorize>
+
+/**
+ * 《高值耗材申请单查询》权限
+ */
+var SSTS_ExpensiveGoodsApplication_Select = true;
+<operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsApplication_Select">
+	SSTS_ExpensiveGoodsApplication_Select = false;
+</operation:authorize>
+
+/**
+ * 《高值耗材申请单删除》权限
+ */
+var SSTS_ExpensiveGoodsApplication_Delete = true;
+<operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsApplication_Delete">
+	SSTS_ExpensiveGoodsApplication_Delete = false;
+</operation:authorize>
+
+if (!sstsConfig.enableExpensiveGoods) {
+	SSTS_ExpensiveGoodsApplication_Create = true;
+	SSTS_ExpensiveGoodsApplication_Update = true;
+	SSTS_ExpensiveGoodsApplication_Select = true;
+	SSTS_ExpensiveGoodsApplication_Delete = true;
+}
+
+
+
+
 //回收状态数组
 var recyclingStatusArr = new Array();
 recyclingStatusArr.push('<%=InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE%>');
@@ -437,6 +482,9 @@
 	.script("${ctx}/dwr/interface/DataSynchronizationTableManager.js")
 	.script("${ctx}/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js")
 	
+	<!-- 高值耗材申请单 -->
+	.script("${ctx}/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js")
+	
 	<!-- 自定义器械包 -->
 	.script("${ctx}/disinfectsystem/basedatamanager/tousse/customTousseForm.js")