Index: ssts-web/src/main/resources/systemset/portalPage.xml
===================================================================
diff -u -r23190 -r23222
--- ssts-web/src/main/resources/systemset/portalPage.xml	(.../portalPage.xml)	(revision 23190)
+++ ssts-web/src/main/resources/systemset/portalPage.xml	(.../portalPage.xml)	(revision 23222)
@@ -21,6 +21,15 @@
 		<portalItem title="发货管理" itemId="invoice" operationIds="SSTS_Invoice_Create,SSTS_Invoice_Update,SSTS_Invoice_Select,SSTS_Invoice_Delete" imgUrl="/themes/portalPage/img/tabs_invoice.png" itemLinkUrl="/disinfectsystem/invoice/invoiceView.jsp?editMode=true" />
 		<portalItem title="物品签收" itemId="goodsReceipt" operationIds="SSTS_Invoice_Sign" imgUrl="/themes/portalPage/img/tabs_invoiceSign.png" itemLinkUrl="/disinfectsystem/invoice/invoiceSign.jsp?resolution=1980&amp;fromdesktop=true" />
 		<portalItem title="手术仪器管理" itemId="instrumentGoods" operationIds="SSTS_Tousse_Create,SSTS_Tousse_Update,SSTS_Tousse_Select,SSTS_Tousse_Delete" imgUrl="/themes/portalPage/img/instrument.png" itemLinkUrl="/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.jsp?editMode=true" />
+
+		<portalItem title="申请单" itemId="expensiveGoodsApplication" operationIds="SSTS_ExpensiveGoodsApplication_Create,SSTS_ExpensiveGoodsApplication_Update,SSTS_ExpensiveGoodsApplication_Select,SSTS_ExpensiveGoodsApplication_Delete" imgUrl="/themes/portalPage/img/tabs_recyclingApplication.png" itemLinkUrl="/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationView.jsp" />
+		<portalItem title="自购入库" itemId="expensiveGodownEntryPurchase" operationIds="SSTS_ExpensiveGoodsPurchaseGodownEntry_Manager" imgUrl="/themes/portalPage/img/instock.png" itemLinkUrl="/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp?entryType=自购入库" />
+		<portalItem title="预入库" itemId="expensiveGodownEntryPrepareIn" operationIds="SSTS_ExpensiveGoodsPrepareGodownEntry_Manager" imgUrl="/themes/portalPage/img/preInbound.png" itemLinkUrl="/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp?entryType=预入库" />
+		<portalItem title="发货计划" itemId="expensiveInvoicePlan" operationIds="SSTS_Invoice_Create,SSTS_Invoice_Update,SSTS_Invoice_Select,SSTS_Invoice_Delete" imgUrl="/themes/portalPage/img/3516.png" itemLinkUrl="/disinfectsystem/assestManagement/expensiveGoods/invoice/expensiveGoodsInvoiceView.jsp?editMode=true" />
+		<portalItem title="发货管理" itemId="expensiveInvoice" operationIds="SSTS_Invoice_Create,SSTS_Invoice_Update,SSTS_Invoice_Select,SSTS_Invoice_Delete" imgUrl="/themes/portalPage/img/tabs_invoice.png" itemLinkUrl="/disinfectsystem/invoice/invoiceView.jsp?editMode=true" />
+		<portalItem title="发票管理" itemId="expensiveBill" operationIds="SSTS_ExpensiveGoodsBill_Manager" imgUrl="/themes/portalPage/img/consumableInvoice.png" itemLinkUrl="/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.jsp" />
+		<portalItem title="结算管理" itemId="expensiveStockTake" operationIds="SSTS_ExpensiveGoodsStockTake_Manager" imgUrl="/themes/portalPage/img/consumableSettlement.png" itemLinkUrl="/disinfectsystem/invoice/disinfectsystem/reportforms/stocktakeView.jsp" />
+
 		<portalItem title="使用记录" itemId="useRecord" operationIds="SSTS_UseRecord_Create,SSTS_UseRecord_Update,SSTS_UseRecord_Select,SSTS_UseRecord_Review,SSTS_UseRecord_Delete" imgUrl="/themes/portalPage/img/tabs_useRecord.png" itemLinkUrl="/disinfectsystem/useRecord/useRecordView.jsp?editMode=true" />
 		<portalItem title="召回信息" itemId="recallRecord" operationIds="SSTS_RecallRecord_Select" imgUrl="/themes/portalPage/img/1528.png" itemLinkUrl="/disinfectsystem/recallRecord/recallRecordViewForDepart.jsp" />
 		<portalItem title="质量监测" itemId="qualityMonitoring" operationIds="SSTS_QualityRecord_Create,SSTS_QualityRecord_Update,SSTS_QualityRecord_Select,SSTS_QualityRecord_Delete" imgUrl="/themes/portalPage/img/tabs_qualityMonitoring.png" itemLinkUrl="/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp?editMode=true" />
