diff --git a/YLErpWeb/Views/SwapFloatRate/Edit.cshtml b/YLErpWeb/Views/SwapFloatRate/Edit.cshtml
index 5d8d7a14..aa7c3b24 100644
--- a/YLErpWeb/Views/SwapFloatRate/Edit.cshtml
+++ b/YLErpWeb/Views/SwapFloatRate/Edit.cshtml
@@ -49,11 +49,11 @@
                 </div>
                 <div class="form-group">
                     <label class="formlabel half">基准利率</label>
-                    <vue-underlying-rate id="rate.BaseUnderlyingCode" v-model="rate.BaseUnderlyingCode" />
+                    <vue-underlying-rate id="rate.BaseUnderlyingCode" v-model="rate.BaseUnderlyingCode" v-on:change="setFloatRateUnderlyingCode($event)" />
                 </div>
                 <div class="form-group">
                     <label class="formlabel half">是否年化</label>
-                    <select v-model="rate.is_annualized">
+                    <select v-model="rate.is_annualized" :disabled="rate.BaseUnderlyingCode!='--'&&rate.BaseUnderlyingCode!=''&&rate.BaseUnderlyingCode!=null">
                         <option value=false>否</option>
                         <option value=true>是</option>
                     </select>
diff --git a/YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml b/YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml
index 66b03957..771c1ac3 100644
--- a/YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml
+++ b/YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml
@@ -357,13 +357,13 @@
                                         </select>
                                     </td>
                                     <td>
-                                        <select v-model="item.InterestType" style="width:61px;">
+                                        <select v-model="item.InterestType" style="width:61px;" v-on:change="changeInterestType(item)">
                                             <option value=0>单利</option>
                                             <option value=1>复利</option>
                                         </select>
                                     </td>
                                     <td>
-                                        <vue-number-input v-model="item.interest_rest_days" style="width:70px;" v-bind:format="inputFormatInteger" :disabled="item.FloatRateUnderlyingCode=='--'||item.FloatRateUnderlyingCode==''||item.FloatRateUnderlyingCode==null"></vue-number-input>
+                                        <vue-number-input v-model="item.interest_rest_days" style="width:70px;" v-bind:format="inputFormatInteger" :disabled="item.InterestType==0"></vue-number-input>
                                     </td>
                                     <td>
                                         <select v-model="item.interest_rule" :disabled="item.FloatRateUnderlyingCode=='--'||item.FloatRateUnderlyingCode==''||item.FloatRateUnderlyingCode==null">
diff --git a/YLErpWeb/Views/SwapTrade2/TradeMarketReport_EodPosition.cshtml b/YLErpWeb/Views/SwapTrade2/TradeMarketReport_EodPosition.cshtml
index 1eb6fc97..7e6dd3da 100644
--- a/YLErpWeb/Views/SwapTrade2/TradeMarketReport_EodPosition.cshtml
+++ b/YLErpWeb/Views/SwapTrade2/TradeMarketReport_EodPosition.cshtml
@@ -79,9 +79,6 @@
             <li class="nav-item">
                 <a class="nav-link" onclick='locationChange("/clientbalance/TradeMarketReport_BalanceStatement")'>资金明细</a>
             </li>
-            <li class="nav-item">
-                <a class="nav-link" onclick='locationChange("/clientbalance/TradeMarketReport_Collateral")'>质押记录</a>
-            </li>
         </ul>
         <div style="width:30px;display:inline;margin-left: 20px;" onclick="showChiCang();return false;">
             <img src="~/Images/configure.png" />
diff --git a/YLErpWeb/Views/client/_ClientBankcardEdit.cshtml b/YLErpWeb/Views/client/_ClientBankcardEdit.cshtml
index 6228e640..9362f6b1 100644
--- a/YLErpWeb/Views/client/_ClientBankcardEdit.cshtml
+++ b/YLErpWeb/Views/client/_ClientBankcardEdit.cshtml
@@ -28,13 +28,6 @@
                     <label class="formlabel">户名</label>
                     <input class="text-box" type="text" name="ClientName" v-model="bankcard.ClientName" /> <span style="color:red">*</span>
                 </div>
