diff --git a/YLErpWeb/wwwroot/Scripts/app/trade/tradeview.js b/YLErpWeb/wwwroot/Scripts/app/trade/tradeview.js index c1943d3b..67ad44db 100644 --- a/YLErpWeb/wwwroot/Scripts/app/trade/tradeview.js +++ b/YLErpWeb/wwwroot/Scripts/app/trade/tradeview.js @@ -85,34 +85,6 @@ var confirmFunc = function (id, additionalProcessing) { } if (data.obj && data.obj.proccessType === "AdditionalProcessing") { if (data.obj.TrialDataId) { - var isRiskWarningConfirm = data.obj.type === "RiskWarningConfirm"; - var additionalProcessingType = isRiskWarningConfirm ? "RiskWarningConfirm" : "LackOfMoney"; - var saveQuotaTrial = function (obj) { - var saveSuccess = true; - if (obj.IsTF && (!obj.Data.Remark || obj.Data.Remark.length <= 0)) { - main.message("必须填写说明内容,才可以录入交易"); - return false; - } - if (obj.Data.Remark && obj.Data.Remark.length > 0) { - main.post("/trade/SaveQuotaTrial", obj.Data, { async: false }).done(function (res) { - if (!res || !res.success) { - saveSuccess = false; - main.message(res.msg); - } - }); - } - return saveSuccess; - }; - var saveRiskWarningDecisionLog = function (quotaTrialId, decision) { - var saveSuccess = true; - main.post("/trade/SaveRiskWarningDecisionLog", { quotaTrialId: quotaTrialId, decision: decision }, { async: false }).done(function (res) { - if (!res || !res.success) { - saveSuccess = false; - main.message(res.msg); - } - }); - return saveSuccess; - }; var layerSetting = { type: 2, title: "提示", @@ -122,23 +94,31 @@ var confirmFunc = function (id, additionalProcessing) { content: "/trade/showQuotaTrial?id=" + data.obj.TrialDataId, yes: function (index) { var obj = window["layui-layer-iframe" + index].page; - if (!saveQuotaTrial(obj)) { - return; - } - if (isRiskWarningConfirm) { - if (!saveRiskWarningDecisionLog(obj.Data.id, "确认通过")) { + if (obj.IsTF) { + if (obj.Data.Remark && obj.Data.Remark.length > 0) { + main.post("/trade/SaveQuotaTrial", obj.Data, { async: false }).done(function (res) { + if (!res || !res.success) { + main.message(res.msg); + } + }); + layer.close(layerIndex); + confirmFunc(id, "LackOfMoney"); return; } + main.message("必须填写说明内容,才可以录入交易"); + } else { + if (obj.Data.Remark && obj.Data.Remark.length > 0) { + main.post("/trade/SaveQuotaTrial", obj.Data, { async: false }).done(function (res) { + if (!res || !res.success) { + main.message(res.msg); + } + }); + } + layer.close(layerIndex); + confirmFunc(id, "LackOfMoney"); } - layer.close(layerIndex); - confirmFunc(id, additionalProcessingType); }, cancel: function () { - var iframeWindow = window["layui-layer-iframe" + this.index]; - var pageObj = iframeWindow && iframeWindow.page; - if (isRiskWarningConfirm && pageObj && pageObj.Data && pageObj.Data.id) { - saveRiskWarningDecisionLog(pageObj.Data.id, "取消不通过"); - } if (window.parent && window.parent.reloadtrade) { window.parent.reloadtrade(); } @@ -148,10 +128,8 @@ var confirmFunc = function (id, additionalProcessing) { if (data.obj.type === "LackOfMoney") { layerSetting.btn = [page.buttonStr, '取消']; } - else if (isRiskWarningConfirm) { - layerSetting.btn = ["交易特批", '取消']; - } - else if (data.obj.typecode === "FundStatus") { + // 只展示“资金状况”的情况 + if (data.obj.typecode === "FundStatus") { layerSetting.btn = ["确认", '取消']; } @@ -189,14 +167,6 @@ var confirmFunc = function (id, additionalProcessing) { }); }); } - if (data.msg && data.msg !== "操作完成") { - main.alert(data.msg, function () { - if (blClose) { - closetradeWindow(); - } - }); - return; - } if (blClose) { closetradeWindow(); }