Index: ssts-web/src/main/webapp/themes/portalPage/img/returnGoods.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.js
===================================================================
diff -u -r39730 -r40622
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.js	(.../returnGoodsRecordView.js)	(revision 39730)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.js	(.../returnGoodsRecordView.js)	(revision 40622)
@@ -10,30 +10,41 @@
 		return false;
 	}
 	var ids = null;
-	for (var i = 0, len = records.length; i < len; i++) {
-		if (ids == null) {
-			ids = records[i].data['id'];
-		} else {
-			ids = ids + ';' + records[i].data['id'];
+	var msg = '';
+	for(var i=0;i<records.length;i++){
+		if(records[i].data.signStatus !== '待审核'){
+			msg = '仅允许删除“待审核”的退货记录';
+			break;
+		}else {
+			if (ids == null) {
+				ids = records[i].data['id'];
+			} else {
+				ids = ids + ';' + records[i].data['id'];
+			}
 		}
 	}
-	top.Ext.MessageBox.confirm("请确认", "是否确定要删除选中的" + entityName + "信息？",
-		function (button, text) {
-			if ("yes" == button) {
-				Ext.Ajax.request({
-					url: WWWROOT + '/disinfectSystem/returnGoodsRecordAction!deleteReturnGoodsRecord.do',
-					params: { ids: ids },
-					success: function (response, options) {
-						showResult(response.responseText);
+	if(msg !== ''){
+		showResult(msg);
+		return
+	}
+	top.Ext.MessageBox.confirm("请确认", "是否确定要删除选中的" + entityName + "信息？",function (button, text) {
+		if ("yes" == button) {
+			Ext.Ajax.request({
+				url: WWWROOT + '/disinfectSystem/returnGoodsRecordAction!deleteWaiteReviewPreReturnGoodsRecord.do',
+				params: { ids: ids },
+				success: function (response, options) {
+					var result = response.responseText;
+					showResult(result.message);
+					if(result.success){
 						grid.dwrReload();
-					},
-					failure: function (response, options) {
-						showResult(response.responseText);
 					}
-				});
-			}
+				},
+				failure: function (response, options) {
+					showResult(response.responseText);
+				}
+			});
 		}
-	);
+	});
 }
 
 var loadFormData = function (grid) {
@@ -56,10 +67,13 @@
 	if(remark !== '' && remark.indexOf('聚合包退货') >= 0){
 		isComboTousseInstance = true;
 	}
+	var enableBtn = false;
+	var signStatus = records[0].data['signStatus'];
+
 	if (type == '器械包') {
-		addAndEditReturnTousseRecord(id, false, isComboTousseInstance);
+		addAndEditReturnTousseRecord(id, enableBtn, isComboTousseInstance);
 	} else {//一次性物品
-		addAndEditReturnGoodsRecord(id, false);
+		addAndEditReturnGoodsRecord(id, enableBtn, signStatus);
 	}
 	ReturnGoodsRecordTableManager.getReturnGoodsRecordById(id, setReturnGoodsRecordForm);
 };
@@ -105,7 +119,13 @@
 		{ header: "退货时间", width: 120, dataIndex: 'returnTime', renderer: myDateFormatByMinute },
 		{ header: "退货人", width: 120, dataIndex: 'returnOfPeople' },
 		{ header: "退货科室", width: 120, dataIndex: 'depart' },
-		{ header: "退货状态", width: 120, dataIndex: 'signStatus' },
+		{ header: "退货状态", width: 120, dataIndex: 'signStatus',hidden:!sstsConfig.enableGeneratingDisposableGoodsApplyAndReturnUsingThirdPartyData,renderer:function(v, p, record){
+			var color = '';
+			if (v == '待审核') {
+				color = '#ffff00';//黄色
+			}
+			return "<p style='background-color:" + color + ";'>" + v + "</p>";
+		} },
 		{ header: "类型", width: 80, dataIndex: 'type' },
 		{ header: "金额", width: 80, dataIndex: 'settlementPrice' },  //每一张退货单的金额（陈家儒改）
 		{
@@ -163,6 +183,13 @@
 		handler: function () {
 			addAndEditReturnTousseRecord(0, true);
 		}
+	}, '-', {
+		text: '删除',
+		iconCls: 'btn_ext_application_del',
+		hidden: !sstsConfig.enableGeneratingDisposableGoodsApplyAndReturnUsingThirdPartyData,
+		handler: function () {
+			deleteReturnGoodsRecord(grid);
+		}
 	}];
 
 	grid = new Ext.ux.ForgonPageGrid({
Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
===================================================================
diff -u -r40302 -r40622
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 40302)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 40622)
@@ -213,6 +213,26 @@
 	setTotalMoney();
 }
 
+//添加待审核的一次性物品
+function addNewDiposableGoodsItems(diposableGood){
+	if(returnGoodsItemStore.getCount() > 0){
+		for(var i=0;i<returnGoodsItemStore.getCount();i++){
+			var returnGoodsItemItems = returnGoodsItemStore.getAt(i)
+			if(returnGoodsItemItems.data.tousseName == diposableGood.showName){
+				returnGoodsItemItems.set('disposableGoodsID',diposableGood.disposableGoodsID);
+				returnGoodsItemItems.set('disposableGoodsStockID',diposableGood.disposableGoodsStockID);
+				returnGoodsItemItems.set('disposableGoodsBatchID',diposableGood.disposableGoodsBatchID);
+				returnGoodsItemItems.set('disposableGoodsBatchStockID',diposableGood.disposableGoodsBatchStockID);
+				returnGoodsItemItems.set('barcode',diposableGood.barcode);
+				returnGoodsItemItems.set('batchNumber',diposableGood.batchNumber);
+				returnGoodsItemItems.set('expDate',diposableGood.expDate);
+				returnGoodsItemItems.set('id',diposableGood.id);
+				break;
+			}
+		}
+	}
+}
+
 // 添加高值一次性物品到grid
 function addExpensiveDisposablegoodsItems(diposableGood) {
 	if (isExpensiveDisposablegoodsRepeat(diposableGood)) {
@@ -440,7 +460,7 @@
 }
 
 //扫描条码加载物品
-function loadReturnDiposableGoodsItem() {
+function loadReturnDiposableGoodsItem(signStatus) {
 	var barcode = top.Ext.getCmp('barcode2').getValue();
 	top.Ext.getCmp('barcode2').setValue('');// 清除条码
 	var depart = getCurrentDepart();
@@ -497,6 +517,8 @@
 				}
 				if (resultObj.diposableGood.goodsType == '高值耗材') {
 					addExpensiveDisposablegoodsItems(resultObj.diposableGood);
+				}else if(signStatus == '待审核'){
+					addNewDiposableGoodsItems(resultObj.diposableGood);
 				} else {
 					onLoadDiposableGoodsInfo(resultObj.diposableGood);
 				}
@@ -573,7 +595,7 @@
 }
 
 //FSSDERMYY-28：保存一次性物品退货
-function saveReturnGoodsFunction(saveType){
+function saveReturnGoodsFunction(saveType, actionType){
 	if (!form.getForm().isValid()) {
 		showResult('请正确填写表单各值');
 		return false;
@@ -583,6 +605,8 @@
 		showResult('退货详细信息列表不能为空');
 		return false;
 	}
+
+	top.Ext.getCmp("actionType").setValue(actionType);
 	top.Ext.MessageBox.confirm("请确认", "是否保存" + entityName + "信息？", function (btn) {
 		if (btn == 'yes') {
 
@@ -833,7 +857,7 @@
 }
 
 //加载物品
-function addAndEditReturnGoodsRecord(id, enableBtn) {
+function addAndEditReturnGoodsRecord(id, enableBtn, signStatus) {
 	editableConfig.editable = enableBtn;
 	var diposableGoodsStore = new Ext.data.Store({
 		pageSize: 100,
@@ -1056,6 +1080,14 @@
 					name: 'projectName',
 					id: 'projectName'
 				}, {
+					xtype: 'hidden',
+					name: 'actionType',
+					id: 'actionType'
+				}, {
+					xtype: 'hidden',
+					name: 'returnTime',
+					id: 'hiddenReturnTime'
+				}, {
 					columnWidth: .5,
 					layout: 'form',
 					labelWidth: labelWidth,
@@ -1089,6 +1121,9 @@
 						listeners: {
 							render: function () {  //一次性物品的的退货时间，取服务器时间 cjr）
 								(!id) ? setStartDate(top.Ext, 'yyyy/MM/dd HH:mm', 'returnTime') : (function () { })();
+								setTimeout(function(){
+									top.Ext.getCmp("hiddenReturnTime").setValue(top.Ext.getCmp("returnTime").getRawValue());
+								}, 500);
 							}
 						}
 
@@ -1379,7 +1414,7 @@
 								text: '扫描条码  :'
 							}, {
 								xtype: 'textfield',
-								disabled: !enableBtn,
+								disabled: !(enableBtn || signStatus == '待审核'),
 								id: 'barcode2',
 								name: 'barcode2',
 								width: 200,
@@ -1388,7 +1423,7 @@
 									render: function (c) {
 										c.getEl().on('keypress', function (e) {
 											if (e.getKey() == 13) {// 输入;号键，grid重新加载
-												loadReturnDiposableGoodsItem();
+												loadReturnDiposableGoodsItem(signStatus);
 											}
 										});
 									}
@@ -1523,16 +1558,24 @@
 				if(id){
 					printReturnGoodsFunction();
 				}else {
-					saveReturnGoodsFunction(1);
+					saveReturnGoodsFunction(1,1);
 				}
 			}
 		}, {
+			text: '审核并保存',
+			id: 'saveBtn',
+			hidden: SSTS_ReturnGoodsRecord_Create && SSTS_ReturnGoodsRecord_Update && !sstsConfig.enableGeneratingDisposableGoodsApplyAndReturnUsingThirdPartyData && signStatus !== '待审核',
+			disabled:!(signStatus == '待审核' || (signStatus !== '待审核' && enableBtn)),
+			handler: function () {
+				saveReturnGoodsFunction(0,2);
+			}
+		}, {
 			text: '保存',
 			id: 'saveBtn',
 			hidden: SSTS_ReturnGoodsRecord_Create && SSTS_ReturnGoodsRecord_Update,
-			disabled: !enableBtn,
+			disabled:!(signStatus == '待审核' || (signStatus !== '待审核' && enableBtn)),
 			handler: function () {
-				saveReturnGoodsFunction(0);
+				saveReturnGoodsFunction(0,1);
 			}
 		}, {
 			text: '取消',
@@ -1680,6 +1723,7 @@
 	top.Ext.getCmp("operator").setValue(returnGoodsRecord.operator);
 	top.Ext.getCmp("depart").setValue(returnGoodsRecord.depart);
 	top.Ext.getCmp("returnTime").setValue(returnGoodsRecord.returnTime);
+
 	top.Ext.getCmp("remark").setValue(returnGoodsRecord.remark);
 	top.Ext.getCmp("returnOfPeople").setValue(returnGoodsRecord.returnOfPeople);
 	top.Ext.getCmp("departCoding").setValue(departCoding);
@@ -1688,6 +1732,7 @@
 	var warehouse = top.Ext.getCmp("warehouse");
 	if (warehouse != null) {
 		warehouse.setValue(returnGoodsRecord.warehouseName);
+		top.Ext.getCmp('warehouseID').setValue(returnGoodsRecord.warehouseID);
 	}
 
 	if (sstsConfig.enableStoreCode && isShowStoreCodeCombo(departCoding)) {
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js
===================================================================
diff -u -r40614 -r40622
--- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js	(.../config.js)	(revision 40614)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/config.js	(.../config.js)	(revision 40622)
@@ -94,6 +94,8 @@
   disposableGoodsInventorySerialNumber:true,	  
   //启用发货管理的一次性物品树状结构模式
   enableTheDisposableGoodsTreeModeForiInvoiceView:true,
+  //桌面快捷图标配置
+  desktopShortcutIconsConfig:["退货记录管理","外来器械申请"],
   //启用第三方数据生成一次性物品申请单和退货单功能
   enableGeneratingDisposableGoodsApplyAndReturnUsingThirdPartyData:true
 }
\ No newline at end of file
Index: ssts-web/src/main/resources/systemset/portalPage.xml
===================================================================
diff -u -r40302 -r40622
--- ssts-web/src/main/resources/systemset/portalPage.xml	(.../portalPage.xml)	(revision 40302)
+++ ssts-web/src/main/resources/systemset/portalPage.xml	(.../portalPage.xml)	(revision 40622)
@@ -59,6 +59,7 @@
 		<portalItem type="1" system="1" title="自定义表单" itemId="customform" operationIds="SSTS_CustomFormInput_Create" imgUrl="/themes/portalPage/img/customForms.png" itemLinkUrl="/disinfectsystem/customform/forminstanceView.jsp" />
 		<portalItem type="1" system="1" title="器械包库存" itemId="tousseGoodsStockView" operationIds="SSTS_TousseGoodsStock" imgUrl="/themes/portalPage/img/tousseGoodsStock.png" itemLinkUrl="/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp" />
 		<portalItem type="1" system="1" title="手术预约管理" itemId="operationReservationView" operationIds="SSTS_OR_Select,SSTS_OR_Create,SSTS_OR_Delete" imgUrl="/themes/portalPage/img/surgeryAppointment.png" itemLinkUrl="/disinfectsystem/invoice/operationReservationView.jsp?editMode=true" />
+		<portalItem type="1" system="1" title="退货记录管理" itemId="returnGoodsRecordView" operationIds="SSTS_ReturnGoodsRecord_Select" imgUrl="/themes/portalPage/img/returnGoods.png" itemLinkUrl="/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp" />
 		<portalItem type="1" system="1" title="高级视图" itemId="enterpriseView" operationIds="" imgUrl="/themes/portalPage/img/reportshop.png" itemLinkUrl="/homepage/portal.jsp" />
 
 		<portalItem type="1" system="2" title="高级视图" itemId="expensiveEnterpriseView" operationIds="" imgUrl="/themes/portalPage/img/reportshop.png" itemLinkUrl="/expensivegoodshomepage/portal.jsp" />