diff --git a/Framework/YLErp.Core/DBModels/Client.cs b/Framework/YLErp.Core/DBModels/Client.cs
index 57c2d947..d55ae7f2 100644
--- a/Framework/YLErp.Core/DBModels/Client.cs
+++ b/Framework/YLErp.Core/DBModels/Client.cs
@@ -1216,6 +1216,13 @@ namespace YLErp.DBModels
         [DataChange]
         public string ManagerAbbreviation { get; set; }
 
+
+        /// <summary>
+        /// 是否不再预警（0：预警，1：不预警）
+        /// </summary>
+        [DisplayName("是否不再预警")]
+        public bool? isWarning { get; set; }
+
     }
 
     [NotMapped]
diff --git a/Framework/YLErp.Core/DBModels/Enums/DerivativesInvestmentVarietiesEnum.cs b/Framework/YLErp.Core/DBModels/Enums/DerivativesInvestmentVarietiesEnum.cs
index f2f425e3..cc86bc7c 100644
--- a/Framework/YLErp.Core/DBModels/Enums/DerivativesInvestmentVarietiesEnum.cs
+++ b/Framework/YLErp.Core/DBModels/Enums/DerivativesInvestmentVarietiesEnum.cs
@@ -2,9 +2,6 @@
 {
     public enum DerivativesInvestmentVarietiesEnum
     {
-        场外期权 = 1,
-        场外互换 = 2,
-        远期 = 3,
-        其他 = 4
+        场外互换 = 2
     }
 }
diff --git a/Framework/YLErp.Core/DBModels/clientduty.cs b/Framework/YLErp.Core/DBModels/clientduty.cs
index 6c198509..608639e4 100644
--- a/Framework/YLErp.Core/DBModels/clientduty.cs
+++ b/Framework/YLErp.Core/DBModels/clientduty.cs
@@ -184,6 +184,9 @@ namespace YLErp.DBModels
         /// 来源id主要用于编辑审批
         /// </summary>
         public int? SourceId { get; set; }
+        [DisplayName("证件有效期")]
+        [DataChange]
+        public string AuthorizeEffectiveEndDateStr { get; set; }
 
         [NotMapped]
         public DateTime? IdCardEffectiveDate
@@ -204,7 +207,25 @@ namespace YLErp.DBModels
             }
             set { value = this.IdCardEffectiveDate; }
         }
