();
diff --git a/YLErpWeb/Views/risk/quotaMonitor.cshtml b/YLErpWeb/Views/risk/quotaMonitor.cshtml
index cf0e805b..9ace01b6 100644
--- a/YLErpWeb/Views/risk/quotaMonitor.cshtml
+++ b/YLErpWeb/Views/risk/quotaMonitor.cshtml
@@ -111,21 +111,10 @@
标的代码
-
-
-
-
@Html.SearchDateRange("TradeDate", "成交日期", htmlAttributes: new { trade = "" })
@Html.MyAceDropdownInput("AssetId", "簿记账户", AssetunitController.GetClientassetunit(), htmlAttributes: new { trade = "" ,assetunit="" })
@Html.MyAceDropdownInput("TradeStatus", "交易状态", GlobalData.GetSelectItems(ConsTrade.AllTradeStatus), true, htmlAttributes: new { trade = "" })
- @if (PS.Config.Company == CompanyEnum.国海)
- {
-
- 计算CCR
-
-
- }
- @if (PS.Config.Company == CompanyEnum.广发商贸)
- {
-
-
-
-
- }
@Html.MyAceDropdownInput("UseValid", "状态", new SelectListItem[]{ new SelectListItem(){ Text ="有效",Value="有效" },new SelectListItem(){ Text ="无效",Value="无效" },new SelectListItem(){ Text ="待生效",Value="待生效" },new SelectListItem(){ Text ="待删除",Value="待删除" }}.ToList())
@Html.MyAceDropdownInput("confriomStatus", "确认状态", pageObj.ApprovalStatusDict.Select(O=>new SelectListItem(){ Text = O.Value,Value =O.Key }).ToList())
@@ -181,18 +159,11 @@
- @if (PS.Config.Company == CompanyEnum.广发商贸)
- {
-
- @MyControls.Btn("批量操作", "showWindow('批量操作')")
- @MyControls.Btn("导入限额指标", "showWindow('导入限额指标')")
-
- }
-
- 整体业务汇总
+ 整体业务汇总
-
标的汇总
diff --git a/YLErpWeb/wwwroot/Scripts/app/risk/quotaMonitor.js b/YLErpWeb/wwwroot/Scripts/app/risk/quotaMonitor.js
index 56b28333..1c454584 100644
--- a/YLErpWeb/wwwroot/Scripts/app/risk/quotaMonitor.js
+++ b/YLErpWeb/wwwroot/Scripts/app/risk/quotaMonitor.js
@@ -9,8 +9,8 @@ $(function () {
$("#myTab li a").on("click", function (e) {
setSummaryType($(e.target).text());
});
- FastVue.numberInput(document.getElementById('PvPercent'), { precision: 0, append: '%' });
new tradeHelper.UnderlyingSelectCtrl('#UnderlyingId').setFlag(tradeHelper.UnderlyingSelectFlag.OtcTrade);
+ main.setTradeDatePicker(moment(page.ValueDate));
$(".datepicker").datepicker({
changeMonth: true,
changeYear: true,
@@ -21,20 +21,20 @@ $(function () {
$("#DateValueDate").change(function () {
var dateVal = $(this).val();
valueDateShowStatus = page.ValueDate == dateVal;
- var tab = $('#myTab .active a').text();
- if (tab == "整体业务汇总") {
- if (valueDateShowStatus) {
- $("#PvPercent").parents('.search-group').show();
- } else {
- $("#PvPercent").parents('.search-group').hide();
- }
- }
+ SearchClick(true);
+ //var tab = $('#myTab .active a').text();
+ //if (tab == "整体业务汇总") {
+ // if (valueDateShowStatus) {
+ // $("#PvPercent").parents('.search-group').show();
+ // } else {
+ // $("#PvPercent").parents('.search-group').hide();
+ // }
+ //}
});
$("#UseValid,#confriomStatus").attr("setting", "");
setSummaryType(page.SummaryType)//这个方法应该在最后调用,否则可能会影响页面展示效果
if (getRequest().SummaryType != undefined) {
setSummaryType(getRequest().SummaryType);
- SearchClick(true);
}
});
function getRequest() {
@@ -220,11 +220,11 @@ function getGrid(summaryType) {
switch (summaryType) {
case "整体业务汇总":
obj.colModel = colModel_global;
- if (valueDateShowStatus) {
- $("#PvPercent").parents('.search-group').show();
- } else {
- $("#PvPercent").parents('.search-group').hide();
- }
+ //if (valueDateShowStatus) {
+ // $("#PvPercent").parents('.search-group').show();
+ //} else {
+ // $("#PvPercent").parents('.search-group').hide();
+ //}
break;
case "品种汇总":
obj.colModel = colModel_variety;
@@ -299,6 +299,7 @@ function setSummaryType(summaryType) {
//$("#TagIds").parents('.search-group').show();
if (typeof g_grid.GridUnload == 'function') { g_grid.GridUnload(); }
g_grid = getGrid(summaryType);
+ SearchClick(true);
}
function GetPostData() {
diff --git a/YLerpbase.sln b/YLerpbase.sln
index 5962b956..a9b1bc83 100644
--- a/YLerpbase.sln
+++ b/YLerpbase.sln
@@ -92,7 +92,6 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{B454A6FB-CF27-4B00-AEDC-BA1F0ED2F6D1} = {15F732CE-6C51-48F0-BC50-3BEC018460E5}
- {5981434D-792E-4528-AFC8-7EB8AFD9F80C} = {15F732CE-6C51-48F0-BC50-3BEC018460E5}
{C7E0F300-16D5-438B-97A2-79DC2311D1D5} = {F315B5D3-F4FE-43E5-AF22-AF92978A71BE}
{FEDA115A-88ED-42FE-A5FF-0AAE229DC4CF} = {F315B5D3-F4FE-43E5-AF22-AF92978A71BE}
{206EBAE4-AB3E-4F09-9428-DDC3E64CFC42} = {F315B5D3-F4FE-43E5-AF22-AF92978A71BE}