cleanup(trade): 收敛 IsGuoJun 死分支并删除失去调用方的 guojun 报表函数
国联下 PS.Config.IsGuoJun 恒为 false,以下分支只走 else 侧: - tradeDayConfirmList.cshtml: IsGuoJun if/else 收敛为 sendReport() 单行 - maturityDateReport.cshtml: 发送结算确认书按钮的 if/else 收敛为 SendEmailSettleBill() - maturityDateReport.cshtml: _chooseContractType 的三元收敛为 "sendReport()" 随之失去全部调用方的死函数一并删除(大小写不敏感全仓检索确认无其它引用, 包括无 window["xxx"] 之类的动态调用): - tradeDayConfirmList.js sendReportGuojun()(713-749) - maturityDateReport.cshtml sendReport_guojun()(913-939) 顺带清掉 percentColumnText.js 注释里对已删除文件 structure_dz.js 的引用。 注:后端 SendEmailSettleBill_Guojun / SendEmailUnwindReportGuojun 两个 Action 前端已无调用方,但属 C# 公开终结点,本次不动,留待单独决策。 净减 78 行。
This commit is contained in:
@@ -910,33 +910,6 @@
|
||||
$("#modalChooseContractType").modal('hide');
|
||||
}
|
||||
|
||||
function sendReport_guojun() {
|
||||
var clientIds = $("#ClientId").val() == null ? "" : $("#ClientId").val().join(",");
|
||||
var contractTypes = ContractTypeCtrl.getValue();
|
||||
var data = { UnWindDateStart: $("#DateFromUnWindDate").val(), UnWindDateEnd: $("#DateToUnWindDate").val(), ClientIds: clientIds ,receiver : contractTypes};
|
||||
var jgrid = jQuery('#listGrid');
|
||||
var ids = main.GetGridIds(jgrid);
|
||||
if (ids.length == 0) {
|
||||
if (data.UnWindDateStart == undefined || data.UnWindDateStart == null || data.UnWindDateStart == ""
|
||||
|| data.UnWindDateEnd == undefined || data.UnWindDateEnd == null || data.UnWindDateEnd == "") {
|
||||
showmiddlemessage("发送结算确认书需要选择确切的实际行权日区间!");
|
||||
return;
|
||||
}
|
||||
}
|
||||
else { data.TradeCashIds = ids.join(","); }
|
||||
if (ids.length == 0 && clientIds == "") {
|
||||
main.confirm("确定发送所有结算确认书?可选择客户名称单个发送", function () {
|
||||
main.post("/trade/SendEmailSettleBill_Guojun", data).done(function (data) {
|
||||
});
|
||||
})
|
||||
}
|
||||
else {
|
||||
main.post("/trade/SendEmailSettleBill_Guojun", data).done(function (data) {
|
||||
});
|
||||
}
|
||||
$("#modalChooseContractType").modal('hide');
|
||||
}
|
||||
|
||||
function sentMail(id) {
|
||||
ReportId = id;
|
||||
var clientIds = $("#ClientId").val();
|
||||
@@ -1161,14 +1134,7 @@
|
||||
//@MyControls.Btn("客户行权日报告", "ClientMaturityTrade()")
|
||||
}
|
||||
@MyControls.Btn("批量下载结算确认书", "downloadMaturityReports()")
|
||||
@if (PS.Config.IsGuoJun)
|
||||
{
|
||||
@MyControls.Btn("发送结算确认书", "sendReport_guojun()")
|
||||
}
|
||||
else
|
||||
{
|
||||
@MyControls.Btn("发送结算确认书", "SendEmailSettleBill()")
|
||||
}
|
||||
@if (isAutoSealAndUploadFiles && !isAutoSealAfterGenerateBook)
|
||||
{
|
||||
@MyControls.Btn("批量确认书用印", "BatchSealContracts()")
|
||||
@@ -1187,4 +1153,4 @@
|
||||
-->
|
||||
@Html.Raw(JqGridSimple.OutTable())
|
||||
|
||||
@await Html.PartialAsync("/Views/Common/_chooseContractType.cshtml", PS.Config.IsGuoJun ? "sendReport_guojun()" : "sendReport()")
|
||||
@await Html.PartialAsync("/Views/Common/_chooseContractType.cshtml", "sendReport()")
|
||||
@@ -71,11 +71,4 @@
|
||||
@Html.Raw(JqGridSimple.OutTable())
|
||||
|
||||
|
||||
@if (PS.Config.IsGuoJun)
|
||||
{
|
||||
@await Html.PartialAsync("/Views/Common/_chooseContractType.cshtml", "sendReportGuojun()")
|
||||
}
|
||||
else
|
||||
{
|
||||
@await Html.PartialAsync("/Views/Common/_chooseContractType.cshtml", "sendReport()")
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
/**
|
||||
* percentColumnText.js — 交易要素列的百分比展示文本(纯函数)
|
||||
* ============================================================================
|
||||
* 把散落在 structure.js ×3 / structure_dz.js / tradeEditV2.js / tradeEditGroup.js
|
||||
* 把散落在 structure.js ×3 / tradeEditV2.js / tradeEditGroup.js
|
||||
* 的六处逐字相同一行式显式化为命名函数。
|
||||
* 【约定】ColumnType==4 = 百分比列:值以小数形式存储(如 0.05),展示时 ×100 追加 %;
|
||||
* 若值文本已含 %(人工录入或后端已格式化)则原样展示,不做二次换算;
|
||||
|
||||
@@ -710,43 +710,6 @@ function sendReport() {
|
||||
$("#modalChooseContractType").modal('hide');
|
||||
}
|
||||
|
||||
function sendReportGuojun() {
|
||||
var clientIds = $("#ClientId").val() == null ? "" : $("#ClientId").val().join(",");
|
||||
var contractTypes = ContractTypeCtrl.getValue();
|
||||
var data = { UnWindDateStart: $("#DateFromUnWindDate").val(), UnWindDateEnd: $("#DateToUnWindDate").val(), ClientIds: clientIds, receiver: contractTypes };
|
||||
var jgrid = jQuery('#listGrid');
|
||||
var rowIds = jgrid.jqGrid('getGridParam', 'selarrrow');
|
||||
var ids = [];
|
||||
for (var i = 0; i < rowIds.length; i++) {
|
||||
var rowObjs = jgrid.getRowData();
|
||||
for (var j = 0; j < rowObjs.length; j++) {
|
||||
if (rowObjs[j]["trade_cash.id"] == rowIds[i]) {
|
||||
ids.push(rowObjs[j]["trade_cash.id"]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (ids.length == 0) {
|
||||
if (data.UnWindDateStart == undefined || data.UnWindDateStart == null || data.UnWindDateStart == ""
|
||||
|| data.UnWindDateEnd == undefined || data.UnWindDateEnd == null || data.UnWindDateEnd == "") {
|
||||
showmiddlemessage("发送清算确认书需要选择确切的实际终止日区间!");
|
||||
return;
|
||||
}
|
||||
}
|
||||
else { data.TradeCashIds = ids.join(","); }
|
||||
if (ids.length == 0 && clientIds == "") {
|
||||
main.confirm("确定发送所有提前终止确认书?可选择客户名称单个发送", function () {
|
||||
main.post("/trade/SendEmailUnwindReportGuojun", data).done(function (data) {
|
||||
});
|
||||
})
|
||||
}
|
||||
else {
|
||||
main.post("/trade/SendEmailUnwindReportGuojun", data).done(function (data) {
|
||||
});
|
||||
}
|
||||
$("#modalChooseContractType").modal('hide');
|
||||
}
|
||||
|
||||
function SearchClick(isSearchclick) {
|
||||
var listGrid = $('#listGrid');
|
||||
|
||||
|
||||
Reference in New Issue
Block a user