-
+        [NotMapped]
+        public DateTime? AuthorizeEffectiveEndDate
+        {
+            get
+            {
+                DateTime date = new DateTime();
+                if (!string.IsNullOrWhiteSpace(AuthorizeEffectiveEndDateStr)
+                    && (
+                    DateTime.TryParseExact(AuthorizeEffectiveEndDateStr, "yyyyMMdd", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.AdjustToUniversal, out date)
+                    || DateTime.TryParseExact(AuthorizeEffectiveEndDateStr, "yyyy/MM/dd", System.Globalization.CultureInfo.InvariantCulture, System.Globalization.DateTimeStyles.AdjustToUniversal, out date)
+                   || DateTime.TryParse(AuthorizeEffectiveEndDateStr, out date))
+                   )
+                {
+                    return date;
+                }
+                return null;
+            }
+            set { value = this.AuthorizeEffectiveEndDate; }
+        }
         public string GetDataTraceKeyInfo()
         {
             return "客户联系人:" + ContactName;
diff --git a/YLErpDAL/Modules/ClientModule/ClientWarningService.cs b/YLErpDAL/Modules/ClientModule/ClientWarningService.cs
new file mode 100644
index 00000000..daa11163
--- /dev/null
+++ b/YLErpDAL/Modules/ClientModule/ClientWarningService.cs
@@ -0,0 +1,261 @@
+using MoreLinq;
+using YLErp.BLL;
+
+namespace YLErp.Modules.ClientModule
+{
+    /// <summary>
+    /// 山证金衍 客户预警
+    /// </summary>
+    public class ClientWarningService : ClientBaseService
+    {
+        public ClientWarningService(OptUserInfo userInfo) : base(userInfo)
+        {
+
+        }
+
+        public ClientWarningService(ClientBaseService baseService) : base(baseService)
+        {
+        }
+
+        public string CheckedClient()
+        {
+            var query = DbContext.client.Where(x => x.ProcessStatus == "已开户" && x.isWarning != true);
+
+            var clientdutys = (from duty in DbContext.clientduty.Where(x => x.ApprovalOrder < 1)
+                               join client in query on duty.ClientId equals client.id
+                               select duty).ToList();
+
+            var clients = query.ToList();
+
+            var expireDate = valuedateBLL.ValueDate;
+            var dueDate = valuedateBLL.ValueDate.AddMonths(3);
+
+            if (clients.Where(x => x.LicenseValidTime < expireDate || x.EvaluateExpireDate < expireDate).Any() || clientdutys.Where(x => x.IdCardEffectiveDate < expireDate || x.AuthorizeEffectiveEndDate < expireDate).Any())
+            {
+                return "已到期";
+            }
+            else if (clients.Where(x => x.LicenseValidTime <= dueDate || x.EvaluateExpireDate <= dueDate).Any() || clientdutys.Where(x => x.IdCardEffectiveDate <= dueDate || x.AuthorizeEffectiveEndDate <= dueDate).Any())
+            {
+                return "即将到期";
+            }
+            else
+            {
+                return "无异常";
+            }
+        }
+
+        public List<ExpireWarning> GetExpiresWarning(ExpireWarningReq req)
+        {
+            var list = new List<ExpireWarning>();
+
+            var dueDate = valuedateBLL.ValueDate.AddMonths(3);
+
+            var query1 = DbContext.client.Where(x => x.ProcessStatus == "已开户");
+            if (!string.IsNullOrWhiteSpace(req.Number))
+            {
+                query1 = query1.Where(x => x.Number.Contains(req.Number));
+            }
+            if (!string.IsNullOrWhiteSpace(req.Name))
+            {
+                query1 = query1.Where(x => x.Name.Contains(req.Name));
+            }
+
+            var query2 = from duty in DbContext.clientduty.Where(x => x.ApprovalOrder < 1)
+                         join client in query1 on duty.ClientId equals client.id
+                         select duty;
+
+            var clients = query1.ToList();
+            var clientdutys = query2.ToList();
+
+            var ids1 = clients.Where(x => x.LicenseValidTime <= dueDate || x.EvaluateExpireDate <= dueDate).Select(x => x.id).ToList();
+            var ids2 = clientdutys.Where(x => x.IdCardEffectiveDate <= dueDate || x.AuthorizeEffectiveEndDate <= dueDate).Select(x => x.ClientId??0).ToList();
+            ids1.AddRange(ids2);
+            var ids= ids1.Distinct().ToList();
+            clients = clients.Where(x => ids.Contains(x.id)).ToList();
+
+            var datelast = new DateTime(3000, 12, 31);
+
+            foreach (var c in clients)
+            {
+                var e = new ExpireWarning
+                {
+                    LicenseValidTime = c.LicenseValidTime
+                };
+                e.LicenseValidTimeStr = e.LicenseValidTime == datelast ? "长期有效" : e.LicenseValidTime?.ToString("yyyy-MM-dd");
+                e.EvaluateExpireDate = c.EvaluateExpireDate;
+                e.EvaluateExpireDateStr = e.EvaluateExpireDate == datelast ? "长期有效" : e.EvaluateExpireDate?.ToString("yyyy-MM-dd");
+                var dutys = clientdutys.Where(x => x.ClientId == c.id);
+                if (dutys.Any())
+                {
+                    e.IdCardEffectiveDate = dutys.Where(x => x.IdCardEffectiveDate != null).OrderBy(x => x.IdCardEffectiveDate).FirstOrDefault()?.IdCardEffectiveDate;
+                    e.IdCardEffectiveDateStr = e.IdCardEffectiveDate == datelast ? "长期有效" : e.IdCardEffectiveDate?.ToString("yyyy-MM-dd");
+                    e.AuthorizeEffectiveEndDate = dutys.Where(x => x.AuthorizeEffectiveEndDate != null).OrderBy(x => x.AuthorizeEffectiveEndDate).FirstOrDefault()?.AuthorizeEffectiveEndDate;
+                    e.AuthorizeEffectiveEndDateStr = e.AuthorizeEffectiveEndDate == datelast ? "长期有效" : e.AuthorizeEffectiveEndDate?.ToString("yyyy-MM-dd");
+                }
+                e.EvaluateDate = c.EvaluateDate;
+                e.EvaluateDateStr = e.EvaluateDate?.ToString("yyyy-MM-dd");
+                e.isWarning = c.isWarning ?? false;
+                e.id = c.id;
+                e.EncryptId = c.EncryptId;
+                e.Number = c.Number;
+                e.Name = c.Name;
+                list.Add(e);
+            }
+
+            if (ids.Any())
+            {
+                if (req.StartExpireDate != null && req.EndExpireDate != null)
+                {
+                    list = list.Where(x => (x.LicenseValidTime >= req.StartExpireDate && x.LicenseValidTime <= req.EndExpireDate) || (x.EvaluateExpireDate >= req.StartExpireDate && x.EvaluateExpireDate <= req.EndExpireDate) || (x.IdCardEffectiveDate >= req.StartExpireDate && x.IdCardEffectiveDate <= req.EndExpireDate) || (x.AuthorizeEffectiveEndDate >= req.StartExpireDate && x.AuthorizeEffectiveEndDate <= req.EndExpireDate)).ToList();
+                }
+                else
+                {
+                    if (req.StartExpireDate != null)
+                    {
+                        list = list.Where(x => x.LicenseValidTime >= req.StartExpireDate || x.EvaluateExpireDate >= req.StartExpireDate || x.IdCardEffectiveDate >= req.StartExpireDate || x.AuthorizeEffectiveEndDate >= req.StartExpireDate).ToList();
+                    }
+                    if (req.EndExpireDate != null)
+                    {
+                        list = list.Where(x => x.LicenseValidTime <= req.EndExpireDate || x.EvaluateExpireDate <= req.EndExpireDate || x.IdCardEffectiveDate <= req.EndExpireDate || x.AuthorizeEffectiveEndDate <= req.EndExpireDate).ToList();
+                    }
+                }
+            }
+
+            return list;
+        }
+
+        public void UpdateWarning(int id)
+        {
+            var client = DbContext.client.Find(id);
+            if (client != null)
+            {
+                client.isWarning = client.isWarning != true;
+                _ = DbContext.SaveChanges();
+            }
+        }
+
+        public ExpireWarningStatus GetExpireStatus()
+        {
+            var expires = GetExpiresWarning(new ExpireWarningReq());
+            var ret = new ExpireWarningStatus
+            {
+                status = "无异常",
+                isExpire = 0,
+                isDue = 0,
+                isExpire_all = 0,
+                isDue_all = 0
+            };
+
+            if (expires.Count() > 0)
+            {
+                var expirelist = expires.Where(x => x.LicenseValidTime < ret.ExpireDate || x.EvaluateExpireDate < ret.ExpireDate || x.IdCardEffectiveDate < ret.ExpireDate || x.AuthorizeEffectiveEndDate < ret.ExpireDate).ToList();
+                var duelist = expires;
+                if (expirelist.Count() > 0)
+                {
+                    var expireids = expirelist.Select(x => x.id).ToList();
+                    duelist = duelist.Where(x => !expireids.Contains(x.id)).ToList();
+                    ret.status = "已到期";
+                    ret.isExpire_all = expirelist.Count();
+                    if (expirelist.Where(x => x.isWarning == true).Count() > 0)
+                    {
+                        ret.isExpire = expirelist.Where(x => x.isWarning != true).Count();
+                    }
+                    else
+                    {
+                        ret.isExpire = ret.isExpire_all;
+                    }
+                }
+                if (duelist.Count() > 0)
+                {
+                    ret.status = ret.status == "已到期" ? "已到期" : "即将到期";
+                    ret.isDue_all = duelist.Count();
+                    if (duelist.Where(x => x.isWarning == true).Count() > 0)
+                    {
+                        ret.isDue = duelist.Where(x => x.isWarning != true).Count();
+                    }
+                    else
+                    {
+                        ret.isDue = ret.isDue_all;
+                    }
+                }
+            }
+            return ret;
+        }
+    }
+
+    public class ExpireWarning
+    {
+        public int id { get; set; }
+
+        /// <summary>
+        /// 加密主键
+        /// </summary>
+        public string? EncryptId { get; set; }
+
+        public string? Number { get; set; }
+
+        public string? Name { get; set; }
+
+        public DateTime? LicenseValidTime { get; set; }
+
+        public string? LicenseValidTimeStr { get; set; }
+
+        public DateTime? EvaluateDate { get; set; }
+
+        public string? EvaluateDateStr { get; set; }
+
+        public DateTime? EvaluateExpireDate { get; set; }
+
+        public string? EvaluateExpireDateStr { get; set; }
+
+        public DateTime? IdCardEffectiveDate { get; set; }
+
+        public string? IdCardEffectiveDateStr { get; set; }
+
+        public DateTime? AuthorizeEffectiveEndDate { get; set; }
+
+        public string? AuthorizeEffectiveEndDateStr { get; set; }
+
+        public bool isWarning { get; set; }
+    }
+
+    public class ExpireWarningReq
+    {
+        public string? Number { get; set; }
+
+        public string? Name { get; set; }
+
+        public DateTime? StartExpireDate { get; set; }
+
+        public DateTime? EndExpireDate { get; set; }
+    }
+
+    public class ExpireWarningStatus
+    {
+        public DateTime ExpireDate
+        {
+            get
+            {
+                return valuedateBLL.ValueDate;
+            }
+        }
+
+        public DateTime DueDate
+        {
+            get
+            {
+                return valuedateBLL.ValueDate.AddMonths(3);
+            }
+        }
+
+        public string? status { get; set; }
+
+        public int? isExpire { get; set; }
+
+        public int? isDue { get; set; }
+
+        public int? isExpire_all { get; set; }
+
+        public int? isDue_all { get; set; }
+    }
+}
diff --git a/YLErpDAL/Modules/SwapModule/SwapDealService.cs b/YLErpDAL/Modules/SwapModule/SwapDealService.cs
index 544f2716..9e30f482 100644
--- a/YLErpDAL/Modules/SwapModule/SwapDealService.cs
+++ b/YLErpDAL/Modules/SwapModule/SwapDealService.cs
@@ -820,7 +820,7 @@ namespace YLErp.Modules.SwapModule
             unwindData.AnnualDays = tradeExtend == null ? 365 : tradeExtend.ExtendObj.AnnualDays;
             unwindData.CloseMethod = unwindQty == unwindData.PositionQty ? (int)CloseMethodEnum.全部平仓 : (int)CloseMethodEnum.部分平仓;
             unwindData.ClosePercent = unwindData.PositionQty == 0 ? 0 : unwindPercent;
-            unwindData.CloseNotionalValue = unwindData.PosiNotionalValue;
+            unwindData.CloseNotionalValue = unwindData.PosiNotionalValue* unwindPercent;
             unwindData.CloseQty = unwindQty;
             if (position != null)
             {
@@ -850,7 +850,7 @@ namespace YLErp.Modules.SwapModule
                 floatEvent.TradingFeePending = position.PosiTradingFeePending * unwindData.ClosePercent;
                 var mergeClosePercent = mergeQty == 0 ? 0 : unwindQty / mergeQty;
                 floatEvent.TradingFee = penddingFee * mergeClosePercent;
-                floatEvent.MarkClosePnl = (unwindPriceFee - position.PosiNetPrice) * unwindData.PosiNotionalValue * floatRatio * longRatio;
+                floatEvent.MarkClosePnl = (unwindPriceFee - position.PosiNetPrice) * unwindQty * floatRatio * longRatio;
                 floatEvent.MarkClosePnl = decimal.Parse(floatEvent.MarkClosePnl.ToString("0.00"));
                 floatEvent.TradingAmount = floatEvent.Quantity * floatEvent.ContractSize;
                 floatEvent.OptLog = "流水自动";
@@ -858,7 +858,7 @@ namespace YLErp.Modules.SwapModule
                 floatEvent.SetOpt(UserInfo);
             }
             unwindData.FlowEvents.Add(floatEvent);
-            var interestPositions = GetUnwindInterests(unwindData.ValueDate, unwindData.UnwindDate.Value, td.id, 1, (int)SwapEventTypeEnum.平仓);
+            var interestPositions = GetUnwindInterests(unwindData.ValueDate, unwindData.UnwindDate.Value, td.id, unwindPercent, (int)SwapEventTypeEnum.平仓);
             interestPositions.ForEach(item =>
             {
                 item.OptLog = "流水自动";
diff --git a/YLErpDAL/Modules/SystemModule/ClientDataModel.cs b/YLErpDAL/Modules/SystemModule/ClientDataModel.cs
index 0f8ce8f4..0d00ea90 100644
--- a/YLErpDAL/Modules/SystemModule/ClientDataModel.cs
+++ b/YLErpDAL/Modules/SystemModule/ClientDataModel.cs
@@ -745,25 +745,10 @@ namespace YLErp.Modules.SystemModule
         public static List<SelectItem> GetAllDerivativesInvestmentVarieties()
         {
             return new List<SelectItem> {
-                new SelectItem
-                {
-                    Text = DerivativesInvestmentVarietiesEnum.场外期权.ToString(),
-                    Value = ((int)DerivativesInvestmentVarietiesEnum.场外期权).ToString()
-                },
                 new SelectItem
                 {
                     Text = DerivativesInvestmentVarietiesEnum.场外互换.ToString(),
                     Value = ((int)DerivativesInvestmentVarietiesEnum.场外互换).ToString()
-                },
-                new SelectItem
-                {
-                    Text = DerivativesInvestmentVarietiesEnum.远期.ToString(),
-                    Value = ((int)DerivativesInvestmentVarietiesEnum.远期).ToString()
-                },
-                new SelectItem
-                {
-                    Text = DerivativesInvestmentVarietiesEnum.其他.ToString(),
-                    Value = ((int)DerivativesInvestmentVarietiesEnum.其他).ToString()
                 }
             };
         }
@@ -1532,11 +1517,6 @@ namespace YLErp.Modules.SystemModule
         public static List<SelectItem> GetAllDerivativesInvestmentVarietiesForCredit()
         {
             return new List<SelectItem> {
-                new SelectItem
-                {
-                    Text = DerivativesInvestmentVarietiesEnum.场外期权.ToString(),
-                    Value = ((int)DerivativesInvestmentVarietiesEnum.场外期权).ToString()
-                },
                 new SelectItem
                 {
                     Text = DerivativesInvestmentVarietiesEnum.场外互换.ToString(),
diff --git a/YLErpWeb/Controllers/clientController.cs b/YLErpWeb/Controllers/clientController.cs
index 3eeeaebb..e000a5cb 100644
--- a/YLErpWeb/Controllers/clientController.cs
+++ b/YLErpWeb/Controllers/clientController.cs
@@ -95,7 +95,40 @@ namespace YLErp.Web.Controllers
             return View();
         }
 
+        [MyAuthorize("客户管理-客户查看")]
+        public ActionResult ClientExpireWarningList()
+        {
+            return View();
+        }
 
+        [MyAuthorize("客户管理-客户查看")]
+        public JsonResult ClientExpireWarningListJson(ExpireWarningReq req)
+        {
+            var sList = new ClientWarningService(CurUser).GetExpiresWarning(req);
+            return Json(sList);
+        }
+
+        [MyAuthorize("客户管理-客户查看")]
+        public JsonResult CheckedClientWarning()
+        {
+            var expireWarningStatus = new ClientWarningService(CurUser).CheckedClient();
+            return Json(expireWarningStatus);
+        }
+
+        [MyAuthorize("客户管理-客户查看")]
+        public JsonResult ClientExpireWarningUpdate(string enid)
+        {
+            var intid = DataProtectHelper.DecryptInt(enid);
+            new ClientWarningService(CurUser).UpdateWarning(intid);
+            return JsonSuccess("");
+        }
+
+        [MyAuthorize("客户管理-客户查看")]
+        public JsonResult ClientExpireWarningStatusJson(string enid)
+        {
+            var expireWarningStatus = new ClientWarningService(CurUser).GetExpireStatus();
+            return Json(expireWarningStatus);
+        }
 
         /// <summary>
         /// 导出客户人员信息
diff --git a/YLErpWeb/Views/client/ClientExpireWarningList.cshtml b/YLErpWeb/Views/client/ClientExpireWarningList.cshtml
new file mode 100644
index 00000000..39f27c27
--- /dev/null
+++ b/YLErpWeb/Views/client/ClientExpireWarningList.cshtml
@@ -0,0 +1,37 @@
+@model List<YLErp.Modules.ClientModule.ExpireWarning>
+@{
+    ViewBag.Title = "客户信息";
+    Layout = "~/Views/Shared/_InfoLayout.cshtml";
+    var pageObj = new
+    {
+        ExpireDate = valuedateBLL.ValueDate,
+        DueDate = valuedateBLL.ValueDate.AddMonths(3),
+    };
+}
+@section CSS{
+    <style>
+        .buttonedit { border: 1px solid gray; background-color: #fff !important; color: gray !important; min-width: 50px; height: 20px; border-radius: 0.25rem; margin: 0 0.5rem 0 0.5rem; }
+    </style>
+}
+@section JS{
+    <script src="~/front/calendar?v=@(HtmlUtil.JsVersion)"></script>
+    <script src="~/Statics/libs/datetime/flatpickr/flatpickr.min.js?v=@(HtmlUtil.JsVersion)"></script>
+    <script src="~/Statics/libs/datetime/flatpickr/vue-flatpickr.min.js?v=@(HtmlUtil.JsVersion)"></script>
+    <script src="~/scripts/app/client/clientexpirewarninglist.js?v=@(HtmlUtil.JsVersion)"></script>
+    <script type="text/javascript">
+        const page = @Json.Serialize(pageObj);
+    </script>
+}
+
+<body style="background-color:white">
+    <div id="statue">
+    </div>
+    <div class="searchdiv" style="border:0px;box-shadow:none;margin:0rem 0rem 0rem 1rem;">
+        <span style="padding:5px;">筛选条件：</span>
+        @Html.ShortInput("Number", "客户编号")
+        @Html.ShortInput("Name", "客户名称")
+        @Html.SearchDateRange("ExpireDate", "到期日期")
+        @MyControls.SearchBtn()
+    </div>
+    @Html.Raw(JqGridSimple.OutTable())
+</body>
diff --git a/YLErpWeb/Views/client/ClientListV2.cshtml b/YLErpWeb/Views/client/ClientListV2.cshtml
index 2b4a5451..e454a2d2 100644
--- a/YLErpWeb/Views/client/ClientListV2.cshtml
+++ b/YLErpWeb/Views/client/ClientListV2.cshtml
@@ -55,7 +55,10 @@
     </script>
     <script src="~/Scripts/app/client/clientListV2.js?v=@(HtmlUtil.JsVersion)"></script>
 }
-
+<div style="float:right;margin-top:-50px;margin-right:10px;">
+    <span>到期预警 &nbsp;</span>
+    <button class="btn" id="statue" onclick="clientExpireWarningList()"></button>
+</div>
 <div class="searchdiv">
     <div>
         @Html.ShortInput("Name", "客户名称")
diff --git a/YLErpWeb/Views/client/_ClientDutyEdit.cshtml b/YLErpWeb/Views/client/_ClientDutyEdit.cshtml
index fec453ac..24a87c24 100644
--- a/YLErpWeb/Views/client/_ClientDutyEdit.cshtml
+++ b/YLErpWeb/Views/client/_ClientDutyEdit.cshtml
@@ -83,6 +83,16 @@
                     <label class="formlabel">授权到期日</label>
                     <vue-datepicker id="duty_AuthorizeEndDate" v-model="duty.AuthorizeEndDate" v-bind:holiday="true" class="text-box" />
                 </div>
+                <div class="form-group" style="overflow: auto;">
+                    <div style="width: 350px;float:left">
+                        <label class="formlabel">授权有效期</label>
+                        <input class="text-box" disabled="disabled" v-show="duty.AuthorizeEffectiveEndDateStr=='30001231'" type="text" id="AuthorizeEffectiveEndDateStr" value="长期有效" />
+                        <vue-datepicker id="AuthorizeEffectiveEndDate" v-show="duty.AuthorizeEffectiveEndDateStr!='30001231'" v-model="duty.AuthorizeEffectiveEndDate" class="text-box" />
+                    </div>
+                    <div style="width: 30px;float:left;height: 35px;padding-top: 5px;">
+                        <button class="btn btn-primary btn-sm mr-2" style="position:absolute;min-width: 35px;  font-size: 12px; height: 22px; line-height: 16px; padding: 2px 2px 2px 2px;margin-right:0px!important;" id="clickLongOrShort_Authorize" type="button" v-on:click="clickLongOrShort('Authorize')">长期</button>
+                    </div>
+                </div>
                 <div class="form-group" style="display:none">
                     <label class="formlabel">微信号</label>
                     <input class="text-box" type="text" name="Fax" v-model="duty.Weixin" />
diff --git a/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js b/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js
index 2d6d6f3e..c35b60c9 100644
--- a/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js
+++ b/YLErpWeb/wwwroot/Scripts/app/client/clientEditV2.js
@@ -387,7 +387,18 @@ const dutyVue = (function () {
                         }
                     }
                 }
-
+                if (_.trim($("#AuthorizeEffectiveEndDate").val()) == "" && $("#clickLongOrShort_Authorize").text() == "长期") {
+                    this.duty.AuthorizeEffectiveEndDateStr = "";
+                    this.duty.AuthorizeEffectiveEndDate = "";
+                } else {
+                    if (_.trim(this.duty.AuthorizeEffectiveEndDate) || $("#clickLongOrShort_Authorize").text() == "短期") {
+                        if ($("#clickLongOrShort_Authorize").text() != "长期") {
+                            this.duty.AuthorizeEffectiveEndDateStr = "30001231"
+                        } else {
+                            this.duty.AuthorizeEffectiveEndDateStr = new Date(this.duty.AuthorizeEffectiveEndDate.substr(0, 10)).Format("yyyyMMMdd");
+                        }
+                    }
+                }
 
 
                 let self = this, clone = _.cloneDeep(this.duty);
@@ -437,15 +448,27 @@ const dutyVue = (function () {
                     this.duty.IsReceiveEmail = $("#duty_ContactTypeId :selected:contains(约定收件人)").length + '';
                 }
             },
-            clickLongOrShort() {
-                if ($("#clickLongOrShort").text() == "长期") {
-                    $("#IdCardEffectiveDateStr").show();
-                    $("#IdCardEffectiveDate").hide();
-                    $("#clickLongOrShort").text("短期");
-                } else {
-                    $("#IdCardEffectiveDateStr").hide();
-                    $("#IdCardEffectiveDate").show();
-                    $("#clickLongOrShort").text("长期");
+            clickLongOrShort(id) {
+                if (id == "IdCard") {
+                    if ($("#clickLongOrShort_IdCard").text() == "长期") {
+                        $("#IdCardEffectiveDateStr").show();
+                        $("#IdCardEffectiveDate").hide();
+                        $("#clickLongOrShort_IdCard").text("短期");
+                    } else {
+                        $("#IdCardEffectiveDateStr").hide();
+                        $("#IdCardEffectiveDate").show();
+                        $("#clickLongOrShort_IdCard").text("长期");
+                    }
+                } else if (id == "Authorize") {
+                    if ($("#clickLongOrShort_Authorize").text() == "长期") {
+                        $("#AuthorizeEffectiveEndDateStr").show();
+                        $("#AuthorizeEffectiveEndDate").hide();
+                        $("#clickLongOrShort_Authorize").text("短期");
+                    } else {
+                        $("#AuthorizeEffectiveEndDateStr").hide();
+                        $("#AuthorizeEffectiveEndDate").show();
+                        $("#clickLongOrShort_Authorize").text("长期");
+                    }
                 }
 
             }
diff --git a/YLErpWeb/wwwroot/Scripts/app/client/clientExpireWarningList.js b/YLErpWeb/wwwroot/Scripts/app/client/clientExpireWarningList.js
new file mode 100644
index 00000000..e69c4246
--- /dev/null
+++ b/YLErpWeb/wwwroot/Scripts/app/client/clientExpireWarningList.js
@@ -0,0 +1,257 @@
+$(function () {
+
+    Updatestatue()
+
+    var PostData = {};
+
+    $(".datepicker").datepicker({
+        changeMonth: true,
+        changeYear: true,
+        showButtonPanel: true,
+        showOtherMonths: true,
+        selectOtherMonths: true
+    });
+
+    grid = jQuery('#listGrid').jqGrid({
+        cmTemplate: {
+            align: 'center',
+            sortable: false
+        },
+        url: '/client/ClientExpireWarningListJson',
+        datatype: 'json',
+        height: 'auto',
+        width: '96%',
+        autowidth: false,
+        shrinkToFit: false,
+        viewrecords: true,
+        jsonReader: { repeatitems: false },
+        caption: '',
+        mtype: 'POST',
+        postData: PostData,
+        afterInsertRow: AfterInsertRow,
+        onSelectRow: rowclick,
+        ondblClickRow: rowdblclick,
+        colModel: colModelGrid,
+        pagerpos: 'left',
+        footerrow: false,
+        loadComplete: gridComplete,
+        onPaging: onJqgridPaging,
+    });
+
+    function keyEnter(event) {
+        try {
+            var e = event ? event : (window.event ? window.event : null);
+            if (e.keyCode === 13) {
+                SearchClick(true);
+            }
+        } catch (e) {
+            //
+        }
+    }
+
+    document.onkeydown = keyEnter;
+
+});
+
+var i = 0;
+
+var getColModelGrid = function () {
+    return [
+        {
+            name: 'id',
+            label: 'id',
+            index: 'id',
+            sortIndex: i++,
+            width: 1,
+            align: 'center',
+            hidden: true,
+            optionHide: true
+        }, {
+            name: 'EncryptId',
+            label: 'EncryptId',
+            index: 'EncryptId',
+            sortIndex: i++,
+            width: 1,
+            align: 'center',
+            hidden: true,
+            optionHide: true
+        }, {
+            name: '',
+            label: '操作',
+            index: '',
+            sortIndex: i++,
+            width: 220,
+            align: 'center',
+            sortable: false,
+            formatter: showToolName
+        }, {
+            name: 'Number',
+            label: '客户编号',
+            index: 'Number',
+            sortIndex: i++,
+            width: 200,
+            align: 'center',
+            sortable: false
+        }, {
+            name: 'Name',
+            label: '客户名称',
+            index: 'Name',
+            sortIndex: i++,
+            width: 300,
+            align: 'center',
+            sortable: false
+        }, {
+            name: 'EvaluateDate',
+            label: '适当性评估日期',
+            index: 'EvaluateDate',
+            width: 170,
+            align: 'center',
+            sortable: false,
+            formatter: 'date',
+        }, {
+            name: 'EvaluateExpireDateStr',
+            label: '适当性评估到期日',
+            index: 'EvaluateExpireDateStr',
+            sortIndex: i++,
+            width: 170,
+            align: 'center',
+            sortable: false,
+            cellattr: function (cellvalue, options, rowObject) {
+                return "style='" + checkDate(rowObject.EvaluateExpireDate) + "'";
+            }
+        }, {
+            name: 'AuthorizeEffectiveEndDateStr',
+            label: '人员证件到期日',
+            index: 'AuthorizeEffectiveEndDateStr',
+            sortIndex: i++,
+            width: 170,
+            align: 'center',
+            sortable: false,
+            cellattr: function (cellvalue, options, rowObject) {
+                return "style='" + checkDate(rowObject.AuthorizeEffectiveEndDate) + "'";
+            }
+        }
+    ];
+};
+var colModelGrid = getColModelGrid();
+
+function gridComplete() {
+    var newHeight = $(window).height() - 250;
+    $(".ui-jqgrid .ui-jqgrid-bdiv").css("cssText", "height: " + newHeight + "px!important;");
+    $('.ui-jqgrid-bdiv', '#gbox_listGrid').floatingScroll();
+}
+
+function checkDate(cellvalue) {
+    if (cellvalue < page.ExpireDate) {
+        return "background-color: #FAACAC"
+    } else if (cellvalue <= page.DueDate) {
+        return "background-color: #FDA749"
+    } else {
+        return "";
+    }
+    return "";
+}
+
+function SearchClick(isSearchclick) {
+    var listGrid = $('#listGrid');
+
+    listGrid.appendPostData({ Number: $("#Number").val() });
+    listGrid.appendPostData({ Name: $("#Name").val() });
+    listGrid.appendPostData({ StartExpireDate: $("#DateFromExpireDate").val() });
+    listGrid.appendPostData({ EndExpireDate: $("#DateToExpireDate").val() });
+
+    query_data = listGrid.jqGrid('getPostData');
+    if (typeof isSearchclick !== "undefined" && isSearchclick) {
+        //点击搜索时默认第一页
+        listGrid.jqGrid('setGridParam',
+            {
+                page: 1
+            });
+    }
+    listGrid.trigger('reloadGrid');
+}
+
+function showToolName(cellValue, options, rowObject) {
+    var html = "";
+    html = html +
+        "<input type=\"button\" class=\"wentiEdit\" title='查看'  onclick=\"startclientView('{0}')\" value=\"{1}\" />"
+            .template(rowObject.EncryptId, "查看");
+    if (rowObject.isWarning) {
+        html = html +
+            "<input type=\"button\" class=\"buttonedit\" title='继续预警'  onclick=\"cancel('{0}')\" value=\"{1}\" />"
+                .template(rowObject.EncryptId, "继续预警");
+    } else {
+        html = html +
+            "<input type=\"button\" class=\"wentiEdit\" title='不再预警'  onclick=\"cancel('{0}')\" value=\"{1}\" />"
+                .template(rowObject.EncryptId, "不再预警");
+    }
+    return html;
+}
+
+function startclientView(id) {
+    var srcurl = "/client/clientViewV2?enid=" + id;
+    var width = "1300px";
+    layer.open({
+        type: 2,
+        title: "查看客户信息",
+        shadeClose: false,
+        shade: 0.4,
+        area: [width, '800px'],
+        content: srcurl,
+        cancel: function (index, layero) {
+            var iframeWin = window["layui-layer-iframe" + index];
+            if (iframeWin.topVue == undefined) {
+                return window.layer.closeMe();
+            }
+            return iframeWin.topVue.closeMe();
+        }
+    });
+}
+
+function cancel(id) {
+    main.post("/client/ClientExpireWarningUpdate", { enid: id }).done(function (res) {
+        try {
+            SearchClick();
+            Updatestatue();
+            window.parent.reloadclient2 && window.parent.reloadclient2();
+        } catch (e) { }
+    });
+}
+
+function Updatestatue() {
+    main.post("/client/ClientExpireWarningStatusJson").done(function (res) {
+        var div = document.getElementById("statue");
+        var date = res;
+        var html = "";
+        if (date.status == "即将到期") {
+            div.setAttribute("style", "background-color:#FFF2D9;padding:5px 5px 5px 20px;margin:1rem 1rem 0rem 1rem;");
+            html += "<span style=\"color:#FF9933;font-weight:bold\">即将到期</span><span style=\"margin-left:30px;\">3个月内到期的客户:</span><span style=\"color:#FF9933;font-weight:bold\">" + date.isDue + "</span>";
+            if (date.isDue_all != date.isDue) {
+                html += "<span>(" + date.isDue_all + ")个</span>";
+            } else {
+                html += "<span>个</span>";
+            }
+            html += "<span style=\"margin-left:10px;\">已到期客户：0个</span>";
+        } else if (date.status == "已到期") {
+            div.setAttribute("style", "background-color:#FFE1E1;padding:5px 5px 5px 20px;margin:1rem 1rem 0rem 1rem;");
+            html += "<span style=\"color:red;font-weight:bold\">已到期</span><span style=\"margin-left:40px;\">3个月内到期的客户:</span><span style=\"color:#FF9933;font-weight:bold\">" + date.isDue + "</span>"
+            if (date.isDue_all != date.isDue) {
+                html += "<span>(" + date.isDue_all + ")个</span>";
+            } else {
+                html += "<span>个</span>";
+            }
+            html += "<span style=\"margin-left:10px;\">已到期客户：</span><span style=\"color:red;\">" + date.isExpire + "</span>";
+            if (date.isExpire_all != date.isExpire) {
+                html += "<span>(" + date.isExpire_all + ")个</span>";
+            } else {
+                html += "<span>个</span>";
+            }
+        } else {
+            div.setAttribute("style", "background-color:#E7F6FF;padding:5px 5px 5px 20px;margin:1rem 1rem 0rem 1rem;");
+            html += "<span style=\"color:#0282EC;font-weight:bold\">无异常</span>";
+            html += "<span style=\"margin-left:10px;\">3个月内到期的客户：0个</span>";
+            html += "<span style=\"margin-left:10px;\">已到期客户：0个</span>";
+        }
+        div.innerHTML = html;
+    });
+}
\ No newline at end of file
diff --git a/YLErpWeb/wwwroot/Scripts/app/client/clientListV2.js b/YLErpWeb/wwwroot/Scripts/app/client/clientListV2.js
index 8800fb01..a298928f 100644
--- a/YLErpWeb/wwwroot/Scripts/app/client/clientListV2.js
+++ b/YLErpWeb/wwwroot/Scripts/app/client/clientListV2.js
@@ -1,7 +1,7 @@
 var colModelGrid = [];
 $(function () {
     var PostData = {};
-
+    Updatestatue();
     getColModelGrid();
     $(".datepicker").datepicker({ changeMonth: true, changeYear: true, showButtonPanel: true, showOtherMonths: true, selectOtherMonths: true });
     jqGridInit();
@@ -521,12 +521,14 @@ function startclientView(id) {
 
 function reloadclient() {
     //重新加载
+    Updatestatue();
     SearchClick();
     window.layer.closeAll();
 }
 
 function reloadclient2() {
     //重新加载
+    Updatestatue();
     SearchClick();
 }
 
@@ -713,4 +715,39 @@ $("#OptName").change(function () {
 function showcolumnChooser() {
     main.showcolumnChooser(jQuery('#listGrid'), page.configcolumn_name);
 }
-
+function Updatestatue() {
+    main.post("/client/CheckedClientWarning").done(function (res) {
+        var div = document.getElementById("statue");
+        var date = res;
+        var html = "";
+        if (date == "即将到期") {
+            div.setAttribute("style", "border-color:#FF9933;border-radius:3px;box-shadow: 0 0px #FF9933;color:#FF9933;background-color:#FFF2D9");
+            html += "<i class=\"fa fa-circle\" style=\"color:#FF9933\"></i>&nbsp;即将到期";
+        } else if (date == "已到期") {
+            div.setAttribute("style", "border-color:red;border-radius:3px;box-shadow: 0 0px red;color:red;background-color:#FFE1E1");
+            html += "<i class=\"fa fa-circle\" style=\"color:red\"></i>&nbsp;已到期";
+        } else {
+            div.setAttribute("style", "border-color:#0282EC;border-radius:3px;box-shadow: 0 0px #0282EC;color:#0282EC;background-color:#E7F6FF;");
+            html += "<i class=\"fa fa-circle\" style=\"color:#0282EC;\"></i>&nbsp;无异常";
+        }
+        div.innerHTML = html;
+    });
+}
+function clientExpireWarningList() {
+    var srcurl = "/client/ClientExpireWarningList";
+    layer.open({
+        type: 2,
+        title: "查看预警情况",
+        shadeClose: false,
+        shade: 0.4,
+        area: ['1650px', '900px'],
+        content: srcurl,
+        cancel: function (index, layero) {
+            var iframeWin = window["layui-layer-iframe" + index];
+            if (iframeWin.topVue == undefined) {
+                return window.layer.closeMe();
+            }
+            return iframeWin.topVue.closeMe();
+        }
+    });
+}
\ No newline at end of file