@@ -32,15 +41,8 @@
 		<portalItem title="培训管理" itemId="training" operationIds="SSTS_TrainingManage_Add,SSTS_TrainingManage_Update,SSTS_TrainingManage_Delete" imgUrl="/themes/portalPage/img/training.png" itemLinkUrl="/knowledge/view.do?moduleId=trainingManage" />
 		<portalItem title="高级视图" itemId="enterpriseView" operationIds="" imgUrl="/themes/portalPage/img/reportshop.png" itemLinkUrl="/homepage/portal.jsp" />
 
-		<portalItem title="申请单" itemId="expensiveGoodsApplication" operationIds="SSTS_ExpensiveGoodsApplication_Create,SSTS_ExpensiveGoodsApplication_Update,SSTS_ExpensiveGoodsApplication_Select,SSTS_ExpensiveGoodsApplication_Delete" imgUrl="/themes/portalPage/img/tabs_recyclingApplication.png" itemLinkUrl="/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationView.jsp" />
-		<portalItem title="自购入库" itemId="expensiveGodownEntryPurchase" operationIds="SSTS_ExpensiveGoodsPurchaseGodownEntry_Manager" imgUrl="/themes/portalPage/img/3517.png" itemLinkUrl="/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp?entryType=自购入库" />
-		<portalItem title="预入库" itemId="expensiveGodownEntryPrepareIn" operationIds="SSTS_ExpensiveGoodsPrepareGodownEntry_Manager" imgUrl="/themes/portalPage/img/1528.png" itemLinkUrl="/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsGodownEntryView.jsp?entryType=预入库" />
-		<portalItem title="发货计划" itemId="expensiveInvoicePlan" operationIds="SSTS_Invoice_Create,SSTS_Invoice_Update,SSTS_Invoice_Select,SSTS_Invoice_Delete" imgUrl="/themes/portalPage/img/3516.png" itemLinkUrl="/disinfectsystem/assestManagement/expensiveGoods/invoice/expensiveGoodsInvoiceView.jsp?editMode=true" />
-		<portalItem title="发货管理" itemId="expensiveInvoice" operationIds="SSTS_Invoice_Create,SSTS_Invoice_Update,SSTS_Invoice_Select,SSTS_Invoice_Delete" imgUrl="/themes/portalPage/img/tabs_invoice.png" itemLinkUrl="/disinfectsystem/invoice/invoiceView.jsp?editMode=true" />
-		<portalItem title="发票管理" itemId="expensiveBill" operationIds="SSTS_ExpensiveGoodsBill_Manager" imgUrl="/themes/portalPage/img/tabs_useRecord.png" itemLinkUrl="/disinfectsystem/assestManagement/expensiveGoods/expensiveGoodsBill/expensiveGoodsBillView.jsp" />
-		<portalItem title="结算管理" itemId="expensiveStockTake" operationIds="SSTS_ExpensiveGoodsStockTake_Manager" imgUrl="/themes/portalPage/img/tousse.png" itemLinkUrl="/disinfectsystem/invoice/disinfectsystem/reportforms/stocktakeView.jsp" />
-		<portalItem title="待办任务" itemId="myUnFinishedTask" operationIds="SSTS_ExpensiveGoodsWorkFlowApprovalTask_Manager" imgUrl="/themes/portalPage/img/tabs_sterilizationLoading.png" itemLinkUrl="/systemmanage/workFlow/workFlowApprovalTask.jsp?FormType=高值耗材申请单" />
-		<portalItem title="已办任务" itemId="myFinishedTask" operationIds="SSTS_ExpensiveGoodsWorkFlowFinishedApprovalTask_Manager" imgUrl="/themes/portalPage/img/training.png" itemLinkUrl="/systemmanage/workFlow/workFlowFinishedApprovalTask.jsp" />
+		<portalItem title="待办任务" itemId="myUnFinishedTask" operationIds="SSTS_ExpensiveGoodsWorkFlowApprovalTask_Manager" imgUrl="/themes/portalPage/img/todo.png" itemLinkUrl="/systemmanage/workFlow/workFlowApprovalTask.jsp?FormType=高值耗材申请单" />
+		<portalItem title="已办任务" itemId="myFinishedTask" operationIds="SSTS_ExpensiveGoodsWorkFlowFinishedApprovalTask_Manager" imgUrl="/themes/portalPage/img/allreadydo.png" itemLinkUrl="/systemmanage/workFlow/workFlowFinishedApprovalTask.jsp" />
 		<portalItem title="高级视图" itemId="expensiveEnterpriseView" operationIds="" imgUrl="/themes/portalPage/img/reportshop.png" itemLinkUrl="/expensivegoodshomepage/portal.jsp" />
 	</portalPage>
 </portal>
