Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/expensiveGoodPurchasePlanView.jsp
===================================================================
diff -u -r20827 -r23083
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/expensiveGoodPurchasePlanView.jsp (.../expensiveGoodPurchasePlanView.jsp) (revision 20827)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/expensiveGoodPurchasePlanView.jsp (.../expensiveGoodPurchasePlanView.jsp) (revision 23083)
@@ -1,4 +1,5 @@
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier,com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry "%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.ExpensiveGoodsSupplier"%>
<%@ page contentType="text/html; charset=UTF-8"%>
<%@ include file="/common/taglibs.jsp"%>
<%@ include file="/common/includeExtJsAndCss.jsp"%>
@@ -16,7 +17,7 @@
-入库单信息
+采购单信息
@@ -37,8 +38,8 @@
Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/expensiveGoodPurchasePlanView.js
===================================================================
diff -u -r20847 -r23083
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/expensiveGoodPurchasePlanView.js (.../expensiveGoodPurchasePlanView.js) (revision 20847)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/expensiveGoodPurchasePlanView.js (.../expensiveGoodPurchasePlanView.js) (revision 23083)
@@ -42,10 +42,10 @@
return 3;
}}
-//供应商
+//供应商(高值耗材)数据源
var supplierStore = new Ext.data.Store({
proxy : new Ext.data.HttpProxy({
- url : WWWROOT + '/disinfectSystem/baseData/supplierAction!getSupplierData.do?supplierType='+encodeURI(supplier),
+ url : WWWROOT + '/disinfectSystem/baseData/expensiveGoodsSupplierAction!getSupplierData.do?supplierType='+encodeURI(expensiveGoodsSupplier),
method : 'POST'
}),
reader : new Ext.data.JsonReader({
@@ -57,10 +57,10 @@
])
});
-//生产商
+//生产厂家(高值耗材)数据源
var madeCompanyStore = new Ext.data.Store({
proxy : new Ext.data.HttpProxy({
- url : WWWROOT + '/disinfectSystem/baseData/supplierAction!getSupplierData.do?supplierType='+encodeURI(madeCompany),
+ url : WWWROOT + '/disinfectSystem/baseData/expensiveGoodsSupplierAction!getSupplierData.do?supplierType='+encodeURI(expensiveGoodsManufacturer),
method : 'POST'
}),
reader : new Ext.data.JsonReader({
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r22914 -r23083
--- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 22914)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 23083)
@@ -358,8 +358,8 @@
singleClickExpand:singleClickExpandTree,
hidden:SSTS_PurchasePlan_Manager,
children:[
- {hidden :SSTS_PurchasePlan_Manager,text:"采购计划",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.jsp',hrefTarget:linkTarget,leaf:true}
- //{hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材采购计划",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/expensiveGoodPurchasePlanView.jsp',hrefTarget:linkTarget,leaf:true}
+ {hidden :SSTS_PurchasePlan_Manager,text:"采购计划",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/goodPurchasePlanView.jsp',hrefTarget:linkTarget,leaf:true},
+ {hidden :SSTS_ExpensiveGoods_Hidden_Menu||SSTS_ExpensiveGoodsPurcahsePlan_Hidden_Manager,text:"高值耗材采购计划",href:WWWROOT+'/disinfectsystem/assestManagement/godownEntry/expensiveGoodPurchasePlanView.jsp',hrefTarget:linkTarget,leaf:true}
]
},{
text:"器械仓库管理",
Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r22914 -r23083
--- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 22914)
+++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 23083)
@@ -1257,6 +1257,12 @@
SSTS_ExpensiveGoodsWorkFlow_Hidden_Manager = false;
+//高值耗材采购计划管理
+var SSTS_ExpensiveGoodsPurcahsePlan_Hidden_Manager = true;
+
+SSTS_ExpensiveGoodsPurcahsePlan_Hidden_Manager = false;
+
+
/* 高值耗材 */
/**
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r22914 -r23083
--- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 22914)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 23083)
@@ -271,6 +271,9 @@
+
+
+