-                <div class="form-group">
-                    <label class="formlabel">用途</label>
-                    <select name="ValidState" v-model="bankcard.Use">
-                        @*<option value="全部">全部</option>*@
-                        <option v-for="item in viewData['资金用途']" v-bind:value="item.text">{{item.text}}</option>
-                    </select>
-                </div>
                 <div class="form-group">
                     <label class="formlabel">是否有效</label>
                     <select name="ValidState" v-model="bankcard.ValidState">
diff --git a/YLErpWeb/Views/client/_ClientBankcardList.cshtml b/YLErpWeb/Views/client/_ClientBankcardList.cshtml
index 6c266c4d..520cdb10 100644
--- a/YLErpWeb/Views/client/_ClientBankcardList.cshtml
+++ b/YLErpWeb/Views/client/_ClientBankcardList.cshtml
@@ -18,7 +18,6 @@
                 <th>银行账号</th>
                 <th>大额行号</th>
                 <th>户名</th>
-                <th>用途</th>
                 <th>是否有效</th>
                 <th>操作者</th>
                 <th>备注</th>
@@ -31,7 +30,6 @@
                 <td style="width: 119px; padding-left: 0px; padding-right: 0px; " class="text-red">{{formatCardNum(item.Card)}}</td>
                 <td style="width: 60px; padding-left: 0px; padding-right: 0px; ">{{item.Payment}}</td>
                 <td style="width: 250px; padding-left: 0px; padding-right: 0px; ">{{item.ClientName}}</td>
-                <td style="width: 30px; padding-left: 0px; padding-right: 0px; ">{{item.Use}}</td>
                 <td style="width: 30px; padding-left: 0px; padding-right: 0px; ">{{item.ValidState == "InValid" ? "无效" : "有效"}}</td>
                 <td style="width: 30px; padding-left: 0px; padding-right: 0px; ">{{item.OptName}}</td>
                 <td style="width: 20px; padding-left: 0px; padding-right: 0px; ">{{item.Comments}}</td>
diff --git a/YLErpWeb/Views/client/_ClientDutyList.cshtml b/YLErpWeb/Views/client/_ClientDutyList.cshtml
index 568eeced..809eb1f4 100644
--- a/YLErpWeb/Views/client/_ClientDutyList.cshtml
+++ b/YLErpWeb/Views/client/_ClientDutyList.cshtml
@@ -17,8 +17,9 @@
                 <th style="width: 70px">姓名</th>
                 <th style="width: 200px; padding-left: 0px; padding-right: 0px; ">职责类型</th>
                 <th style="width: 375px; padding-left: 0px; padding-right: 0px; ">电子邮箱</th>
-                <th style="width: 175px; padding-left: 0px; padding-right: 0px; ">联系电话</th>
-                <th style="width:50%; padding-left:0px;padding-right:0px;">备注</th>
+                <th style="width: 200px; padding-left: 0px; padding-right: 0px; ">联系电话</th>
+                <th style="width: 200px; padding-left: 0px; padding-right: 0px; ">授权有效期</th>
+                <th style="width:40%; padding-left:0px;padding-right:0px;">备注</th>
                 <th style="width:10%; padding-left:0px;padding-right:0px;">操作</th>
             </tr>
         </thead>
@@ -31,6 +32,9 @@
                 <td>
                     <div v-for="item2 in item.PhoneNumber">{{item2}}</div>
                 </td>
+                <td>
+                    <div v-for="item2 in item.PhoneNumber">{{item.AuthorizeEffectiveEndDateStr=="30001231"?"长期有效":dateFormat(item.AuthorizeEffectiveEndDate)}}</div>
+                </td>
                 <td>{{item.Remarks}}</td>
                 <td style="padding-left:0px;padding-right:0px;">
                     <template v-if="page.canEditList">
