From 63f97a810a8dcd213f4624533aa52f7bc2647d49 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 24 八月 2021 13:50:53 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Edit.cshtml | 88 +++++++++++-----
zhengcaioa/zhengcaioa/Views/User/Edit.cshtml | 7 +
zhengcaioa/Services/HrSalaryService.cs | 15 +-
zhengcaioa/Model/AdmGoodsManage.cs | 1
zhengcaioa/Services/AdmGoodsManageService.cs | 6
zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml | 2
zhengcaioa/DTO/HrSalaryDTO.cs | 2
zhengcaioa/Model/zhengcaioaContext.cs | 5 +
zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs | 16 ++-
表修改.sql | 70 ++++++++++++++
zhengcaioa/DTO/AdmGoodsManageDTO.cs | 3
zhengcaioa/zhengcaioa/Views/SalaryCheck/SearchIndex.cshtml | 3
zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs | 4
zhengcaioa/zhengcaioa/Views/SalaryCheck/SearchIndexRenshi.cshtml | 3
zhengcaioa/zhengcaioa/Controllers/admin/AdmGoodsManageController.cs | 2
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs | 34 ++++++
16 files changed, 206 insertions(+), 55 deletions(-)
diff --git a/zhengcaioa/DTO/AdmGoodsManageDTO.cs b/zhengcaioa/DTO/AdmGoodsManageDTO.cs
index 374029c..1c86ec7 100644
--- a/zhengcaioa/DTO/AdmGoodsManageDTO.cs
+++ b/zhengcaioa/DTO/AdmGoodsManageDTO.cs
@@ -22,7 +22,8 @@
public DateTime Modifytime { get; set; }
public decimal? GoodsCaozuo { get; set; }
-
+ public string HaocaiStatus { get; set; }
+
}
public class AdmGoodsManageDTOSearch : SearchEntity
{
diff --git a/zhengcaioa/DTO/HrSalaryDTO.cs b/zhengcaioa/DTO/HrSalaryDTO.cs
index 511c2ad..9ab0459 100644
--- a/zhengcaioa/DTO/HrSalaryDTO.cs
+++ b/zhengcaioa/DTO/HrSalaryDTO.cs
@@ -166,6 +166,8 @@
public partial class HrSalaryDTOSearch : SearchEntity
{
public string searchDate { get; set; }
+ public string searchDatestart { get; set; }
+ public string searchDateend { get; set; }
public string YearMonth { get; set; }
public string Usernumber { get; set; }
public string DeptId { get; set; }
diff --git a/zhengcaioa/Model/AdmGoodsManage.cs b/zhengcaioa/Model/AdmGoodsManage.cs
index 40bdea9..c07f0d5 100644
--- a/zhengcaioa/Model/AdmGoodsManage.cs
+++ b/zhengcaioa/Model/AdmGoodsManage.cs
@@ -19,5 +19,6 @@
public DateTime Createtime { get; set; }
public string Modifier { get; set; }
public DateTime Modifytime { get; set; }
+ public string HaocaiStatus { get; set; }
}
}
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index 5788464..654c745 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -1620,6 +1620,11 @@
.HasDefaultValueSql("('A')")
.HasComment("鐗╁搧鐘舵��");
+ entity.Property(e => e.HaocaiStatus)
+ .HasMaxLength(1)
+ .HasColumnName("haocai_status")
+ .HasDefaultValueSql("('D')");
+
entity.Property(e => e.Modifier)
.IsRequired()
.HasMaxLength(50)
diff --git a/zhengcaioa/Services/AdmGoodsManageService.cs b/zhengcaioa/Services/AdmGoodsManageService.cs
index 19b8a54..487bfcf 100644
--- a/zhengcaioa/Services/AdmGoodsManageService.cs
+++ b/zhengcaioa/Services/AdmGoodsManageService.cs
@@ -64,7 +64,9 @@
}
updateproject.GoodsStatus = entity.GoodsStatus;
-
+ updateproject.HaocaiStatus = entity.HaocaiStatus;
+
+
updateproject.RecStatus = entity.RecStatus;
updateproject.Modifier = entity.Modifier;
updateproject.Modifytime = entity.Modifytime;
@@ -167,7 +169,7 @@
// DocContent = a.DocContent,
GoodsLeft = a.GoodsLeft,
GoodsStatus = a.GoodsStatus,
-
+ HaocaiStatus = a.HaocaiStatus,
GoodsName = a.GoodsName,
diff --git a/zhengcaioa/Services/HrSalaryService.cs b/zhengcaioa/Services/HrSalaryService.cs
index 6b5c965..3be0447 100644
--- a/zhengcaioa/Services/HrSalaryService.cs
+++ b/zhengcaioa/Services/HrSalaryService.cs
@@ -791,14 +791,15 @@
DateTime st = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date;
DateTime et = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1);
int month = 0;
- if (!string.IsNullOrEmpty(searchEntity.searchDate))
+ if (!string.IsNullOrEmpty(searchEntity.searchDatestart))
{
- var times = searchEntity.searchDate.Split('|');
- if (times.Length == 2)
- {
- st = DateTime.Parse(times[0]);
- et= DateTime.Parse(times[1]);
- }
+ st = DateTime.Parse(searchEntity.searchDatestart + "-01");
+
+ }
+ if (!string.IsNullOrEmpty(searchEntity.searchDateend))
+ {
+ et = DateTime.Parse(searchEntity.searchDateend + "-01");
+
}
var query = (from a in _context.HrSalaries where a.Year >= st.Year && a.Month >= st.Month && a.Year <= et.Year && a.Month <= et.Month select a);
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
index 75196cb..958334f 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
@@ -174,7 +174,11 @@
int y = 1;
var columnTitles = new List<string>()
{
- /*"寤烘。鏃堕棿",*/"瀹㈡埛鍗曚綅","璇︾粏鍦板潃","鑱旂郴鐢佃瘽","鐢靛瓙閭","瀹㈡埛寰俊"
+ "寤烘。鏃堕棿","瀹㈡埛鏉ユ簮","琛屼笟鍒嗙被","瀹㈡埛绫诲瀷","瀹㈡埛鍚嶇О","瀹㈡埛鍗曚綅","鑱旂郴浜哄井淇�"
+ ,"瀹㈡埛鍦板潃","缃戝潃","鑱旂郴浜哄骇鏈�","鑱旂郴浜烘墜鏈�","鑱旂郴浜篞Q","鑱旂郴浜洪偖绠�",
+
+ "鑱旂郴浜�2濮撳悕","鑱旂郴浜�2鎵嬫満","鑱旂郴浜�2QQ"
+
};
foreach(var columnTitle in columnTitles)
{
@@ -190,17 +194,39 @@
x++;
y = 1;
var cell = worksheet.Cells[x, y++];
- //cell.Value = item.CreatetimeName;
- //cell = worksheet.Cells[x, y++];
+ cell.Value = item.CreatetimeName;
+
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.KhlyName;
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.HyflName;
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.KhlxName;
+ cell = worksheet.Cells[x, y++];
cell.Value = item.Name;
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.Name;
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.Weixin;
cell = worksheet.Cells[x, y++];
cell.Value = item.Address;
cell = worksheet.Cells[x, y++];
+ cell.Value = item.Url;
+ cell = worksheet.Cells[x, y++];
cell.Value = item.Tel;
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.Phone;
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.Qq;
cell = worksheet.Cells[x, y++];
cell.Value = item.Email;
cell = worksheet.Cells[x, y++];
- cell.Value = item.Weixin;
+ cell.Value = item.YwName;
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.YwTel;
+ cell = worksheet.Cells[x, y++];
+ cell.Value = item.YwQq;
+
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs b/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
index 328529a..aac96ad 100644
--- a/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
@@ -292,8 +292,8 @@
ViewData["ActionInfo"] = actionlist;
ViewBag.dept = _hrDeptService.GetList().Select(x => new { code = x.Id, label = x.DeptName }).ToList();
- ViewBag.stime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.ToString("yyyy-MM-dd");
- ViewBag.etime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
+ ViewBag.stime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.ToString("yyyy-MM");
+ ViewBag.etime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM");
return View();
}
@@ -330,8 +330,8 @@
ViewData["ActionInfo"] = actionlist;
//ViewBag.dept = _hrDeptService.GetList().Select(x => new { code = x.Id, label = x.DeptName }).ToList();
- ViewBag.stime = new DateTime(DateTime.Now.Year,1,1).ToString("yyyy-MM-dd");
- ViewBag.etime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
+ ViewBag.stime =DateTime.Now.ToString("yyyy-MM");
+ ViewBag.etime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM");
ViewBag.UserId = UserId;
@@ -349,9 +349,13 @@
//鑷姩纭
//_hrSalaryService.AutoCheck();
- if (string.IsNullOrEmpty(search.searchDate))
+ if (string.IsNullOrEmpty(search.searchDatestart))
{
- search.searchDate = new DateTime(DateTime.Now.Year, 1, 1).ToString("yyyy-MM-dd") + "|" + DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM-dd");
+ search.searchDatestart = DateTime.Now.ToString("yyyy-MM");
+ }
+ if (string.IsNullOrEmpty(search.searchDateend))
+ {
+ search.searchDate = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.AddMonths(1).AddSeconds(-1).ToString("yyyy-MM");
}
return new JsonResult(_hrSalaryService.SearchByPagingFinish(search));
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/AdmGoodsManageController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/AdmGoodsManageController.cs
index 134b3ca..0f16229 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/AdmGoodsManageController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/AdmGoodsManageController.cs
@@ -175,7 +175,7 @@
ViewBag.GoodsStatus = _liaotianService.GetSYScode("adm_goods_manage", "goods_status");
-
+ ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou");
diff --git a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
index 4924041..a42d904 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
@@ -319,8 +319,8 @@
Offdays += 1;
}
}
-
- if(userList[a].Outdate.HasValue && dateminkaoqin >=userList[a].Outdate )
+ //绂昏亴褰撳ぉ璁＄畻鑰冨嫟
+ if(userList[a].Zhiwustatus == "D" && userList[a].Outdate.HasValue && dateminkaoqin >userList[a].Outdate )
{
dateminkaoqin = dateminkaoqin.AddDays(1);
continue;
diff --git a/zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Edit.cshtml
index 5c5350c..32c82aa 100644
--- a/zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Edit.cshtml
@@ -8,6 +8,8 @@
List<AdmGoodsClassifyDTO> ClassifyId = ViewData["ClassifyId"] as List<AdmGoodsClassifyDTO>; //鐗╁搧绫诲瀷
+ List<SysCodeDtl> shifou = ViewData["shifou"] as List<SysCodeDtl>; //鐗╁搧鐘舵��
+
}
@{
Layout = null;
@@ -150,44 +152,67 @@
</div>*@
- <div class="clearfix layer-area" style="padding-bottom:15px;">
- @*@if (!string.IsNullOrWhiteSpace(Model.Id))
- {
- <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍓╀綑鏁伴噺</label>
- <div class="col-sm-2 col-md-2" grouptype="Vdata">
- <input class="form-control" label="鍓╀綑鏁伴噺" name="GoodsLeft" id="GoodsLeft" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="number" value="@Model.GoodsLeft" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ @*@if (!string.IsNullOrWhiteSpace(Model.Id))
+ {
+ <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍓╀綑鏁伴噺</label>
+ <div class="col-sm-2 col-md-2" grouptype="Vdata">
+ <input class="form-control" label="鍓╀綑鏁伴噺" name="GoodsLeft" id="GoodsLeft" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="number" value="@Model.GoodsLeft" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
- </div>
- }*@
+ </div>
+ }*@
- <label class="text-right col-sm-1 col-md-1 control-label">鐗╁搧鐘舵��<i class="red">*</i></label>
- <div class="col-sm-2 col-md-2">
- <select id="GoodsStatus" class="form-control" name="GoodsStatus" data-placeholder="閫夋嫨 搴忓垪 ...">
- <option value="" hassubinfo="true">璇烽�夋嫨</option>
- @foreach (var item in GoodsStatus)
+ <label class="text-right col-sm-1 col-md-1 control-label">鐗╁搧鐘舵��<i class="red">*</i></label>
+ <div class="col-sm-2 col-md-2">
+ <select id="GoodsStatus" class="form-control" name="GoodsStatus" data-placeholder="閫夋嫨 搴忓垪 ...">
+ <option value="" hassubinfo="true">璇烽�夋嫨</option>
+ @foreach (var item in GoodsStatus)
+ {
+ @if (!item.CodeSn.Equals(Model.GoodsStatus))
{
- @if (!item.CodeSn.Equals(Model.GoodsStatus))
- {
- <option value="@item.CodeSn" hassubinfo="true">
- @item.Comments
- </option>
- }
- else
- {
- <option value="@item.CodeSn" hassubinfo="true" selected="selected">
- @item.Comments
- </option>
- }
-
+ <option value="@item.CodeSn" hassubinfo="true">
+ @item.Comments
+ </option>
+ }
+ else
+ {
+ <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+ @item.Comments
+ </option>
}
- </select>
- </div>
+ }
-
+ </select>
</div>
+
+ <label class="text-right col-sm-1 col-md-1 control-label">鏄惁鑰楁潗<i class="red">*</i></label>
+ <div class="col-sm-2 col-md-2">
+ <select id="HaocaiStatus" class="form-control" name="HaocaiStatus" data-placeholder="閫夋嫨 搴忓垪 ...">
+ <option value="" hassubinfo="true">璇烽�夋嫨</option>
+ @foreach (var item in shifou)
+ {
+ @if (!item.CodeSn.Equals(Model.HaocaiStatus))
+ {
+ <option value="@item.CodeSn" hassubinfo="true">
+ @item.Comments
+ </option>
+ }
+ else
+ {
+ <option value="@item.CodeSn" hassubinfo="true" selected="selected">
+ @item.Comments
+ </option>
+ }
+
+ }
+
+ </select>
+ </div>
+
+ </div>
@@ -348,6 +373,11 @@
return;
}
+ if ($("#HaocaiStatus").val() == '') {
+ toastr.warning("鏄惁鑰楁潗涓嶈兘涓虹┖");
+ return;
+ }
+
diff --git a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml
index f953f82..a1916d3 100644
--- a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml
@@ -74,7 +74,7 @@
];
dataUrl = "/SalaryCheck/GetList";
searchCol = [
- { label: '鏈堜唤', name: 'YearMonth', labtype: 'monthdate', hidden: false },
+ { label: '鏈堜唤', name: 'YearMonth', labtype: 'monthdate', hidden: false, cwidth: '5%', cccwidth: '8%' },
{ label: '宸ヤ綔閮ㄩ棬', name: 'DeptId', labtype: 'combox', hidden: false, data: JSON.parse(dept) },
{ label: '鑱屽伐濮撳悕', name: 'UserName', labtype: 'txt', hidden: false },
];
diff --git a/zhengcaioa/zhengcaioa/Views/SalaryCheck/SearchIndex.cshtml b/zhengcaioa/zhengcaioa/Views/SalaryCheck/SearchIndex.cshtml
index 7574b39..5bf09e8 100644
--- a/zhengcaioa/zhengcaioa/Views/SalaryCheck/SearchIndex.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SalaryCheck/SearchIndex.cshtml
@@ -69,7 +69,8 @@
];
dataUrl = "/SalaryCheck/GetSearchList";
searchCol = [
- { label: '鏃堕棿', name: 'searchDate', labtype: 'datearea', hidden: false },
+ { label: '鏃堕棿', name: 'searchDatestart', labtype: 'monthdate', hidden: false, cwidth: '5%', cccwidth: '8%' },
+ { label: '鍒�', name: 'searchDateend', labtype: 'monthdate', hidden: false, cwidth: '2%', cccwidth: '8%' },
{ label: '閮ㄩ棬', name: 'DeptId', labtype: 'combox', hidden: false, data: JSON.parse(dept) },
{ label: '濮撳悕', name: 'UserName', labtype: 'txt', hidden: false },
{ label: '宸ュ彿', name: 'Usernumber', labtype: 'txt', hidden: false },
diff --git a/zhengcaioa/zhengcaioa/Views/SalaryCheck/SearchIndexRenshi.cshtml b/zhengcaioa/zhengcaioa/Views/SalaryCheck/SearchIndexRenshi.cshtml
index 76efbf6..0040481 100644
--- a/zhengcaioa/zhengcaioa/Views/SalaryCheck/SearchIndexRenshi.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SalaryCheck/SearchIndexRenshi.cshtml
@@ -71,7 +71,8 @@
];
dataUrl = "/SalaryCheck/GetSearchListRenshi?UserId=" + UserId;
searchCol = [
- { label: '鏃堕棿', name: 'searchDate', labtype: 'datearea', hidden: false },
+ { label: '鏃堕棿', name: 'searchDatestart', labtype: 'monthdate', hidden: false, cwidth: '5%', cccwidth: '8%' },
+ { label: '鍒�', name: 'searchDateend', labtype: 'monthdate', hidden: false, cwidth: '2%', cccwidth: '8%' },
//{ label: '閮ㄩ棬', name: 'DeptId', labtype: 'combox', hidden: false, data: JSON.parse(dept) },
//{ label: '濮撳悕', name: 'UserName', labtype: 'txt', hidden: false },
//{ label: '宸ュ彿', name: 'Usernumber', labtype: 'txt', hidden: false },
diff --git a/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml
index c01cbfd..d386d90 100644
--- a/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml
@@ -946,6 +946,13 @@
return;
}
+ if ($.trim($("#Zhiwustatus").val()) == 'D') {
+ if ($.trim($("#Outdate").val()) == '') {
+ toastr.warning("鍦ㄨ亴鐘舵�佷负绂昏亴蹇呴』濉啓绂昏亴鏃ユ湡");
+ return;
+ }
+ }
+
//if ($.trim($("#IpMac").val()) == '') {
// toastr.warning("宸ヤ綔鐢佃剳MAC涓嶈兘涓虹┖");
// return;
diff --git "a/\350\241\250\344\277\256\346\224\271.sql" "b/\350\241\250\344\277\256\346\224\271.sql"
index 83cda16..a60ca31 100644
--- "a/\350\241\250\344\277\256\346\224\271.sql"
+++ "b/\350\241\250\344\277\256\346\224\271.sql"
@@ -1,6 +1,76 @@
USE [zhengcaioa]
GO
+ALTER TABLE [dbo].[adm_goods_manage] ADD [haocai_status] [nvarchar](1) DEFAULT ('D')
+GO
+
+
+update [adm_goods_manage] set [haocai_status]='D'
+GO
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+USE [zhengcaioa]
+GO
+
/****** Object: Table [dbo].[ADM_Customer_withdrawal] Script Date: 2021/8/9 13:43:29 ******/
SET ANSI_NULLS ON
GO
--
Gitblit v1.9.1