Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
===================================================================
diff -u -r40654 -r40659
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 40654)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 40659)
@@ -595,7 +595,9 @@
 		return false;
 	}
 
-	top.Ext.getCmp("actionType").setValue(actionType);
+	if(sstsConfig.enableGeneratingDisposableGoodsApplyAndReturnUsingThirdPartyData){
+		top.Ext.getCmp("actionType").setValue(actionType);
+	}
 	top.Ext.MessageBox.confirm("请确认", "是否保存" + entityName + "信息？", function (btn) {
 		if (btn == 'yes') {
 
@@ -1547,22 +1549,34 @@
 				if(id){
 					printReturnGoodsFunction();
 				}else {
-					saveReturnGoodsFunction(1,1);
+					var actionType = 3;
+					if(signStatus == '待审核'){
+						actionType = 1;
+					}
+					saveReturnGoodsFunction(1,actionType);
 				}
 			}
 		}, {
 			text: '审核并保存',
 			hidden: SSTS_ReturnGoodsRecord_Create && SSTS_ReturnGoodsRecord_Update && !sstsConfig.enableGeneratingDisposableGoodsApplyAndReturnUsingThirdPartyData && signStatus !== '待审核',
 			disabled:!(signStatus == '待审核' || (signStatus !== '待审核' && enableBtn)),
 			handler: function () {
-				saveReturnGoodsFunction(0,2);
+				var actionType = 3;
+				if(signStatus == '待审核'){
+					actionType = 2;
+				}
+				saveReturnGoodsFunction(0, actionType);
 			}
 		}, {
 			text: '保存',
 			hidden: SSTS_ReturnGoodsRecord_Create && SSTS_ReturnGoodsRecord_Update,
 			disabled:!(signStatus == '待审核' || (signStatus !== '待审核' && enableBtn)),
 			handler: function () {
-				saveReturnGoodsFunction(0,1);
+				var actionType = 3;
+				if(signStatus == '待审核'){
+					actionType = 1;
+				}
+				saveReturnGoodsFunction(0, actionType);
 			}
 		}, {
 			text: '取消',