\ No newline at end of file
Index: ssts-web/src/main/webapp/themes/portalPage/img/allreadydo.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/expensivegoodshomepage/portalPage.js
===================================================================
diff -u -r23211 -r23222
--- ssts-web/src/main/webapp/expensivegoodshomepage/portalPage.js	(.../portalPage.js)	(revision 23211)
+++ ssts-web/src/main/webapp/expensivegoodshomepage/portalPage.js	(.../portalPage.js)	(revision 23222)
@@ -421,8 +421,8 @@
 		}
 		//只显示高值耗材的几个图标和高级视图
 		if(itemId == 'expensiveGoodsApplication' || itemId == 'expensiveGodownEntryPurchase' || itemId == 'expensiveGodownEntryPrepareIn'
-			|| itemId == 'expensiveInvoicePlan' || itemId == 'expensiveInvoice' || itemId == 'expensiveBill'
-				|| itemId == 'expensiveStockTake' || itemId == 'myUnFinishedTask' || itemId == 'myFinishedTask' || itemId == 'expensiveEnterpriseView'){
+			|| itemId == 'expensiveInvoicePlan' || itemId == 'expensiveInvoice' || itemId == 'expensiveBill' || itemId == 'expensiveStockTake' 
+				|| itemId == 'useRecord' || itemId == 'myUnFinishedTask' || itemId == 'myFinishedTask' || itemId == 'expensiveEnterpriseView'){
 			returnContent += '<li id="'+itemId+'" class="'+portalPage['itemStyleClass']+'" title="'+item['title']+'" href="'+item['itemLinkUrl']+'">';
 			returnContent += '<div class="imgDvi"><p><a href="#" ><span><img width=86 height=86 src="' + itemUrl + '"></span></a></P></div>';
 			returnContent += '<a class="icon-text" href="javascript:void(0);"><span>'+item['title']+'</span></a></li>';
Index: ssts-web/src/main/webapp/themes/portalPage/img/todo.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/themes/portalPage/img/consumableSettlement.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/themes/portalPage/img/instock.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/themes/portalPage/img/consumableInvoice.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/themes/portalPage/img/preInbound.png
===================================================================
diff -u
Binary files differ