From 71f004d1406379852f6dc774ab7e1d49a98bf8e7 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 19 十月 2021 13:28:04 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Views/Signin/Index.cshtml | 2
zhengcaioa/Services/HrSalaryService.cs | 11 +-
zhengcaioa/zhengcaioa/Views/AdmAttendance/Index.cshtml | 6 +
zhengcaioa/zhengcaioa/Views/AdmAttendance/IndexDtl.cshtml | 68 +++++++++++++++++
zhengcaioa/Services/AdmSigninService.cs | 18 ++++
zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml | 14 +++
zhengcaioa/zhengcaioa/Views/HrPosition/Edit.cshtml | 2
zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs | 4 +
zhengcaioa/Services/AdmAttendanceDtlService.cs | 10 ++
zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml | 12 +-
zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml | 7 +
zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs | 4
zhengcaioa/zhengcaioa/Controllers/admin/AdmAttendanceController.cs | 47 +++++++++++
zhengcaioa/DTO/AdmAttendanceDtlDTO.cs | 9 ++
14 files changed, 197 insertions(+), 17 deletions(-)
diff --git a/zhengcaioa/DTO/AdmAttendanceDtlDTO.cs b/zhengcaioa/DTO/AdmAttendanceDtlDTO.cs
index 6fa5774..7376c03 100644
--- a/zhengcaioa/DTO/AdmAttendanceDtlDTO.cs
+++ b/zhengcaioa/DTO/AdmAttendanceDtlDTO.cs
@@ -28,6 +28,15 @@
public decimal Xiawuzaotuifenzhong { get; set; }
public decimal Kuanggongtianshu { get; set; }
public string Iswork { get; set; }
+
+
+ public string SgninDateName { get; set; }
+ public string MorningInName { get; set; }
+ public string MorningOutName { get; set; }
+ public string AfternoonInName { get; set; }
+ public string AfternoonOutName { get; set; }
+ public string OvertimeInName { get; set; }
+ public string OvertimeOutName { get; set; }
}
public class AdmAttendanceDtlDTOSearch : SearchEntity
diff --git a/zhengcaioa/Services/AdmAttendanceDtlService.cs b/zhengcaioa/Services/AdmAttendanceDtlService.cs
index 8856b4f..ed6dbd0 100644
--- a/zhengcaioa/Services/AdmAttendanceDtlService.cs
+++ b/zhengcaioa/Services/AdmAttendanceDtlService.cs
@@ -212,7 +212,15 @@
Shangwuzaotuifenzhong = a.Shangwuzaotuifenzhong,
Xiawuzaotuifenzhong = a.Xiawuzaotuifenzhong,
Kuanggongtianshu = a.Kuanggongtianshu,
- Iswork = a.Iswork
+ Iswork = a.Iswork,
+ SgninDateName = a.SgninDate.HasValue? a.SgninDate.Value.ToString("yyyy-MM-dd"):"",
+ MorningInName = a.MorningIn.HasValue ? a.MorningIn.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+
+ MorningOutName = a.MorningOut.HasValue ? a.MorningOut.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+ AfternoonInName = a.AfternoonIn.HasValue ? a.AfternoonIn.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+ AfternoonOutName = a.AfternoonOut.HasValue ? a.AfternoonOut.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+ OvertimeInName = a.OvertimeIn.HasValue ? a.OvertimeIn.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+ OvertimeOutName = a.OvertimeOut.HasValue ? a.OvertimeOut.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
}).OrderBy(x => x.SgninDate).ToList();
//if (searchEntity.totalrows == 0)
diff --git a/zhengcaioa/Services/AdmSigninService.cs b/zhengcaioa/Services/AdmSigninService.cs
index bb73473..2713363 100644
--- a/zhengcaioa/Services/AdmSigninService.cs
+++ b/zhengcaioa/Services/AdmSigninService.cs
@@ -38,6 +38,12 @@
switch (signinType)
{
case 10:
+ if (signIn.MorningIn.HasValue)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "宸茬粡鎵撲笂鍗堜笂鐝紝璇蜂笉瑕侀噸澶嶆墦鍗�";
+ return resultEntity;
+ }
signIn.MorningIn = DateTime.Now;
break;
case 11:
@@ -45,12 +51,24 @@
break;
case 20:
+ if (signIn.AfternoonIn.HasValue)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "宸茬粡鎵撲笅鍗堜笂鐝崱锛岃涓嶈閲嶅鎵撳崱";
+ return resultEntity;
+ }
signIn.AfternoonIn = DateTime.Now;
break;
case 21:
signIn.AfternoonOut = DateTime.Now;
break;
case 30:
+ if (signIn.AfternoonIn.HasValue)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "宸茬粡鎵撳姞鐝崱锛岃涓嶈閲嶅鎵撳崱";
+ return resultEntity;
+ }
signIn.OvertimeIn = DateTime.Now;
break;
case 31:
diff --git a/zhengcaioa/Services/HrSalaryService.cs b/zhengcaioa/Services/HrSalaryService.cs
index f495e12..5c82b2a 100644
--- a/zhengcaioa/Services/HrSalaryService.cs
+++ b/zhengcaioa/Services/HrSalaryService.cs
@@ -143,13 +143,14 @@
updatepltRole.Bufagongzi = dto.Bufagongzi;
updatepltRole.Peichang = dto.Peichang;
updatepltRole.Jiucuo = dto.Jiucuo;
+ updatepltRole.Yufagongziheji = dto.Yufagongziheji;
//updatepltRole.Daozhanggongzi = (updatepltRole.Daozhanggongzi ?? 0) + (updatepltRole.Jiangjin ?? 0) + (updatepltRole.Bufagongzi ?? 0) + (updatepltRole.Peichang ?? 0) + (updatepltRole.Jiucuo ?? 0);
// //updatepltRole.Yufagongziheji = (updatepltRole.Yufagongziheji ?? 0) + (updatepltRole.Jiangjin ?? 0) + (updatepltRole.Bufagongzi ?? 0) + (updatepltRole.Peichang ?? 0) + (updatepltRole.Jiucuo ?? 0);
//var sum_f = (updatepltRole.Jibengongzi ?? 0) + (updatepltRole.Baomifei ?? 0) + (updatepltRole.Gongzuobutie ?? 0) +
// (updatepltRole.Jiabangongzi ?? 0) + (updatepltRole.Shebao ?? 0) +
// (updatepltRole.Quanqinjiang ?? 0) + (updatepltRole.Jiaotngbutie ?? 0) + (updatepltRole.Jixiaoticheng ?? 0);
-
+
//decimal dianhuafei = 0;
//if ((updatepltRole.Dianhuabutie ?? 0) - (updatepltRole.Dianhuafei ?? 0) <= 0)
@@ -157,20 +158,20 @@
// dianhuafei = (updatepltRole.Dianhuafei ?? 0)-(updatepltRole.Dianhuabutie ?? 0);
//}
-
+
//var sum_k = (updatepltRole.Shebaokou ?? 0) + (updatepltRole.Geshui ?? 0) + dianhuafei +
// (updatepltRole.Queqin ?? 0) + (updatepltRole.Fakuan ?? 0);
//updatepltRole.Daozhanggongzi = sum_f - sum_k;
-
-
+
+
////璁＄畻棰勫彂宸ヨ祫
-
+
//{
// //涓婁竴娆＄殑宸ヨ祫
// var bf= _context.HrSalaries.Where(c => c.Userid == user.Id && c.Islock== "Q" && c.RecStatus=="A").
diff --git a/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs b/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
index 2e21181..27559c9 100644
--- a/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
@@ -106,6 +106,10 @@
{
dto.Jiucuo = 0;
}
+ //if (!dto.Yufagongziheji.HasValue)
+ //{
+ // dto.Yufagongziheji = 0;
+ //}
ViewData.Model = dto;
return View();
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/AdmAttendanceController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/AdmAttendanceController.cs
index 9931e54..bc3fe3f 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/AdmAttendanceController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/AdmAttendanceController.cs
@@ -17,17 +17,22 @@
private readonly IHrDeptService _hrDeptService;
private readonly ILogger<AdmAttendanceController> _logger;
private readonly IAdmAttendanceService _admAttendanceService;
+ private readonly IAdmAttendanceDtlService _admAttendanceDtlService;
+
public AdmAttendanceController(ILogger<AdmAttendanceController> logger
, IAdmAttendanceService admAttendanceService
, IHrDeptService hrDeptService
+ , IAdmAttendanceDtlService admAttendanceDtlService
)
{
_logger = logger;
_hrDeptService = hrDeptService;
_admAttendanceService = admAttendanceService;
-
+ _admAttendanceDtlService = admAttendanceDtlService;
+
+
}
public IActionResult Index()
{
@@ -67,5 +72,45 @@
return new JsonResult(_admAttendanceService.SearchByPaging(search));
}
+
+
+
+ public IActionResult IndexDtl(string AttendanceId)
+ {
+ List<ActionEntity> actionlist = new List<ActionEntity>();
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+
+
+ ViewBag.AttendanceId = AttendanceId;
+
+
+ ViewBag.editBtn = false;
+
+ ViewData["ActionInfo"] = actionlist;
+
+ //ViewBag.dept = _hrDeptService.GetList().Select(x => new { code = x.Id, label = x.DeptName }).ToList();
+
+ return View();
+ }
+
+
+ /// <summary>
+ /// 鍒楄〃鍐呭
+ /// </summary>
+ /// <param name="search"></param>
+ /// <returns></returns>
+ public IActionResult GetListDtl(AdmAttendanceDtlDTOSearch search)
+ {
+
+
+ return new JsonResult(_admAttendanceDtlService.SearchByPaging(search));
+ }
+
}
}
diff --git a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
index 0b029b5..d0f1e2e 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
@@ -627,7 +627,7 @@
//璁＄畻褰撳ぉ璇峰亣
List<DateBiJiaoDTO> qingjias = new List<DateBiJiaoDTO>();
- var feichuqinjia = admAskLeaveDTOMin.Where(x => x.Lavetype != "4").ToList();
+ var feichuqinjia = admAskLeaveDTOMin.Where(x => x.Lavetype != "4" && x.Lavetype != "7").ToList();
foreach (var admAskLeave in feichuqinjia)
{
@@ -1020,7 +1020,7 @@
//璁＄畻褰撳ぉ璇峰亣
List<DateBiJiaoDTO> qingjias = new List<DateBiJiaoDTO>();
- var feichuqinjia = admAskLeaveDTOMin.Where(x => x.Lavetype != "4").ToList();
+ var feichuqinjia = admAskLeaveDTOMin.Where(x => x.Lavetype != "4" && x.Lavetype != "7").ToList();
foreach (var admAskLeave in feichuqinjia)
{
diff --git a/zhengcaioa/zhengcaioa/Views/AdmAttendance/Index.cshtml b/zhengcaioa/zhengcaioa/Views/AdmAttendance/Index.cshtml
index 3d63f05..5d69671 100644
--- a/zhengcaioa/zhengcaioa/Views/AdmAttendance/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/AdmAttendance/Index.cshtml
@@ -33,6 +33,12 @@
{ label: '杩熷埌', name: 'Chidao', labtype: 'txt', hidden: false, width: 60 },
{ label: '鏃╅��', name: 'Zaotui', labtype: 'txt', hidden: false, width: 60 },
{ label: '鏃峰伐', name: 'Kuanggong', labtype: 'txt', hidden: false, width: 60 },
+ {
+ label: '鏄庣粏', name: 'mingxi', labtype: 'txt', hidden: false, width: 60,
+ formatter: function (cellvalue, options, rowObject) {
+ return "<a onclick=\"OpenWindow('" + rowObject.UserName + "','98%','100%', '/AdmAttendance/IndexDtl?AttendanceId=" + rowObject.Id + "')\" >鏄庣粏</a>";
+ }
+ },
];
dataUrl = "/AdmAttendance/GetList?YearMonth222=" + getNowFormatDate();
diff --git a/zhengcaioa/zhengcaioa/Views/AdmAttendance/IndexDtl.cshtml b/zhengcaioa/zhengcaioa/Views/AdmAttendance/IndexDtl.cshtml
new file mode 100644
index 0000000..cbdac5a
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/AdmAttendance/IndexDtl.cshtml
@@ -0,0 +1,68 @@
+锘緻{
+ ViewBag.Title = "宸ヨ祫鏍稿噯";
+ Layout = "~/Views/Shared/_Layout_Search.cshtml";
+}
+
+<link href="~/css/jquery-confirm.css" rel="stylesheet">
+<script src="~/js/jquery-confirm.js" type="text/javascript"></script>
+
+@section headerStyle{
+
+ <script type="text/javascript">
+
+ var AttendanceId = '@Html.Raw(ViewBag.AttendanceId)';
+
+ //gridConfig = { multiselect: false, selectcol: "Id" };
+ //shrinkToFit = false;
+ //footerrow = false;
+
+ dataCol = [
+ { label: '搴忓彿', name: 'Id', labtype: 'txt', hidden: true },
+ {
+ label: '鑰冨嫟鏃ユ湡', name: 'SgninDateName', labtype: 'txt', hidden: false, width: 80
+ },
+ { label: '涓婂崍涓婄彮', name: 'MorningInName', labtype: 'txt', hidden: false, width: 60 },
+ { label: '涓婂崍涓嬬彮', name: 'MorningOutName', labtype: 'txt', hidden: false, width: 60 },
+
+ { label: '涓嬪崍涓婄彮', name: 'AfternoonInName', labtype: 'txt', hidden: false, width: 80 },
+ { label: '涓嬪崍涓嬬彮', name: 'AfternoonOutName', labtype: 'txt', hidden: false, width: 60 },
+ { label: '鍔犵彮涓婄彮', name: 'OvertimeInName', labtype: 'txt', hidden: false, width: 60 },
+ { label: '鍔犵彮涓婄彮', name: 'OvertimeOutName', labtype: 'txt', hidden: false, width: 60 },
+ { label: '璇峰亣', name: 'Qingjia', labtype: 'txt', hidden: false, width: 60 },
+ { label: '閿�鍋�', name: 'Xiaojia', labtype: 'txt', hidden: false, width: 60 },
+
+
+ ];
+ dataUrl = "/AdmAttendance/GetListDtl?AttendanceId=" + AttendanceId;
+ searchCol = [
+ { label: '鑰冨嫟鏃ユ湡', name: 'SgninDate', labtype: 'date', hidden: false},
+ ////{ label: '宸ヤ綔閮ㄩ棬', name: 'DeptId', labtype: 'combox', hidden: false, data: JSON.parse(dept) },
+ //{ label: '鑱屽伐濮撳悕', name: 'UserName', labtype: 'txt', hidden: false },
+ ];
+
+
+
+
+
+
+
+
+ var _afterSave = function (result) {
+ if (result) {
+ toastr.success("淇濆瓨鎴愬姛");
+ } else {
+ toastr.error("淇濆瓨澶辫触");
+ }
+ }
+
+ var _afterDel = function (result) {
+ if (result) {
+ toastr.success("鍒犻櫎鎴愬姛");
+ } else {
+ /**/
+ toastr.error("鍒犻櫎鎴愬姛");
+ /**/
+ }
+ }
+ </script>
+}
diff --git a/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml
index 9fc3256..00714eb 100644
--- a/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml
@@ -133,13 +133,13 @@
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍩烘湰宸ヨ祫锛堝厓锛�<i class="red">*</i></label>
<div class="col-sm-2 col-md-2" grouptype="Vdata">
- <input class="form-control" label="鍩烘湰宸ヨ祫锛堝厓锛�" name="Jibengongzi" id="Jibengongzi" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="number" value="@Model.JibengongziName" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ <input class="form-control" label="鍩烘湰宸ヨ祫锛堝厓锛�" name="Jibengongzi" id="Jibengongzi" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.JibengongziName" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</div>
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">淇濆瘑璐癸紙鍏冿級<i class="red">*</i></label>
<div class="col-sm-2 col-md-2" grouptype="Vdata">
- <input class="form-control" label="淇濆瘑璐癸紙鍏冿級" name="Baomifei" id="Baomifei" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="number" value="@Model.BaomifeiName" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ <input class="form-control" label="淇濆瘑璐癸紙鍏冿級" name="Baomifei" id="Baomifei" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.BaomifeiName" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</div>
@@ -154,13 +154,13 @@
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">绀句繚鍏徃锛堝厓锛�<i class="red">*</i></label>
<div class="col-sm-2 col-md-2" grouptype="Vdata">
- <input class="form-control" label="绀句繚鍏徃锛堝厓锛�" name="Shebaodanwei" id="Shebaodanwei" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="number" value="@Model.ShebaodanweiName" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ <input class="form-control" label="绀句繚鍏徃锛堝厓锛�" name="Shebaodanwei" id="Shebaodanwei" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.ShebaodanweiName" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</div>
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">绀句繚涓汉锛堝厓锛�<i class="red">*</i></label>
<div class="col-sm-2 col-md-2" grouptype="Vdata">
- <input class="form-control" label="绀句繚涓汉锛堝厓锛�" name="Shebaogeren" id="Shebaogeren" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="number" value="@Model.ShebaogerenName" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ <input class="form-control" label="绀句繚涓汉锛堝厓锛�" name="Shebaogeren" id="Shebaogeren" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.ShebaogerenName" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</div>
@@ -198,12 +198,12 @@
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">鍏ㄥ嫟濂栵紙鍏冿級<i class="red">*</i></label>
<div class="col-sm-2 col-md-2" grouptype="Vdata">
- <input class="form-control" label="鍏ㄥ嫟濂栵紙鍏冿級" name="Quanqingjiang" id="Quanqingjiang" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="number" value="@Model.QuanqingjiangName" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ <input class="form-control" label="鍏ㄥ嫟濂栵紙鍏冿級" name="Quanqingjiang" id="Quanqingjiang" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.QuanqingjiangName" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</div>
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">浜ら�氳ˉ璐达紙鍏冿級<i class="red">*</i></label>
<div class="col-sm-2 col-md-2" grouptype="Vdata">
- <input class="form-control" label="浜ら�氳ˉ璐达紙鍏冿級" name="Jiaotongbutie" id="Jiaotongbutie" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="number" value="@Model.JiaotongbutieName" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
+ <input class="form-control" label="浜ら�氳ˉ璐达紙鍏冿級" name="Jiaotongbutie" id="Jiaotongbutie" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.JiaotongbutieName" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
</div>
diff --git a/zhengcaioa/zhengcaioa/Views/HrPosition/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/HrPosition/Edit.cshtml
index 439d778..b9f15a4 100644
--- a/zhengcaioa/zhengcaioa/Views/HrPosition/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/HrPosition/Edit.cshtml
@@ -7,7 +7,7 @@
@section headerStyle{
<script language="javascript" type="text/javascript">
controllist = [
- { label: '鑱屼綅淇℃伅', name: 'data', labtype: 'panel',islist:'false', data: [
+ { label: '鑱屼綅淇℃伅(缁存姢鑱屼綅淇℃伅璇峰悓鏃剁淮鎶よ亴浣嶅熀鏈伐璧勫拰鑱屼綅鎻愭垚鏍囧噯)', name: 'data', labtype: 'panel',islist:'false', data: [
{label:' 鐢ㄦ埛id ', name: 'Id', labtype: 'txt', addvisible: false, editvisible: false ,reg:''}
, { label: ' 鑱屼綅鍚嶇О ', name: 'PostName', labtype: 'txt', addvisible: true, editvisible: true , reg:'',ismust:true }
diff --git a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml
index 9b5d903..2fc2601 100644
--- a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml
@@ -93,7 +93,14 @@
<input class="form-control" id="Jiucuo" name="Jiucuo" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Jiucuo" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="CheckNum(this);">
</div>
</div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label class="text-right col-sm-3 col-md-3 control-label">棰勫彂宸ヨ祫鍚堣</label>
+ <div class="col-sm-9 col-md-9">
+ <input class="form-control" id="Yufagongziheji" name="Yufagongziheji" labtype="txt" addvisible="true" maxlength="500" editvisible="true" reg="" ismust="true" type="text" value="@Model.Yufagongziheji" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="CheckNum(this);">
+ </div>
+ </div>
+
</div>
</div>
</div>
diff --git a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml
index ebf2e49..e3dbedc 100644
--- a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Index.cshtml
@@ -104,6 +104,20 @@
});
+
+ var _pageSearch = function () {
+ $("#jqGrid").jqGrid('setGridParam', {
+ url: '/SalaryCheck/GetList', postData: jsons, page: 1
+ }); //閲嶆柊杞藉叆
+ var jsons = GetSearchEnd();
+ if (jsons == false) {
+ msg.info("璇峰綍鍏ユ煡璇㈡潯浠�");
+ return false;
+ }
+ LoadGrid(jsons);
+ }
+
+
function getNowFormatDate() {
var date = new Date();
var seperator1 = "-";
diff --git a/zhengcaioa/zhengcaioa/Views/Signin/Index.cshtml b/zhengcaioa/zhengcaioa/Views/Signin/Index.cshtml
index 5b432e7..277de40 100644
--- a/zhengcaioa/zhengcaioa/Views/Signin/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Signin/Index.cshtml
@@ -229,7 +229,7 @@
toastr.success("鎵撳崱鎴愬姛");
}
else {
- toastr.success("鎵撳崱澶辫触");
+ toastr.success(data.Message);
}
},
error: function () {
--
Gitblit v1.9.1