From 6a15d9219a9d4ebf17fa10519812029ad60239d4 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 20 十月 2021 10:23:30 +0800
Subject: [PATCH] 社保单独维护
---
zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs | 4
zhengcaioa/IServices/IHrJibengongziService.cs | 4
zhengcaioa/DTO/HrShebaoDTO.cs | 20 +
zhengcaioa/zhengcaioa/Views/HrJibengongzi/Index.cshtml | 4
zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml | 20
zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs | 75 ++++++
zhengcaioa/zhengcaioa/Views/HrJibengongzi/EditShebao.cshtml | 298 +++++++++++++++++++++++++++
zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs | 17 +
zhengcaioa/Services/HrJibengongziService.cs | 88 ++++++++
zhengcaioa/zhengcaioa/Views/User/Index.cshtml | 37 +-
zhengcaioa/Model/HrShebao.cs | 19 +
zhengcaioa/Model/zhengcaioaContext.cs | 44 ++++
12 files changed, 597 insertions(+), 33 deletions(-)
diff --git a/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs b/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
index 1b98bc7..f4442f8 100644
--- a/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
+++ b/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
@@ -287,6 +287,10 @@
CreateMap<ExpertTestTopicpeizhi, ExpertTestTopicpeizhiDTO>();
CreateMap<ExpertTestTopicpeizhiDTO, ExpertTestTopicpeizhi>();
+
+ CreateMap<HrShebao, HrShebaoDTO>();
+ CreateMap<HrShebaoDTO, HrShebao>();
+
}
}
}
diff --git a/zhengcaioa/DTO/HrShebaoDTO.cs b/zhengcaioa/DTO/HrShebaoDTO.cs
new file mode 100644
index 0000000..a474149
--- /dev/null
+++ b/zhengcaioa/DTO/HrShebaoDTO.cs
@@ -0,0 +1,20 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DTO
+{
+ public class HrShebaoDTO
+ {
+ public string Id { get; set; }
+ public decimal? Shebaodanwei { get; set; }
+ public string ShebaodanweiName { get; set; }
+ public decimal? Shebaogeren { get; set; }
+ public string ShebaogerenName { get; set; }
+ public string RecStatus { get; set; }
+ public string Creater { get; set; }
+ public DateTime Createtime { get; set; }
+ public string Modifier { get; set; }
+ public DateTime Modifytime { get; set; }
+ }
+}
diff --git a/zhengcaioa/IServices/IHrJibengongziService.cs b/zhengcaioa/IServices/IHrJibengongziService.cs
index b5a3f2f..35e524b 100644
--- a/zhengcaioa/IServices/IHrJibengongziService.cs
+++ b/zhengcaioa/IServices/IHrJibengongziService.cs
@@ -18,5 +18,9 @@
ResultEntity ModifyStatus(string id, string userid);
List<HrJibengongziDTO> GetList();
+
+
+ List<HrShebaoDTO> GetListShebao();
+ ResultEntity saveShebao(HrShebaoDTO dto);
}
}
diff --git a/zhengcaioa/Model/HrShebao.cs b/zhengcaioa/Model/HrShebao.cs
new file mode 100644
index 0000000..911f476
--- /dev/null
+++ b/zhengcaioa/Model/HrShebao.cs
@@ -0,0 +1,19 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+ public partial class HrShebao
+ {
+ public string Id { get; set; }
+ public decimal? Shebaodanwei { get; set; }
+ public decimal? Shebaogeren { get; set; }
+ public string RecStatus { get; set; }
+ public string Creater { get; set; }
+ public DateTime Createtime { get; set; }
+ public string Modifier { get; set; }
+ public DateTime Modifytime { get; set; }
+ }
+}
diff --git a/zhengcaioa/Model/zhengcaioaContext.cs b/zhengcaioa/Model/zhengcaioaContext.cs
index f37fe82..17f9414 100644
--- a/zhengcaioa/Model/zhengcaioaContext.cs
+++ b/zhengcaioa/Model/zhengcaioaContext.cs
@@ -77,6 +77,7 @@
public virtual DbSet<HrJixiaoticheng> HrJixiaotichengs { get; set; }
public virtual DbSet<HrPosition> HrPositions { get; set; }
public virtual DbSet<HrSalary> HrSalaries { get; set; }
+ public virtual DbSet<HrShebao> HrShebaos { get; set; }
public virtual DbSet<IntentionCustomer> IntentionCustomers { get; set; }
public virtual DbSet<IntentionOrder> IntentionOrders { get; set; }
public virtual DbSet<IntentionVisit> IntentionVisits { get; set; }
@@ -3753,6 +3754,49 @@
.HasColumnName("yufagongziheji");
});
+ modelBuilder.Entity<HrShebao>(entity =>
+ {
+ entity.ToTable("hr_shebao");
+
+ entity.Property(e => e.Id).HasMaxLength(50);
+
+ entity.Property(e => e.Creater)
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnName("creater")
+ .HasDefaultValueSql("('1')");
+
+ entity.Property(e => e.Createtime)
+ .HasColumnType("datetime")
+ .HasColumnName("createtime")
+ .HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.Modifier)
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnName("modifier")
+ .HasDefaultValueSql("('1')");
+
+ entity.Property(e => e.Modifytime)
+ .HasColumnType("datetime")
+ .HasColumnName("modifytime")
+ .HasDefaultValueSql("(getdate())");
+
+ entity.Property(e => e.RecStatus)
+ .IsRequired()
+ .HasMaxLength(1)
+ .HasColumnName("rec_status")
+ .HasDefaultValueSql("('A')");
+
+ entity.Property(e => e.Shebaodanwei)
+ .HasColumnType("money")
+ .HasColumnName("shebaodanwei");
+
+ entity.Property(e => e.Shebaogeren)
+ .HasColumnType("money")
+ .HasColumnName("shebaogeren");
+ });
+
modelBuilder.Entity<IntentionCustomer>(entity =>
{
entity.ToTable("IntentionCustomer");
diff --git a/zhengcaioa/Services/HrJibengongziService.cs b/zhengcaioa/Services/HrJibengongziService.cs
index 226fc0f..9da90b9 100644
--- a/zhengcaioa/Services/HrJibengongziService.cs
+++ b/zhengcaioa/Services/HrJibengongziService.cs
@@ -198,5 +198,93 @@
var list = _mapper.Map<List<HrJibengongziDTO>>(listPosition);
return list;
}
+
+
+ /// <summary>
+ /// 鑾峰彇鎵�鏈夋湁鏁堣鑹�
+ /// </summary>
+ /// <returns></returns>
+ public List<HrShebaoDTO> GetListShebao()
+ {
+
+
+ var listRole = (from a in _context.HrShebaos
+
+
+
+
+
+ where a.RecStatus == "A"
+
+ select new HrShebaoDTO
+ {
+ Id = a.Id,
+ Shebaodanwei = a.Shebaodanwei??0,
+
+ Shebaogeren = a.Shebaogeren?? 0,
+ ShebaodanweiName = a.Shebaodanwei.HasValue ? a.Shebaodanwei.Value.ToString("F2") : "",
+ ShebaogerenName = a.Shebaogeren.HasValue ? a.Shebaogeren.Value.ToString("F2") : "",
+
+
+ Creater = a.Creater,
+ Createtime = a.Createtime,
+
+ RecStatus = a.RecStatus,
+ Modifier = a.Modifier,
+ Modifytime = a.Modifytime,
+
+ }
+ ).OrderByDescending(x => x.Createtime).ToList();
+
+ return listRole;
+ }
+
+
+ public ResultEntity saveShebao(HrShebaoDTO dto)
+ {
+ ResultEntity resultEntity = new ResultEntity();
+ try
+ {
+
+
+ var entity = _mapper.Map<HrShebao>(dto);
+
+
+ if (String.IsNullOrEmpty(entity.Id))
+ {
+ entity.Id = Guid.NewGuid().ToString();
+ dto.Id = entity.Id;
+ _context.HrShebaos.Add(entity);
+ }
+ else
+ {
+ var updateproject = _context.HrShebaos.Find(entity.Id);
+
+ updateproject.Shebaodanwei = entity.Shebaodanwei;
+ updateproject.Shebaogeren = entity.Shebaogeren;
+
+
+
+
+
+ updateproject.RecStatus = entity.RecStatus;
+ updateproject.Modifier = entity.Modifier;
+ updateproject.Modifytime = entity.Modifytime;
+
+ }
+
+ _context.SaveChanges();
+ resultEntity.ReturnID = entity.Id;
+ resultEntity.Result = true;
+ }
+ catch (Exception ex)
+ {
+ resultEntity.Result = false;
+ resultEntity.Message = "淇濆瓨澶辫触锛岃鑱旂郴绠＄悊鍛�";
+
+ }
+ return resultEntity;
+ }
+
}
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs b/zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs
index 184d084..e18ff3d 100644
--- a/zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs
@@ -8,6 +8,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
+using System.Transactions;
using zhengcaioa.IService;
using zhengcaioa.Models;
@@ -153,5 +154,79 @@
ViewData["curentuser"] = curentuser;
return new JsonResult(_hrJibengongziService.ModifyStatus(Id, curentuser.Id));
}
+
+
+ public IActionResult EditShebao()
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ var shebaoDTO = _hrJibengongziService.GetListShebao().FirstOrDefault();
+
+
+ if (shebaoDTO == null)
+ {
+ shebaoDTO = new HrShebaoDTO();
+ shebaoDTO.Shebaodanwei = 0;
+ shebaoDTO.Shebaogeren = 0;
+ }
+
+
+
+
+ ViewData.Model = shebaoDTO;
+
+
+
+
+ return View();
+ }
+
+
+ /// <summary>
+ /// 淇濆瓨
+ /// </summary>
+ /// <param name="data">宀椾綅瀹炰綋绫诲璞�</param>
+ /// <returns></returns>
+ ///
+ [HttpPost]
+ public IActionResult SaveShebao(HrShebaoDTO data)
+ {
+
+ ResultEntity resultEntity = new ResultEntity();
+
+
+
+ using (TransactionScope scope = new TransactionScope())
+ {
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ data.RecStatus = "A";
+
+ var resultDTO = _hrJibengongziService.GetListShebao().FirstOrDefault();
+ if (resultDTO == null || string.IsNullOrEmpty(resultDTO.Id))
+ {
+ resultDTO = new HrShebaoDTO();
+ resultDTO.Shebaodanwei = data.Shebaodanwei;
+ resultDTO.Shebaogeren = data.Shebaogeren;
+ resultDTO.Creater = curentuser.Id;
+ resultDTO.Createtime = DateTime.Now;
+ }
+ else
+ {
+ resultDTO.Shebaodanwei = data.Shebaodanwei;
+ resultDTO.Shebaogeren = data.Shebaogeren;
+ }
+ resultDTO.Modifier = curentuser.Id;
+ resultDTO.Modifytime = DateTime.Now;
+
+ resultEntity = _hrJibengongziService.saveShebao(resultDTO);
+
+ scope.Complete();
+ }
+
+
+ return new JsonResult(resultEntity);
+ }
+
}
}
diff --git a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
index d0f1e2e..29e24f2 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
@@ -1354,12 +1354,19 @@
//鏌ヨ褰撳墠鍛樺伐鑱屽姟鐨勫熀鏈伐璧勯厤缃�
var hrJibengongzi = hrJibengongziDTOs.Where(x=>x.PostId == userList[i].HrPosition ).OrderByDescending(x=>x.Effecttime).FirstOrDefault();
-
+
if (hrJibengongzi == null)
{
_logger.LogInformation(userList[i].UserName + ": 鑱屽姟鎵�灞炶祫鏈伐璧勪负绌�");
continue;
}
+ var shebaoDTO = _JibengongziService.GetListShebao().FirstOrDefault();
+ if (shebaoDTO == null)
+ {
+ _logger.LogInformation(userList[i].UserName + ": 绀句繚缁存姢涓虹┖");
+ continue;
+ }
+
hrSalaryDTO.Jibengongzi = Math.Round( hrJibengongzi.Jibengongzi.Value * chuqinlv, 2);
hrSalaryDTO.Baomifei = Math.Round(hrJibengongzi.Baomifei.Value * chuqinlv, 2);
//鏄惁鍦ㄨ瘯鐢ㄦ湡
@@ -1368,8 +1375,8 @@
{
geshuiqizheng = userList[i].geshuiqizheng.Value;
}
- var Shebaodanwei = hrJibengongzi.Shebaodanwei.HasValue ? hrJibengongzi.Shebaodanwei.Value : 0;
- var Shebaogeren = hrJibengongzi.Shebaogeren.HasValue ? hrJibengongzi.Shebaogeren.Value : 0;
+ var Shebaodanwei = shebaoDTO.Shebaodanwei.HasValue ? shebaoDTO.Shebaodanwei.Value : 0;
+ var Shebaogeren = shebaoDTO.Shebaogeren.HasValue ? shebaoDTO.Shebaogeren.Value : 0;
decimal yingnashuie = 0;
hrSalaryDTO.Queqin = 0;
hrSalaryDTO.Fakuan = 0;
@@ -1453,7 +1460,7 @@
- //yingnashuie = userList[i].ShiyongPrice.Value - Shebaogeren - geshuiqizheng;
+
@@ -1527,7 +1534,7 @@
- //yingnashuie = BasicPrice - Shebaogeren - geshuiqizheng;
+
}
diff --git a/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml
index 00714eb..bb99e4a 100644
--- a/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml
@@ -147,7 +147,7 @@
</div>
- <div class="clearfix layer-area" style="padding-bottom:15px;">
+ @*<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -166,7 +166,7 @@
- </div>
+ </div>*@
<div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -362,15 +362,15 @@
return;
}
- if ($("#Shebaodanwei").val() == '') {
- toastr.warning("绀句繚鍏徃涓嶈兘涓虹┖");
- return;
- }
+ //if ($("#Shebaodanwei").val() == '') {
+ // toastr.warning("绀句繚鍏徃涓嶈兘涓虹┖");
+ // return;
+ //}
- if ($("#Shebaogeren").val() == '') {
- toastr.warning("绀句繚涓汉涓嶈兘涓虹┖");
- return;
- }
+ //if ($("#Shebaogeren").val() == '') {
+ // toastr.warning("绀句繚涓汉涓嶈兘涓虹┖");
+ // return;
+ //}
if ($.trim($("#Dianhuabutie").val() )== '') {
toastr.warning("鐢佃瘽琛ヨ创涓嶈兘涓虹┖");
diff --git a/zhengcaioa/zhengcaioa/Views/HrJibengongzi/EditShebao.cshtml b/zhengcaioa/zhengcaioa/Views/HrJibengongzi/EditShebao.cshtml
new file mode 100644
index 0000000..9e5f008
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/HrJibengongzi/EditShebao.cshtml
@@ -0,0 +1,298 @@
+锘緻model DTO.HrShebaoDTO
+@using DTO;
+@using zhengcaioa.Models;
+@{
+
+
+
+
+
+
+
+
+
+
+
+}
+@{
+ Layout = null;
+}
+
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+ <meta name="description" content="">
+ <meta name="author" content="ThemeBucket">
+ <title>@(SiteConfig.SiteName)</title>
+ <link href="~/css/bootstrap.min.css" rel="stylesheet">
+ <link href="~/css/font-awesome.min.css" rel="stylesheet">
+ <link href="~/css/animate.min.css" rel="stylesheet">
+
+ @*<link href="~/css/plugins/iCheck/custom.css" rel="stylesheet">*@
+ <link href="~/css/style.min.css" rel="stylesheet">
+ <link href="~/css/plugins/chosen/chosen.css" rel="stylesheet">
+ @*<link href="~/js/plugins/layer/skin/layer.css" rel="stylesheet">*@
+ @*<link href="~/css/plugins/datapicker/datepicker3.css" rel="stylesheet">*@
+ <link href="~/css/style.min.css" rel="stylesheet">
+ <link href="~/css/plugins/toastr/toastr.min.css" rel="stylesheet" />
+ <link href="~/css/plugins/webuploader/webuploader.css" rel="stylesheet" />
+
+ <style type="text/css">
+ .webuploader-pick {
+ position: relative;
+ display: inline-block;
+ cursor: pointer;
+ background: #00b7ee;
+ padding: 8px 14px 7px 14px;
+ color: #fff;
+ text-align: center;
+ border-radius: 3px;
+ overflow: hidden;
+ }
+
+ div.clearfix > label {
+ padding-top: 8px;
+ }
+
+ .chosen-container {
+ border-radius: 1px;
+ border: 1px solid #e5e6e7;
+ }
+
+ .col-md-1.control-label {
+ padding-right: 0px;
+ font-weight: 400;
+ }
+ </style>
+
+ <!-- jqgrid-->
+ @*<link href="~/css/plugins/jqgrid/ui.jqgrid.css" rel="stylesheet">*@
+ <script language="javascript" src="~/js/jquery.min.js" type="text/javascript"></script>
+ <script src="~/js/bootstrap.min.js"></script>
+ @*<script src="~/js/plugins/bootstro/bootstro.js"></script>*@
+
+ <!--瀹瑰櫒-->
+ @*<script language="javascript" src="~/js/datehelper.js" type="text/javascript"></script>*@
+ @*<script language="javascript" src="~/js/plugins/query/jquery.query-object.js" type="text/javascript"></script>*@
+ @*<script language="javascript" src="~/js/plugins/iCheck/icheck.min.js" type="text/javascript"></script>*@
+ <script language="javascript" src="~/js/plugins/chosen/chosen.jquery.js" type="text/javascript"></script>
+ @*<script language="javascript" src="~/js/plugins/datapicker/bootstrap-datepicker.js" type="text/javascript"></script>*@
+ <script language="javascript" src="~/js/plugins/layer/layer.js" type="text/javascript"></script>
+ @*<script src="~/js/plugins/jqgrid/jquery.jqGrid.min.js" type="text/javascript"></script>*@
+ @*<script src="~/js/plugins/jqgrid/i18n/grid.locale-cn.js" type="text/javascript"></script>*@
+ <script src="~/js/plugins/toastr/toastr.min.js" type="text/javascript"></script>
+ <script src="~/js/plugins/webuploader/webuploader.min.js"></script>
+
+ <script language="javascript" src="~/js/common-layout.js" type="text/javascript"></script>
+ <script src="~/js/plugins/layer/laydate/laydate.js" type="text/javascript"></script>
+ @*<script src="~/js/plugins/iTexbox/itextbox.js" type="text/javascript"></script>*@
+ @*<script src="~/js/plugins/iuploader/iuploader.js"></script>*@
+ <script src="~/js/TUJS.js"></script>
+</head>
+<body class="gray-bg" style="overflow:auto">
+ <form id="formtest">
+ <div class="wrapper wrapper-content" id="ibox-content" style="padding:15px;">
+ <div class="row">
+ <div class="col-sm-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-title">
+ <h5> <i class="fa fa-list"></i> 鍩烘湰淇℃伅</h5>
+ </div>
+ <div id="div_content" class="ibox-content" style="background-color:white;">
+ <div class="row">
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+
+
+
+
+
+
+
+
+
+
+
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label class="text-right col-sm-1 col-md-1 control-label">绀句繚鍏徃锛堝厓锛�</label>
+ <div class="col-sm-2 col-md-2">
+ <input class="form-control" label="绀句繚鍏徃" id="Shebaodanwei" name="Shebaodanwei" labtype="txt" addvisible="true" editvisible="true" reg="" maxlength="50" 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})?/)">
+
+ <input type="hidden" name="Id" value="@Model.Id" />
+ </div>
+ </div>
+ <div class="clearfix layer-area" style="padding-bottom:15px;">
+ <label class="text-right col-sm-1 col-md-1 control-label">绀句繚涓汉锛堝厓锛�</label>
+ <div class="col-sm-2 col-md-2">
+ <input class="form-control" label="绀句繚涓汉" id="Shebaogeren" name="Shebaogeren" labtype="txt" addvisible="true" editvisible="true" maxlength="100" reg="" ismust="flase" 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>
+
+
+
+
+
+
+
+
+ </div>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ </div>
+
+
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="wrapper wrapper-content" style="margin-top:0px"></div>
+ <div class="ibox-content" id="top" style="z-index:100; position:fixed; height:50px; width:100%;bottom:0; text-align: right; padding-top:8px ">
+ <div class="" style="float:right;" data-bootstro-width="500px" data-bootstro-content="鍔熻兘鎸夐挳锛氣�滀繚瀛樷�濓紝鈥滃垹闄も��">
+
+
+ <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
+ </a>
+
+
+ </div>
+ </div>
+
+ </form>
+
+ <script type="text/javascript">
+
+
+ var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2;
+ $("#div_content").height(hh);
+
+ toastr.options = {
+ "closeButton": true,
+ "debug": false,
+ "progressBar": true,
+ "positionClass": "toast-bottom-right",
+ "onclick": null,
+ "showDuration": "300",
+ "hideDuration": "600",
+ "timeOut": "4500",
+ "extendedTimeOut": "600",
+ "showEasing": "swing",
+ "hideEasing": "linear",
+ "showMethod": "fadeIn",
+ "hideMethod": "fadeOut"
+ };
+
+
+
+
+
+
+ @*var id = '@Model.Id';*@
+
+
+
+
+
+
+
+
+
+ // 淇濆瓨宀椾綅淇℃伅
+ var savePosition = function () {
+
+
+
+
+ if ($("#Shebaodanwei").val() == '') {
+ toastr.warning("绀句繚鍏徃涓嶈兘涓虹┖");
+ return;
+ }
+
+
+ if ($("#Shebaogeren").val() == '') {
+ toastr.warning("绀句繚涓汉涓嶈兘涓虹┖");
+ return;
+ }
+
+
+
+
+
+ // var data = { id: $("#Id").val(), DocType: $("#DocType").val(), DocDept: $("#DocDept").val(), PublishTime: $("#PublishTime").val(), DocNo: $("#DocNo").val(), DocTitle: $("#DocTitle").val(), DocContent: ueue, DocZtc: $("#DocZtc").val(), Printtimes: $("#Printtimes").val(), DocCsdw: $("#DocCsdw").val(), PrintStatus: $("#PrintStatus").val()}
+ $.ajax({
+ type: "POST",
+ url: "/HrJibengongzi/SaveShebao",
+ dataType: "json",
+ global: false,
+ data: $('form').serializeArray(),
+ success: function (data) {
+
+
+
+ if (data.Result) {
+ // parent._afterSave(true);
+ parent.layer.msg('鎴愬姛淇濆瓨', { icon: 6 });
+ var Topictype = $("#Topictype").val();
+ var Zhishitype = $("#Zhishitype").val();
+ var Area = $("#Area").val();
+
+ window.location = "/HrJibengongzi/EditShebao";
+
+ //try {
+ // _pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶
+ //}
+ //catch (err) {
+ // parent._CloseTab1("/HrJibengongzi/Edit/");
+ //}
+
+ }
+ else {
+ // toastr.error("澶辫触");
+ parent.layer.msg(data.Message, { icon: 5 });
+ }
+
+ },
+ error: function () {
+
+
+ parent.layer.msg('澶辫触', { icon: 5 });
+ }
+ });
+ }
+
+
+
+
+ function _pageAutoClose() {
+ parent.window._reloadPageData();
+ var index = parent.layer.getFrameIndex(window.name);
+ parent.layer.isRefresh = true;
+ parent.layer.closeAll('loading');
+ parent.layer.close(index);
+ return false;
+ }
+
+
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Index.cshtml b/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Index.cshtml
index db1da6c..08f6e60 100644
--- a/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Index.cshtml
@@ -25,9 +25,9 @@
label: '淇濆瘑璐�', name: 'BaomifeiName', labtype: 'txt', hidden: false, width: 100
},
- { label: '绀句繚鍏徃', name: 'ShebaodanweiName', labtype: 'txt', hidden: false, width: 100 },
+ //{ label: '绀句繚鍏徃', name: 'ShebaodanweiName', labtype: 'txt', hidden: false, width: 100 },
- { label: '绀句繚涓汉', name: 'ShebaogerenName', labtype: 'txt', hidden: false, width: 100 },
+ //{ label: '绀句繚涓汉', name: 'ShebaogerenName', labtype: 'txt', hidden: false, width: 100 },
{ label: '鐢佃瘽琛ヨ创', name: 'DianhuabutieName', labtype: 'txt', hidden: false, width: 100 },
{ label: '鍏ㄥ嫟濂�', name: 'QuanqingjiangName', labtype: 'txt', hidden: false, width: 100 },
diff --git a/zhengcaioa/zhengcaioa/Views/User/Index.cshtml b/zhengcaioa/zhengcaioa/Views/User/Index.cshtml
index 6da5dfc..98a0b0a 100644
--- a/zhengcaioa/zhengcaioa/Views/User/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/User/Index.cshtml
@@ -118,7 +118,7 @@
return "<span style='color:" + rowObject.Coler + ";'>" + cellvalue+"</span>";
}},
];
- dataUrl = "/User/GetUserList";
+ dataUrl = "/User/GetUserList?Zhiwustatus=A";
searchCol = [
{ label: '鍏ヨ亴鏃堕棿', name: 'Indate', labtype: 'datearea', hidden: false },
{ label: '閮ㄩ棬', name: 'DeptId', labtype: 'combox', hidden: false, data: JSON.parse(dept) },
@@ -139,6 +139,24 @@
OpenWindow("鏂板鐢ㄦ埛", "98%", "90%", "/User/Edit/");
}
+ var _pageSearch = function () {
+ $("#jqGrid").jqGrid('setGridParam', {
+ url: '/User/GetUserList', postData: jsons, page: 1
+ }); //閲嶆柊杞藉叆
+ var jsons = GetSearchEnd();
+ if (jsons == false) {
+ msg.info("璇峰綍鍏ユ煡璇㈡潯浠�");
+ return false;
+ }
+ LoadGrid(jsons);
+ }
+
+ $(function () {
+ $("#PBSZhiwustatus").val("A");
+ $("#PBSZhiwustatus").trigger('chosen:updated');//鏇存柊閫夐」
+
+ });
+
var _afterSave = function (result) {
if (result) {
toastr.success("淇濆瓨鎴愬姛");
@@ -157,23 +175,10 @@
}
}
-
- function sendZhiwustatus() {
-
- var msg = $("#PBSZhiwustatus");
-
-
- if (msg.length > 0) {
- $("#PBSZhiwustatus").val("A");
- $("#PBSZhiwustatus").trigger('chosen:updated');//鏇存柊閫夐」
- _pageSearch();
- } else {
- setTimeout(sendZhiwustatus, 100);
- }
- }
+
- sendZhiwustatus();
+
--
Gitblit v1.9.1