From 8b9646ec10bbf391620ee564507f770e6ad97bdd Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 27 十月 2023 09:04:11 +0800
Subject: [PATCH] 修改默认查询日期
---
zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml | 2 +-
zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs | 14 +++++++-------
zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs | 4 ++--
zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml | 2 +-
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs | 8 ++++----
zhengcaioa/zhengcaioa/Views/IntentionCustomer/Indexhuiyuan.cshtml | 2 +-
6 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
index 8714468..f02eaeb 100644
--- a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
@@ -1020,13 +1020,13 @@
return JsonConvert.SerializeObject(resultEntity);
}
- //閿�鍋囧繀椤讳笁澶╀互鍐�
- if (leaveOff.EndTime.Value.Date < DateTime.Now.Date.AddDays(-4))
- {
- resultEntity.Result = false;
- resultEntity.Message = "璇峰湪72灏忔椂鍐呰繘琛岄攢鍋囧鐞嗭紝瓒呰繃72灏忔椂鏃犳硶鎻愪氦";
- return JsonConvert.SerializeObject(resultEntity);
- }
+ ////閿�鍋囧繀椤讳笁澶╀互鍐�
+ //if (leaveOff.EndTime.Value.Date < DateTime.Now.Date.AddDays(-4))
+ //{
+ // resultEntity.Result = false;
+ // resultEntity.Message = "璇峰湪72灏忔椂鍐呰繘琛岄攢鍋囧鐞嗭紝瓒呰繃72灏忔椂鏃犳硶鎻愪氦";
+ // return JsonConvert.SerializeObject(resultEntity);
+ //}
}
using (TransactionScope scope = new TransactionScope())
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
index f2f3346..324d24b 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
@@ -166,8 +166,8 @@
ViewBag.ShengDropDown = areaDTOs.Select(x => new { code = x.CodeId, label = x.Name }).ToList();
- ViewBag.Baomingtimebegin = DateTime.Now.AddMonths(-6).ToString("yyyy-MM-dd");
- ViewBag.Baomingtimeend = DateTime.Now.ToString("yyyy-MM-dd");
+ ViewBag.Baomingtimebegin = "";// DateTime.Now.AddMonths(-6).ToString("yyyy-MM-dd");
+ ViewBag.Baomingtimeend = "";// DateTime.Now.ToString("yyyy-MM-dd");
return View();
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
index d892fd1..4653ba9 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
@@ -189,8 +189,8 @@
areaDTOs.Insert(1, areaDTOsic);
ViewBag.ShengDropDown = areaDTOs.Select(x => new { code = x.CodeId, label = x.Name }).ToList();
- ViewBag.Baomingtimebegin = DateTime.Now.AddMonths(-6).ToString("yyyy-MM-dd");
- ViewBag.Baomingtimeend = DateTime.Now.ToString("yyyy-MM-dd");
+ ViewBag.Baomingtimebegin = "";// DateTime.Now.AddMonths(-6).ToString("yyyy-MM-dd");
+ ViewBag.Baomingtimeend = "";// DateTime.Now.ToString("yyyy-MM-dd");
return View();
@@ -234,8 +234,8 @@
- ViewBag.Baomingtimebegin = DateTime.Now.AddMonths(-6).ToString("yyyy-MM-dd");
- ViewBag.Baomingtimeend = DateTime.Now.ToString("yyyy-MM-dd");
+ ViewBag.Baomingtimebegin = "";//DateTime.Now.AddMonths(-6).ToString("yyyy-MM-dd");
+ ViewBag.Baomingtimeend = "";//DateTime.Now.ToString("yyyy-MM-dd");
return View();
diff --git a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
index cb877c6..12e482b 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
@@ -66,7 +66,7 @@
}
},
];
- dataUrl = "/CooperatecustomCustomer/GetList?Createtime=" + Baomingtimebegin + "|" + Baomingtimeend +"@(string.IsNullOrEmpty(Creater)?"": "&Ywjl=" + Creater)";
+ dataUrl = "/CooperatecustomCustomer/GetList?Createtime=" /*+ Baomingtimebegin + "|" + Baomingtimeend*/ +"@(string.IsNullOrEmpty(Creater)?"": "&Ywjl=" + Creater)";
searchCol = [
{ label: '瀹㈡埛鏉ユ簮', name: 'Khly', labtype: 'combox', hidden: false, data: JSON.parse(khlys), cwidth: '5%', cccwidth: '8%' },
diff --git a/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml b/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml
index 42ec91b..44d8e95 100644
--- a/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml
@@ -74,7 +74,7 @@
},
];
- dataUrl = "/IntentionCustomer/GetList?Createtime=" + Baomingtimebegin + "|" + Baomingtimeend +"@(string.IsNullOrEmpty(Creater11) ?"": "&Ywjl=" + Creater11)";
+ dataUrl = "/IntentionCustomer/GetList?Createtime=" /*+ Baomingtimebegin + "|" + Baomingtimeend*/ +"@(string.IsNullOrEmpty(Creater11) ?"": "&Ywjl=" + Creater11)";
searchCol = [
{ label: '瀹㈡埛鏉ユ簮', name: 'Khly', labtype: 'combox', hidden: false, data: JSON.parse(khlys), cwidth: '5%', cccwidth: '8%' },
{ label: '琛屼笟鍒嗙被', name: 'Hyfl', labtype: 'combox', hidden: false, data: JSON.parse(hyfls), cwidth: '5%', cccwidth: '15%' },
diff --git a/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Indexhuiyuan.cshtml b/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Indexhuiyuan.cshtml
index 7162f12..1007e2b 100644
--- a/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Indexhuiyuan.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Indexhuiyuan.cshtml
@@ -46,7 +46,7 @@
];
- dataUrl = "/IntentionCustomer/GetListhuiyuan?Createtime=" + Baomingtimebegin + "|" + Baomingtimeend ;
+ dataUrl = "/IntentionCustomer/GetListhuiyuan?Createtime="/* + Baomingtimebegin + "|" + Baomingtimeend*/ ;
searchCol = [
{ label: '璐﹀彿:', name: 'Itcode', labtype: 'txt', hidden: false },
{ label: '鍚嶇О:', name: 'Name', labtype: 'txt', hidden: false },
--
Gitblit v1.9.1