diff --git a/YLErpWeb/Views/clientbalance/TradeMarketReport.cshtml b/YLErpWeb/Views/clientbalance/TradeMarketReport.cshtml
index 76c55629..1bde2638 100644
--- a/YLErpWeb/Views/clientbalance/TradeMarketReport.cshtml
+++ b/YLErpWeb/Views/clientbalance/TradeMarketReport.cshtml
@@ -54,15 +54,6 @@
         @MyControls.Btn("配置报告", "PopDesc()")
         @MyControls.Btn("发送报告", "SendReport()")
     }
-    @if (CurUser.结算管理_导入外部结算数据)
-    {
-        @MyControls.Btn("上传数据", "Upload()")
-    }
-    @Html.DropDownList("ShownType", new List<SelectListItem>() {
-    new SelectListItem(){ Value = "GetOuterMargin",Text = "外部预付金"},
-    new SelectListItem(){ Value = "default",Text = "系统默认"}
-    //new SelectListItem(){ Value = "ClientBalanceGap",Text = "财务增量"},
-    }, new { id = "ShownType", onchange = "SearchClick()" })
 </div>
 <br />
 
diff --git a/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js b/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js
index c35b60c9..de691d22 100644
--- a/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js
+++ b/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js
@@ -471,6 +471,19 @@ const dutyVue = (function () {
                     }
                 }
 
