From 539896c5f6e23ea337a73362ce759881702b878b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=94=A6=E9=BA=9F=20=E7=8E=8B?= <Jinlin.Wang@cicc.com.cn>
Date: Thu, 27 Aug 2026 15:07:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A2=84=E4=BB=98=E9=87=91?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=EF=BC=9B?=
 =?UTF-8?q?=E7=A7=91=E5=88=9BETF=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../margin_template_v2/margin_template_v2ClientEdit.cshtml | 3 +--
 .../margin_template_v2DefaultEdit.cshtml                   | 3 +--
 .../Views/margin_template_v2/margin_template_v2Edit.cshtml | 7 +++----
 .../Views/margin_template_v2/margin_template_v2List.cshtml | 6 +++---
 .../app/marginTemplate/marginTemplateV2DefaultEdit.js      | 7 +++++--
 .../Scripts/app/marginTemplate/marginTemplateV2Edit.js     | 7 +++++--
 6 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/YLErpWeb/Views/margin_template_v2/margin_template_v2ClientEdit.cshtml b/YLErpWeb/Views/margin_template_v2/margin_template_v2ClientEdit.cshtml
index 851f637c..593f2612 100644
--- a/YLErpWeb/Views/margin_template_v2/margin_template_v2ClientEdit.cshtml
+++ b/YLErpWeb/Views/margin_template_v2/margin_template_v2ClientEdit.cshtml
@@ -1,4 +1,4 @@
-@using YLErp.Enums;
+@using YLErp.Enums;
 @model margin_template_v2
 
 @{
@@ -216,7 +216,6 @@
                         <span v-if="blk.isFundBlock">　ETF 子类：<select v-model="blk.sections[0].detail.SpanConfig.EtfKind" v-on:change="onEtfKindChange(blk)"><option value="">不区分</option><option v-for="it in etfSubtypeItems" v-bind:value="it">{{it}}</option></select></span>
                         <span v-if="blk.isTBond || blk.isTieredEtf">（按期限分档：≤5y、(5y-10y]、(10y-30y]、&gt;30y，每个档位独立设置）</span>
                     </p>
-                    <p style="margin:4px 0; color:#888;">存量 x/y 配置保留但不再展示，请按新区间结构录入。</p>
                     <div v-for="sec in blk.sections" v-bind:key="sec.key">
                         <p v-if="blk.isTBond || blk.isTieredEtf" style="margin:8px 0 2px; font-weight:bold;">期限档位：{{sec.termLabel}}</p>
                         <template v-if="sec.detail && sec.detail.SpanConfig">
diff --git a/YLErpWeb/Views/margin_template_v2/margin_template_v2DefaultEdit.cshtml b/YLErpWeb/Views/margin_template_v2/margin_template_v2DefaultEdit.cshtml
index bbbec2cf..baf49537 100644
--- a/YLErpWeb/Views/margin_template_v2/margin_template_v2DefaultEdit.cshtml
+++ b/YLErpWeb/Views/margin_template_v2/margin_template_v2DefaultEdit.cshtml
@@ -1,4 +1,4 @@
-@using YLErp.Enums;
+@using YLErp.Enums;
 @model margin_template_v2
 
 @{
@@ -217,7 +217,6 @@
                         <span v-if="blk.isFundBlock">　ETF 子类：<select v-model="blk.sections[0].detail.SpanConfig.EtfKind" v-on:change="onEtfKindChange(blk)"><option value="">不区分</option><option v-for="it in etfSubtypeItems" v-bind:value="it">{{it}}</option></select></span>
                         <span v-if="blk.isTBond || blk.isTieredEtf">（按期限分档：≤5y、(5y-10y]、(10y-30y]、&gt;30y，每个档位独立设置）</span>
                     </p>
-                    <p style="margin:4px 0; color:#888;">存量 x/y 配置保留但不再展示，请按新区间结构录入。</p>
                     <div v-for="sec in blk.sections" v-bind:key="sec.key">
                         <p v-if="blk.isTBond || blk.isTieredEtf" style="margin:8px 0 2px; font-weight:bold;">期限档位：{{sec.termLabel}}</p>
                         <template v-if="sec.detail && sec.detail.SpanConfig">
diff --git a/YLErpWeb/Views/margin_template_v2/margin_template_v2Edit.cshtml b/YLErpWeb/Views/margin_template_v2/margin_template_v2Edit.cshtml
index e14b00fd..5c72e2fa 100644
--- a/YLErpWeb/Views/margin_template_v2/margin_template_v2Edit.cshtml
+++ b/YLErpWeb/Views/margin_template_v2/margin_template_v2Edit.cshtml
@@ -1,4 +1,4 @@
-@using YLErp.Enums;
+@using YLErp.Enums;
 @model margin_template_v2
 
 @{
@@ -32,7 +32,7 @@
 
     <form id="marginTemplateV2Form" method="post" onsubmit="return false;">
         <div class="row no-gutters">
-            <div class="col form-layout" style="height: 520px; overflow-y: auto;">
+            <div class="col form-layout" style="height: calc(100vh - 120px); overflow-y: auto;">
                 <div class="border">
                     <P>新模板信息</P>
                     <div class="form-group">
@@ -133,7 +133,7 @@
                 </div>
             </div>
         </div>
-        <div class="col form-layout" style="height: 520px; overflow-y:auto;">
+        <div class="col form-layout" style="height: calc(100vh - 120px); overflow-y:auto;">
             <template v-if="marginTemplate.RuleType == @((int)MarginRuleTypeEnum.区间追保结构)">
                 <div class="border detail">
                     <table class="table table-bordered" style="margin-bottom:0;">
@@ -193,7 +193,6 @@
                         <span v-if="blk.isFundBlock">　ETF 子类：<select v-model="blk.sections[0].detail.SpanConfig.EtfKind" v-on:change="onEtfKindChange(blk)"><option value="">不区分</option><option v-for="it in etfSubtypeItems" v-bind:value="it">{{it}}</option></select></span>
                         <span v-if="blk.isTBond || blk.isTieredEtf">（按期限分档：≤5y、(5y-10y]、(10y-30y]、&gt;30y，每个档位独立设置）</span>
                     </p>
-                    <p style="margin:4px 0; color:#888;">存量 x/y 配置保留但不再展示，请按新区间结构录入。</p>
                     <div v-for="sec in blk.sections" v-bind:key="sec.key">
                         <p v-if="blk.isTBond || blk.isTieredEtf" style="margin:8px 0 2px; font-weight:bold;">期限档位：{{sec.termLabel}}</p>
                         <template v-if="sec.detail && sec.detail.SpanConfig">
diff --git a/YLErpWeb/Views/margin_template_v2/margin_template_v2List.cshtml b/YLErpWeb/Views/margin_template_v2/margin_template_v2List.cshtml
index b9c69371..5d6e7b82 100644
--- a/YLErpWeb/Views/margin_template_v2/margin_template_v2List.cshtml
+++ b/YLErpWeb/Views/margin_template_v2/margin_template_v2List.cshtml
@@ -1,4 +1,4 @@
-@using YLErp.Enums;
+@using YLErp.Enums;
 @{
     ViewBag.Title = "预付金模板V2";
     ViewBag.Menu = "数据管理-预付金模板V2";
@@ -134,13 +134,13 @@
             if (id) {
                 editurl = "/margin_template_v2/margin_template_v2Edit/?enid=" + id;
             }
-            main.infopage("编辑预付金模板", editurl, { area: ['1180px', '68%'] });
+            main.infopage("编辑预付金模板", editurl, { area: ['1180px', '92%'] });
         }
 
         function startCopymargin_template_v2(id) {
             editurl = "/margin_template_v2/margin_template_v2Copy/?enid=" + id;
 
-            main.infopage("复制预付金模板", editurl, { area: ['1180px', '68%'] });
+            main.infopage("复制预付金模板", editurl, { area: ['1180px', '92%'] });
         }
 
         function startDeletemargin_template_v2(id) {
diff --git a/YLErpWeb/wwwroot/Scripts/app/marginTemplate/marginTemplateV2DefaultEdit.js b/YLErpWeb/wwwroot/Scripts/app/marginTemplate/marginTemplateV2DefaultEdit.js
index 6e5e71d1..15c6c0f5 100644
--- a/YLErpWeb/wwwroot/Scripts/app/marginTemplate/marginTemplateV2DefaultEdit.js
+++ b/YLErpWeb/wwwroot/Scripts/app/marginTemplate/marginTemplateV2DefaultEdit.js
@@ -438,8 +438,11 @@ const vue = new Vue({
                 });
                 var that = this;
                 var merged = [];
-                SpanBondTerms.forEach(function (t) {
-                    var r = byTerm[t[0]];
+                //首行未被4个合法档位命中时（单段行 BondTerm 为空）复用为首个档位行，保留已录入内容；
+                //否则首行会以"EtfKind 已选、BondTerm 为空"的残留行留在明细里，保存时被服务端"分期限档类型必须配置期限档"拦截
+                var headMatched = SpanBondTerms.some(function (t) { return byTerm[t[0]] === head; });
+                SpanBondTerms.forEach(function (t, ti) {
+                    var r = byTerm[t[0]] || (ti === 0 && !headMatched ? head : null);
                     if (!r) r = that.newSpanDetail(FundTypeMask, t[0], kind);
                     r.UnderlyingType = FundTypeMask;
                     r.SpanConfig.EtfKind = kind;
diff --git a/YLErpWeb/wwwroot/Scripts/app/marginTemplate/marginTemplateV2Edit.js b/YLErpWeb/wwwroot/Scripts/app/marginTemplate/marginTemplateV2Edit.js
index c2eb75cf..676fa7dc 100644
--- a/YLErpWeb/wwwroot/Scripts/app/marginTemplate/marginTemplateV2Edit.js
+++ b/YLErpWeb/wwwroot/Scripts/app/marginTemplate/marginTemplateV2Edit.js
@@ -449,8 +449,11 @@ const vue = new Vue({
                 });
                 var that = this;
                 var merged = [];
-                SpanBondTerms.forEach(function (t) {
-                    var r = byTerm[t[0]];
+                //首行未被4个合法档位命中时（单段行 BondTerm 为空）复用为首个档位行，保留已录入内容；
+                //否则首行会以"EtfKind 已选、BondTerm 为空"的残留行留在明细里，保存时被服务端"分期限档类型必须配置期限档"拦截
+                var headMatched = SpanBondTerms.some(function (t) { return byTerm[t[0]] === head; });
+                SpanBondTerms.forEach(function (t, ti) {
+                    var r = byTerm[t[0]] || (ti === 0 && !headMatched ? head : null);
                     if (!r) r = that.newSpanDetail(FundTypeMask, t[0], kind);
                     r.UnderlyingType = FundTypeMask;
                     r.SpanConfig.EtfKind = kind;