From 67a0042c5f29e4bb0e0b82f6190f2bc51480b45c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 28 二月 2023 13:25:09 +0800
Subject: [PATCH] 工资绩效改版
---
zhengcaioa/zhengcaioa/Controllers/Finance/FiPiecerateController.cs | 50 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 33 insertions(+), 17 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiPiecerateController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiPiecerateController.cs
index 00ad5ff..b780708 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/FiPiecerateController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/FiPiecerateController.cs
@@ -26,14 +26,15 @@
private readonly ILiaotianService _liaotianService;
private readonly IFiPiecerateService _fiPiecerateService;
-
- public FiPiecerateController(ILogger<FiPiecerateController> logger, ILiaotianService liaotianService, IFiPiecerateService fiPiecerateService)
+ private readonly IPltPageService _pltPageService;
+ public FiPiecerateController(ILogger<FiPiecerateController> logger, ILiaotianService liaotianService, IFiPiecerateService fiPiecerateService
+ , IPltPageService pltPageService)
{
_logger = logger;
_liaotianService = liaotianService;
_fiPiecerateService = fiPiecerateService;
-
+ _pltPageService = pltPageService;
}
public IActionResult Index()
{
@@ -47,14 +48,25 @@
actionEntity.PageIco = "fa fa-search";
actionEntity.ActionName = "鏌ヨ";
actionlist.Add(actionEntity);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Add";
- actionEntity1.PageIco = "fa fa-plus";
- actionEntity1.ActionName = "鏂板";
- actionlist.Add(actionEntity1);
-
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Add";
+ //actionEntity1.PageIco = "fa fa-plus";
+ //actionEntity1.ActionName = "鏂板";
+ //actionlist.Add(actionEntity1);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/FiPiecerate/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+ foreach (var pageEntity in pageEntities1)
+ {
+ ActionEntity actionEntity1 = new ActionEntity();
+ actionEntity1.OpenType = pageEntity.OpenType;
+ actionEntity1.ActionUrl = "";
+ actionEntity1.ActionFun = pageEntity.PageShortcut;
+ actionEntity1.PageIco = pageEntity.PageIco;
+ actionEntity1.ActionName = pageEntity.PageName;
+ actionlist.Add(actionEntity1);
+ }
ViewData["ActionInfo"] = actionlist;
@@ -62,10 +74,10 @@
ViewBag.Pieceratetype = _liaotianService.GetSYScode("CooperVisit", "jtype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
-
+ ViewBag.Standard = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
-
+
return View();
@@ -81,7 +93,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/FiPiecerate/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
FiPiecerateDTO dto = new FiPiecerateDTO();
if (!String.IsNullOrEmpty(id))
{
@@ -95,13 +109,13 @@
-
- ViewData["Pieceratetype"] = _liaotianService.GetSYScode("CooperVisit", "jtype");
- ViewData["Standard"] = _liaotianService.GetSYScode("fi_piecerate", "standard");
+ //ViewData["Pieceratetype"] = _liaotianService.GetSYScode("CooperVisit", "jtype");
+ //ViewData["Standard"] = _liaotianService.GetSYScode("fi_piecerate", "standard");
+ ViewData["Standard"] = _liaotianService.GetSYScode("system", "shifou");
ViewData.Model = dto;
return View();
}
@@ -119,6 +133,8 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
data.RecStatus = "A";
+ //data.Standard = "01";
+ data.CreatedAtTime = DateTime.Now;
if (String.IsNullOrEmpty(data.Id))
{
data.Creater = curentuser.Id;
--
Gitblit v1.9.1