+            },
+            dateFormat(v, f) {
+                if (v == null || v == '') {
+                    return '';
+                }
+                if (!f) {
+                    f = 'YYYY-MM-DD';
+                }
+                var m = new moment(v);
+                if (m.year() < 1910) {
+                    return '';
+                }
+                return new moment(v).format(f);
             }
         },
         computed: {
diff --git a/YLErpWeb/wwwroot/Scripts/app/client/tradeMarketReport.js b/YLErpWeb/wwwroot/Scripts/app/client/tradeMarketReport.js
index 4a910002..0398c209 100644
--- a/YLErpWeb/wwwroot/Scripts/app/client/tradeMarketReport.js
+++ b/YLErpWeb/wwwroot/Scripts/app/client/tradeMarketReport.js
@@ -261,18 +261,6 @@ function SearchClientBalance() {
 
     $("#WorstCastClientPayable").prop("disabled", "true");
     $("#PayableFund").prop("disabled", "true");
-    switch ($("#ShownType").val()) {
-        case "default":
-            $("#WorstCastClientPayable").prop("disabled", "");
-            $("#PayableFund").prop("disabled", "");
-            break;
-        case "ClientBalanceGap": param.IsClientBalanceGap = true; break;
-        case "GetOuterMargin": param.IsGetOuterMarginGap = true; break;
-        default:
-            $("#WorstCastClientPayable").prop("disabled", "");
-            $("#PayableFund").prop("disabled", "");
-            break;
-    }
     if (!param.ValueDateStart) {
         //  param.ValueDateStart = param.ValueDate;
     }
@@ -374,7 +362,7 @@ function SendReport() {
         if (isXiangCai) {
             payablemargin = numeral($("#Margin").text()).format("0.00");
         }
-        main.open("向{0}发送报告".template(clientName), "/clientbalance/TradeMarketClientSend?clientid=" + param.ClientId + "&payablemargin=" + payablemargin + "&payableFund=" + numeral($("#PayableFund").val()).format("0.00") + "&reportType=" + $("#ShownType").val() + "&ParentFlag=" + param.ParentFlag, { area: ['65%', '95%'] });
+        main.open("向{0}发送报告".template(clientName), "/clientbalance/TradeMarketClientSend?clientid=" + param.ClientId + "&payablemargin=" + payablemargin + "&payableFund=" + numeral($("#PayableFund").val()).format("0.00") + "&reportType=GetOuterMargin" + "&ParentFlag=" + param.ParentFlag, { area: ['65%', '95%'] });
     }
 }
 
diff --git a/YLErpWeb/wwwroot/Scripts/app/swapRate/swapFloatRateEdit.js b/YLErpWeb/wwwroot/Scripts/app/swapRate/swapFloatRateEdit.js
index 7a8f88dc..2e90db6a 100644
--- a/YLErpWeb/wwwroot/Scripts/app/swapRate/swapFloatRateEdit.js
+++ b/YLErpWeb/wwwroot/Scripts/app/swapRate/swapFloatRateEdit.js
@@ -142,6 +142,12 @@ var vue = new Vue({
             this.rate.ClientId = client.id;
             this.rate.ClientNumber = client.Number;
         },
+        setFloatRateUnderlyingCode(data) {
+            this.rate.BaseUnderlyingCode = data.Code;
+            if (data.Code.length > 0 && data.Code != '--') {
+                this.rate.is_annualized = true;
+            }
+        },
         close() {
             window.parent.reloadData();
             layer.closeMe();
diff --git a/YLErpWeb/wwwroot/Scripts/app/swapRate/swapFloatRateList.js b/YLErpWeb/wwwroot/Scripts/app/swapRate/swapFloatRateList.js
index d6237eba..ebe617f2 100644
--- a/YLErpWeb/wwwroot/Scripts/app/swapRate/swapFloatRateList.js
+++ b/YLErpWeb/wwwroot/Scripts/app/swapRate/swapFloatRateList.js
@@ -271,7 +271,7 @@ function showToolName(cellValue, options, rowObject) {
     return html;
 }
 function editRate(enid) {
-    main.open("编辑浮动利率配置", "/SwapFloatRate/Edit?enid=" + enid, { area: ['500px', '600px'] });
+    main.open("编辑浮动利率配置", "/SwapFloatRate/Edit?enid=" + enid, { area: ['500px', '650px'] });
 }
 function deleteRate(enid) {
     main.confirm("确定要删除吗？", function () {
diff --git a/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js b/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js
index 52ce5b18..eb68b66a 100644
--- a/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js
+++ b/YLErpWeb/wwwroot/Scripts/app/swaptrade/swapTradeEdit.js
@@ -344,10 +344,18 @@ const vue = new Vue({
                     }
                     x.SwapIntervalList.push(interval);
                 }
+                if (x.InterestType == 1 && item.interest_rest_days<0) {
+                    main.message("利息端第" + (index + 1) + "重置频率必须大于0");
+                    errorcount++;
+                    return false;
+                }
                 x.FloatRateUnderlyingCode = x.FloatRateUnderlyingCode == "--" ? null : x.FloatRateUnderlyingCode;
                 x.InterestSwapInterval = JSON.stringify(x.SwapIntervalList);
                 thisObj.trade.swap_positions.push(x);
             });
+            if (errorcount > 0) {
+                return;
+            }
             var margin = 0;
             this.marginSwapList.forEach((x, index) => {
                 if ((x.UnderlyingCode == null || x.UnderlyingCode.length == 0) && x.SwapIntervalList.length == 0) {
@@ -452,6 +460,13 @@ const vue = new Vue({
                 item.InterestType = 0;
             }
         },
+        changeInterestType(item) {
+            if (item.InterestType == 0) {
+                item.interest_rest_days = null;
+            } else {
+                item.interest_rest_days = 1;
+            }
+        },
         setUnderlyingCode(data, item) {
             var underlyingCode = item.UnderlyingCode;
             if (underlyingCode != data.Code) {
@@ -483,7 +498,6 @@ const vue = new Vue({
                 item.interest_rest_days = 1;
                 item.interest_rule = 0;
             } else {
-                item.interest_rest_days = null;
                 item.interest_rule = null;
             }
             //this.getFloatRate(item);
@@ -1133,7 +1147,7 @@ const vue = new Vue({
                 IsAnnualized: true,//是否年化
                 HappenDate: null,//发生日期,
                 Currency: 'CNY',//币种
-                interest_rest_days: null,//重置频率
+                interest_rest_days: 1,//重置频率
                 interest_rule: null//利率准则
             }
             thisObj.getSwapList.push(getSwap);