Merge branch 'main' of http://git.yiliantech.com/gitlab/otc-dev/zszq-trs

Plugins/YLErp.Plugins.ZheShang/DocumentGenerator/TradeConfirmationGenerator.cs

@@ -177,7 +177,7 @@ namespace YLErp.Plugins.ShanXi.DocumentGenerator
                         dic["利差%"] = ((interestMargin?.InterestRateDefault) ?? 0) * 100;
                         dic["参考利率"] = interestMargin?.FloatRateUnderlyingCode;
                         dic["固定利率"] = "";
-                        dic["计算基准"] = interestMargin?.FloatRateUnderlyingCode +" + " + ((interestMargin?.InterestRateDefault) ?? 0) * 100 + "%";
+                        dic["计算基准"] = interestMargin?.FloatRateUnderlyingCode +" " + ((interestMargin?.InterestRateDefault) ?? 0) * 100 + "%";
                         dic["重置频率"] = interestMargin?.interest_rest_days + "天";
                     }
                     dic["初始预付金支付日"] = trade.TradeDate?.ToString("yyyy年M月d日");

YLErpDAL/Model/Configcolumn.cs

@@ -98,6 +98,7 @@ namespace YLErp.Model
         public const string 行权日报告 = "maturityDateTradeList";
         public const string 已行权报告 = "maturityDateReport";
         public const string 交易确认书 = "TradeConfirmBookIndex";
+        public const string 交易确认书v2 = "TradeConfirmBookIndexv2";
         public const string 结算确认书 = "tradeExchangeBook";
         public const string 障碍期权报告 = "BarrierReportList";
         public const string 自定义限额规则 = "tradeConfirmRuleList";

YLErpWeb/Views/TradeConfirmBook/ConfirmBookListByClient.cshtml

@@ -21,7 +21,8 @@
         IsZheQi = PS.Config.Is浙期,
         IsAutoSealAfterGeneratedBook = PS.GetErpConfig().IsAutoSealAfterGeneratedBook,
         canGenerate = CurUser.结算管理_交易确认书生成,
-        canSendEmail = CurUser.结算管理_交易确认书邮件发送
+        canSendEmail = CurUser.结算管理_交易确认书邮件发送,
+        configcolumn = configcolumn_data.交易确认书v2,
     };
 }
 

YLErpWeb/wwwroot/Scripts/app/trade/tradeConfirmBookListByClient.js

@@ -18,6 +18,7 @@ const colModelGrid = (new function () {
             label: 'id',
             width: 100,
             hidden: true,
+            optionHide: true,
             key: true,
         },{ label: '合约编号', name: 'ContractCode', width: 240, },
         { label: '客户名称', name: 'ClientName', width: 150 },
@@ -36,7 +37,7 @@ const colModelGrid = (new function () {
             }
         },
         { label: '交易数量', name: 'tradeCount', width: 80, align: 'center' },
-        { label: 'tradeIds', name: 'tradeIds', hidden: true }];
+        { label: 'tradeIds', name: 'tradeIds', hidden: true, optionHide: true }];
         this.upload = function (encryptId, sendMail) {
             var srcurl = "/TradeConfirmBook/confirmBookUpload/?Id=" + encryptId + "&SendMailId=" + sendMail;
             main.open("上传确认书", srcurl, {
@@ -202,6 +203,11 @@ function reloadJqGrid() {
     $('#modal-edittrade').modal('hide');
 }
 
+function showcolumnChooser() {
+    var jgrid = jQuery('#listGrid');
+    main.showcolumnChooser(jgrid, page.configcolumn);
+}
+
 function SearchClick(isSearchclick) {
     var listGrid = $('#listGrid');
     listGrid.appendPostData({ ContractCode: $("#ContractCode").val() });