From 0a0421f0411471b83a8ff2356325ce21aeace60c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 10 八月 2022 14:58:04 +0800
Subject: [PATCH] 权限修改
---
zhengcaioa/zhengcaioa/Views/AdmDocDoc/Index.cshtml | 24
zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml | 37
zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml | 28
zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs | 39
zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs | 60
zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs | 79
zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupGrouptypeController.cs | 74
zhengcaioa/zhengcaioa/Controllers/HR/HrDeptController.cs | 78
zhengcaioa/zhengcaioa/Views/CooperVisit/Edit.cshtml | 22
zhengcaioa/zhengcaioa/Views/CooperOrder/selectWenshu.cshtml | 29
zhengcaioa/zhengcaioa/Controllers/Expert/ZhuanjiahuidaController.cs | 12
zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml | 26
zhengcaioa/zhengcaioa/Controllers/ProjectController.cs | 62
zhengcaioa/zhengcaioa/Controllers/admin/AdmDocBaseController.cs | 70
zhengcaioa/Services/DailyManagementService.cs | 5
zhengcaioa/zhengcaioa/Controllers/admin/AdmBreakPrecedentController.cs | 37
zhengcaioa/zhengcaioa/Controllers/admin/AdmGoodsManageController.cs | 10
zhengcaioa/zhengcaioa/Controllers/Finance/FiSubjectController.cs | 73
zhengcaioa/zhengcaioa/Views/FiPiecerate/Edit.cshtml | 27
zhengcaioa/zhengcaioa/Views/AdmZhanghaomima/Index.cshtml | 22
zhengcaioa/zhengcaioa/Views/AdmBreakPrecedent/Edit.cshtml | 25
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs | 42
zhengcaioa/zhengcaioa/Views/AdmTongxunlu/Edit.cshtml | 20
zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs | 11
zhengcaioa/zhengcaioa/Views/Sim/Edit.cshtml | 20
zhengcaioa/zhengcaioa/Views/Project/Select.cshtml | 52
zhengcaioa/zhengcaioa/Views/User/EditBeizhu.cshtml | 22
zhengcaioa/zhengcaioa/Controllers/admin/AdmPieceCheckController.cs | 49
zhengcaioa/zhengcaioa/Views/FiAccount/Index.cshtml | 24
zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupGroupController.cs | 39
zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs | 13
zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml | 31
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs | 38
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs | 89 +
zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs | 64
zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml | 14
zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs | 37
zhengcaioa/zhengcaioa/Controllers/admin/AdmGoodsClassifyController.cs | 71
zhengcaioa/zhengcaioa/Controllers/admin/AdmTongxunluController.cs | 39
zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml | 30
zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs | 98 +
zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml | 43
zhengcaioa/Services/PltPageService.cs | 1
zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs | 186 +-
zhengcaioa/zhengcaioa/Views/AdmTongxunlu/Index.cshtml | 40
zhengcaioa/DTO/PageEntity.cs | 2
zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Edit.cshtml | 16
zhengcaioa/DTO/DailyManagementDTO .cs | 2
zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Index.cshtml | 35
zhengcaioa/zhengcaioa/Views/OrderBanci/Edit.cshtml | 19
zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountExpensesController.cs | 45
zhengcaioa/zhengcaioa/Controllers/UserController.cs | 47
zhengcaioa/zhengcaioa/Views/User/Index.cshtml | 34
zhengcaioa/zhengcaioa/Controllers/Finance/ServiceChargeController.cs | 11
zhengcaioa/zhengcaioa/Views/AdmDocDoc/Edit.cshtml | 21
zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountIncomeController.cs | 48
zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs | 80
zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs | 42
zhengcaioa/zhengcaioa/Controllers/admin/AdmDocDocController.cs | 40
zhengcaioa/zhengcaioa/Views/Project/Add.cshtml | 18
zhengcaioa/zhengcaioa/Controllers/admin/SimController.cs | 40
zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs | 122 +
zhengcaioa/zhengcaioa/Views/Signin/AttendanceRule.cshtml | 34
zhengcaioa/zhengcaioa/Views/Liaotian/Edit.cshtml | 84
zhengcaioa/zhengcaioa/Controllers/HR/HrPositionController.cs | 76
zhengcaioa/zhengcaioa/Views/GroupGroup/Edit.cshtml | 24
zhengcaioa/zhengcaioa/Views/User/Edit.cshtml | 19
zhengcaioa/zhengcaioa/Views/IntentionCustomer/IndexYiXiang.cshtml | 36
zhengcaioa/zhengcaioa/Views/DailyManagement/HoldPhone.cshtml | 39
zhengcaioa/zhengcaioa/Views/DailyManagement/MemoWorkAnPai.cshtml | 34
zhengcaioa/zhengcaioa/Views/OrderBanci/Index.cshtml | 31
zhengcaioa/zhengcaioa/Controllers/AdmManagement/DailyManagementController.cs | 91 +
zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/IndexCustomer.cshtml | 33
zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml | 47
zhengcaioa/zhengcaioa/Views/IntentionCustomer/Edit.cshtml | 28
zhengcaioa/zhengcaioa/Views/SysCode/Editquestion.cshtml | 16
zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupTopicController.cs | 72
zhengcaioa/zhengcaioa/Views/GroupGroup/Index.cshtml | 28
zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Edit.cshtml | 26
zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml | 24
zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml | 12
zhengcaioa/zhengcaioa/Views/HrJixiaoticheng/Edit.cshtml | 20
zhengcaioa/zhengcaioa/Views/IntentionVisit/Edit.cshtml | 27
zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Indexzhuanjia.cshtml | 23
zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Index.cshtml | 27
zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml | 22
zhengcaioa/zhengcaioa/Views/Zhuanjiahuida/Index.cshtml | 36
zhengcaioa/zhengcaioa/Views/SysCode/Editrequestinfo.cshtml | 16
zhengcaioa/zhengcaioa/Controllers/Finance/FiPiecerateController.cs | 38
zhengcaioa/zhengcaioa/Controllers/HR/HrJixiaotichengController.cs | 37
zhengcaioa/zhengcaioa/Controllers/admin/AdmZhanghaomimaController.cs | 35
91 files changed, 2,544 insertions(+), 1,025 deletions(-)
diff --git a/zhengcaioa/DTO/DailyManagementDTO .cs b/zhengcaioa/DTO/DailyManagementDTO .cs
index 7434042..d4c7e00 100644
--- a/zhengcaioa/DTO/DailyManagementDTO .cs
+++ b/zhengcaioa/DTO/DailyManagementDTO .cs
@@ -38,6 +38,8 @@
public string Context { get; set; }
public string UserId { get; set; }
+
+ public string Creater { get; set; }
}
#endregion
diff --git a/zhengcaioa/DTO/PageEntity.cs b/zhengcaioa/DTO/PageEntity.cs
index 1aeed3c..b3c5037 100644
--- a/zhengcaioa/DTO/PageEntity.cs
+++ b/zhengcaioa/DTO/PageEntity.cs
@@ -68,7 +68,7 @@
public string PageSuperior { get; set; }
-
+ public string PageMethod { get; set; }
private string _page_Ico = string.Empty;
diff --git a/zhengcaioa/Services/DailyManagementService.cs b/zhengcaioa/Services/DailyManagementService.cs
index 884e193..cbcea06 100644
--- a/zhengcaioa/Services/DailyManagementService.cs
+++ b/zhengcaioa/Services/DailyManagementService.cs
@@ -49,6 +49,11 @@
{
query = query.Where(e => e.Context.Contains(search.Context)).ToList();
}
+ if (!string.IsNullOrEmpty(search.Creater))
+ {
+ query = query.Where(e => e.Creater == search.Creater).ToList();
+ }
+
var dt = (from a in query
join b in _context.PltUsers.Where(e => e.RecStatus == "A")
on a.UserId equals b.Id
diff --git a/zhengcaioa/Services/PltPageService.cs b/zhengcaioa/Services/PltPageService.cs
index 1b2ca28..590160d 100644
--- a/zhengcaioa/Services/PltPageService.cs
+++ b/zhengcaioa/Services/PltPageService.cs
@@ -303,6 +303,7 @@
PageSuperior = page.PageSuperior,
PageIco = page.PageIco ?? "", //fa fa-angle-right
OpenType = page.OpenType ?? 0,
+ PageMethod = page.PageMethod,
};
entityList = adminList.ToList();
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/DailyManagementController.cs b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/DailyManagementController.cs
index 040c740..ba2f0b0 100644
--- a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/DailyManagementController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/DailyManagementController.cs
@@ -20,38 +20,64 @@
private readonly ILiaotianService _liaotianService;
private readonly IUserService _userService;
private readonly IHrDeptService _hrDeptService;
+ private readonly IPltPageService _pltPageService;
[CheckLogin]
public DailyManagementController(ILogger<DailyManagementController> logger, IDailyManagementService DailyManageService,
- ILiaotianService liaotianService, IUserService userService, IHrDeptService hrDeptService)
+ ILiaotianService liaotianService, IUserService userService, IHrDeptService hrDeptService
+ , IPltPageService pltPageService)
{
_logger = logger;
_DailyManageService = DailyManageService;
_liaotianService = liaotianService;
_userService = userService;
_hrDeptService = hrDeptService;
+ _pltPageService = pltPageService;
}
#region 閫氳瘽绠＄悊
[CheckLogin]
public IActionResult HoldPhone()
{
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
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);
- 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, "/DailyManagement/HoldPhone/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+ if(pageEntities1.Count(x=>x.PageShortcut == "Search") <= 0)
+ {
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+
+ ViewData["Creater"] = curentuser.Id;
+ }
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").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;
+ ViewData["ActionInfo2"] = pageEntities2;
ViewBag.LineType = _liaotianService.GetSYScode("ADM_HoldPhone", "LineType").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.Intention = _liaotianService.GetSYScode("ADM_HoldPhone", "Intention").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
return View();
@@ -279,13 +305,32 @@
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, "/DailyManagement/MemoWorkAnPai");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").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;
+ ViewData["ActionInfo2"] = pageEntities2;
+
//ActionEntity actionEntity2 = new ActionEntity();
//actionEntity2.OpenType = 0;
@@ -298,7 +343,7 @@
ViewBag.User = _userService.GetList().Select(x => new { code = x.Id, label = x.UserName }).ToList();
ViewBag.Wancheng = _liaotianService.GetSYScode("ADM_MemoBook", "HaveRead").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
- ViewData["ActionInfo"] = actionlist;
+ //ViewData["ActionInfo"] = actionlist;
return View();
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
index 23467c6..bac4408 100644
--- a/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/AdmManagement/SigninController.cs
@@ -25,10 +25,12 @@
private readonly IWfRunProcessService _wfRunProcessService;
private readonly IWfHistoryService _wfHistoryService;
private readonly IWfNeeddeelService _wfNeeddeelService;
+ private readonly IPltPageService _pltPageService;
[CheckLogin]
public SigninController(ILogger<SigninController> logger, IAdmSigninService signinService, ISysAttachmentService sysAttachmentService
, IAdmAttendanceRuleService attendanceRuleService, ILiaotianService liaotianService, IWfRunProcessService wfRunProcessService
- , IWfHistoryService wfHistoryService, IWfNeeddeelService wfNeeddeelService)
+ , IWfHistoryService wfHistoryService, IWfNeeddeelService wfNeeddeelService
+ , IPltPageService pltPageService)
{
_logger = logger;
_signinService = signinService;
@@ -38,6 +40,7 @@
_wfRunProcessService = wfRunProcessService;
_wfHistoryService = wfHistoryService;
_wfNeeddeelService = wfNeeddeelService;
+ _pltPageService = pltPageService;
}
#region 鑰冨嫟绛惧埌鎵撳崱
@@ -1030,6 +1033,12 @@
#region 鑰冨嫟瑙勫垯
public IActionResult AttendanceRule()
{
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/Signin/AttendanceRule/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
+
AdmAttendanceRuleDTO admAttendanceRuleDTO = _attendanceRuleService.Get("");
admAttendanceRuleDTO.admAttendanceRulesDtlDTOs = _attendanceRuleService.GetDtlList("");
diff --git a/zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupGroupController.cs b/zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupGroupController.cs
index d261f1c..bf31eda 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupGroupController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupGroupController.cs
@@ -30,8 +30,10 @@
private readonly IGroupGrouptypeService _grouptypeService;
private readonly IGroupTopicService _groupTopicService;
private readonly IHrDeptService _hrDeptService;
+ private readonly IPltPageService _pltPageService;
- public GroupGroupController(ILogger<GroupGroupController> logger, IGroupGroupService groupGroupService, ILiaotianService liaotianService, IUserService userService, IGroupGrouptypeService grouptypeService, IGroupTopicService groupTopicService, IHrDeptService hrDeptService)
+ public GroupGroupController(ILogger<GroupGroupController> logger, IGroupGroupService groupGroupService, ILiaotianService liaotianService, IUserService userService, IGroupGrouptypeService grouptypeService, IGroupTopicService groupTopicService, IHrDeptService hrDeptService
+ , IPltPageService pltPageService)
{
_logger = logger;
_groupGroupService = groupGroupService;
@@ -40,6 +42,7 @@
_groupTopicService = groupTopicService;
_userService = userService;
_hrDeptService = hrDeptService;
+ _pltPageService = pltPageService;
}
public IActionResult Index()
@@ -54,17 +57,31 @@
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, "/GroupGroup/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
-
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").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;
+ ViewData["ActionInfo2"] = pageEntities2;
ViewBag.hylb = _liaotianService.GetSYScode("CooperatecustomCustomer", "hyfl").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -90,7 +107,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/GroupGroup/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
GroupGroupDTO dto = new GroupGroupDTO();
if (!String.IsNullOrEmpty(id))
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupGrouptypeController.cs b/zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupGrouptypeController.cs
index 55b0ad8..a2214b1 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupGrouptypeController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupGrouptypeController.cs
@@ -18,12 +18,14 @@
private readonly ILogger<GroupGrouptypeController> _logger;
private readonly IGroupGrouptypeService _groupGrouptypeService;
+ private readonly IPltPageService _pltPageService;
-
- public GroupGrouptypeController(ILogger<GroupGrouptypeController> logger, IGroupGrouptypeService groupGrouptypeService)
+ public GroupGrouptypeController(ILogger<GroupGrouptypeController> logger, IGroupGrouptypeService groupGrouptypeService
+ , IPltPageService pltPageService)
{
_logger = logger;
_groupGrouptypeService = groupGrouptypeService;
+ _pltPageService = pltPageService;
}
@@ -39,13 +41,26 @@
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, "/GroupGrouptype/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;
return View();
}
@@ -68,20 +83,33 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
List<ActionEntity> actionlist = new List<ActionEntity>();
- ActionEntity actionEntity = new ActionEntity();
- actionEntity.OpenType = 0;
- actionEntity.ActionUrl = "";
- actionEntity.ActionFun = "Save";
- actionEntity.PageIco = "glyphicon glyphicon-ok";
- actionEntity.ActionName = "淇濆瓨";
- actionlist.Add(actionEntity);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Nullify";
- actionEntity1.PageIco = "fa fa-remove";
- actionEntity1.ActionName = "鍒犻櫎";
- actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity = new ActionEntity();
+ //actionEntity.OpenType = 0;
+ //actionEntity.ActionUrl = "";
+ //actionEntity.ActionFun = "Save";
+ //actionEntity.PageIco = "glyphicon glyphicon-ok";
+ //actionEntity.ActionName = "淇濆瓨";
+ //actionlist.Add(actionEntity);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Nullify";
+ //actionEntity1.PageIco = "fa fa-remove";
+ //actionEntity1.ActionName = "鍒犻櫎";
+ //actionlist.Add(actionEntity1);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/GroupGrouptype/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "02").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;
return View();
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupTopicController.cs b/zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupTopicController.cs
index b363588..81003e4 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupTopicController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BizGroup/GroupTopicController.cs
@@ -18,12 +18,14 @@
private readonly ILogger<GroupTopicController> _logger;
private readonly IGroupTopicService _groupTopicService;
+ private readonly IPltPageService _pltPageService;
-
- public GroupTopicController(ILogger<GroupTopicController> logger, IGroupTopicService groupTopicService)
+ public GroupTopicController(ILogger<GroupTopicController> logger, IGroupTopicService groupTopicService
+ , IPltPageService pltPageService)
{
_logger = logger;
_groupTopicService = groupTopicService;
+ _pltPageService = pltPageService;
}
@@ -39,13 +41,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, "/GroupGrouptype/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;
return View();
}
@@ -68,20 +82,32 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
List<ActionEntity> actionlist = new List<ActionEntity>();
- ActionEntity actionEntity = new ActionEntity();
- actionEntity.OpenType = 0;
- actionEntity.ActionUrl = "";
- actionEntity.ActionFun = "Save";
- actionEntity.PageIco = "glyphicon glyphicon-ok";
- actionEntity.ActionName = "淇濆瓨";
- actionlist.Add(actionEntity);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Nullify";
- actionEntity1.PageIco = "fa fa-remove";
- actionEntity1.ActionName = "鍒犻櫎";
- actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity = new ActionEntity();
+ //actionEntity.OpenType = 0;
+ //actionEntity.ActionUrl = "";
+ //actionEntity.ActionFun = "Save";
+ //actionEntity.PageIco = "glyphicon glyphicon-ok";
+ //actionEntity.ActionName = "淇濆瓨";
+ //actionlist.Add(actionEntity);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Nullify";
+ //actionEntity1.PageIco = "fa fa-remove";
+ //actionEntity1.ActionName = "鍒犻櫎";
+ //actionlist.Add(actionEntity1);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/GroupGrouptype/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "02").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;
return View();
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
index 7eee552..5da7074 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/CooperOrderController.cs
@@ -91,34 +91,62 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
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);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Add";
- actionEntity1.PageIco = "fa fa-plus";
- actionEntity1.ActionName = "鏂板";
- actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity = new ActionEntity();
+ //actionEntity.OpenType = 0;
+ //actionEntity.ActionUrl = "";
+ //actionEntity.ActionFun = "Search";
+ //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 actionEntity3 = new ActionEntity();
- actionEntity3.OpenType = 0;
- actionEntity3.ActionUrl = "";
- actionEntity3.ActionFun = "Print";
- actionEntity3.PageIco = "fa fa-print";
- actionEntity3.ActionName = "鎵撳嵃";
- actionlist.Add(actionEntity3);
+ //ActionEntity actionEntity3 = new ActionEntity();
+ //actionEntity3.OpenType = 0;
+ //actionEntity3.ActionUrl = "";
+ //actionEntity3.ActionFun = "Print";
+ //actionEntity3.PageIco = "fa fa-print";
+ //actionEntity3.ActionName = "鎵撳嵃";
+ //actionlist.Add(actionEntity3);
- ViewData["ActionInfo"] = actionlist;
+ //ViewData["ActionInfo"] = actionlist;
List<PageEntity> pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/CooperOrder/Index/");
ViewBag.pageEntities = pageEntities;
+
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+ if (pageEntities1.Count(x => x.PageShortcut == "Search") <= 0)
+ {
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+
+ ViewData["Creater"] = curentuser.Id;
+ }
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").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;
+ ViewData["ActionInfo2"] = pageEntities2;
ViewBag.OrderType = _liaotianService.GetSYScode("CooperVisit", "jtype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.users = _userService.GetList().Where(x => x.IsYwjl == "A").Select(x => new { code = x.Id, label = x.UserName }).ToList();
@@ -422,7 +450,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/CooperOrder/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
CooperOrderDTO dto = new CooperOrderDTO();
if(dingdantype == "0")
{
@@ -1840,7 +1870,9 @@
actionlist.Add(actionEntity);
ViewData["ActionInfo"] = actionlist;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/CooperOrder/selectWenshu");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
ViewBag.Wenshuleixing = _liaotianService.GetSYScode("t_challengeletter", "Wenshuleixing").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.status = _liaotianService.GetSYScode("t_challengeletter", "status").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs
index eca52ff..f8849fc 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciController.cs
@@ -27,14 +27,16 @@
private readonly ILiaotianService _liaotianService;
private readonly IOrderBanciService _orderBanciService;
private readonly IOrderBanciDtlService _orderBanciDtlService;
+ private readonly IPltPageService _pltPageService;
-
- public OrderBanciController(ILogger<OrderBanciController> logger, ILiaotianService liaotianService, IOrderBanciService orderBanciService, IOrderBanciDtlService orderBanciDtlService)
+ public OrderBanciController(ILogger<OrderBanciController> logger, ILiaotianService liaotianService, IOrderBanciService orderBanciService, IOrderBanciDtlService orderBanciDtlService
+ , IPltPageService pltPageService)
{
_logger = logger;
_liaotianService = liaotianService;
_orderBanciService = orderBanciService;
_orderBanciDtlService = orderBanciDtlService;
+ _pltPageService = pltPageService;
}
[CheckLogin]
@@ -50,18 +52,34 @@
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, "/OrderBanci/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").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;
+ ViewData["ActionInfo2"] = pageEntities2;
-
+
return View();
@@ -77,7 +95,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/OrderBanci/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
OrderBanciDTO dto = new OrderBanciDTO();
if (!String.IsNullOrEmpty(id))
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
index ff4bfa7..3588b97 100644
--- a/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/BusinessOrder/OrderBanciOrderController.cs
@@ -36,13 +36,15 @@
private readonly ICooperOrderService _cooperOrderService;
private readonly IConfiguration _configuration;
private readonly IHttpClientFactory _clientFactory;
+ private readonly IPltPageService _pltPageService;
public OrderBanciOrderController(ILogger<OrderBanciOrderController> logger, ILiaotianService liaotianService, IOrderBanciService orderBanciService, IOrderBanciDtlService orderBanciDtlService
,IOrderBanciOrderService orderBanciOrderService
, IFiOrderrecievemoneyService fiOrderrecievemoneyService
, ICooperOrderService cooperOrderService
, IConfiguration configuration
- , IHttpClientFactory clientFactory)
+ , IHttpClientFactory clientFactory
+ , IPltPageService pltPageService)
{
_logger = logger;
_liaotianService = liaotianService;
@@ -53,6 +55,7 @@
_cooperOrderService = cooperOrderService;
_configuration = configuration;
_clientFactory = clientFactory;
+ _pltPageService = pltPageService;
}
[CheckLogin]
@@ -75,22 +78,34 @@
//actionEntity1.PageIco = "fa fa-plus";
//actionEntity1.ActionName = "鏂板";
//actionlist.Add(actionEntity1);
- ActionEntity actionEntity3 = new ActionEntity();
- actionEntity3.OpenType = 0;
- actionEntity3.ActionUrl = "";
- actionEntity3.ActionFun = "Print";
- actionEntity3.PageIco = "fa fa-print";
- actionEntity3.ActionName = "鎵撳嵃";
- actionlist.Add(actionEntity3);
+ //ActionEntity actionEntity3 = new ActionEntity();
+ //actionEntity3.OpenType = 0;
+ //actionEntity3.ActionUrl = "";
+ //actionEntity3.ActionFun = "Print";
+ //actionEntity3.PageIco = "fa fa-print";
+ //actionEntity3.ActionName = "鎵撳嵃";
+ //actionlist.Add(actionEntity3);
- ActionEntity actionEntity4 = new ActionEntity();
- actionEntity4.OpenType = 0;
- actionEntity4.ActionUrl = "";
- actionEntity4.ActionFun = "Duanxin";
- actionEntity4.PageIco = "";
- actionEntity4.ActionName = "鍙戦�佺煭淇�";
- actionlist.Add(actionEntity4);
+ //ActionEntity actionEntity4 = new ActionEntity();
+ //actionEntity4.OpenType = 0;
+ //actionEntity4.ActionUrl = "";
+ //actionEntity4.ActionFun = "Duanxin";
+ //actionEntity4.PageIco = "";
+ //actionEntity4.ActionName = "鍙戦�佺煭淇�";
+ //actionlist.Add(actionEntity4);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/OrderBanciOrder/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;
@@ -129,25 +144,41 @@
//actionEntity1.PageIco = "fa fa-plus";
//actionEntity1.ActionName = "鏂板";
//actionlist.Add(actionEntity1);
- ActionEntity actionEntity3 = new ActionEntity();
- actionEntity3.OpenType = 0;
- actionEntity3.ActionUrl = "";
- actionEntity3.ActionFun = "Print";
- actionEntity3.PageIco = "fa fa-print";
- actionEntity3.ActionName = "鎵撳嵃";
- actionlist.Add(actionEntity3);
+ //ActionEntity actionEntity3 = new ActionEntity();
+ //actionEntity3.OpenType = 0;
+ //actionEntity3.ActionUrl = "";
+ //actionEntity3.ActionFun = "Print";
+ //actionEntity3.PageIco = "fa fa-print";
+ //actionEntity3.ActionName = "鎵撳嵃";
+ //actionlist.Add(actionEntity3);
- ActionEntity actionEntity4 = new ActionEntity();
- actionEntity4.OpenType = 0;
- actionEntity4.ActionUrl = "";
- actionEntity4.ActionFun = "Duanxin";
- actionEntity4.PageIco = "";
- actionEntity4.ActionName = "鍙戦�佺煭淇�";
- actionlist.Add(actionEntity4);
+ //ActionEntity actionEntity4 = new ActionEntity();
+ //actionEntity4.OpenType = 0;
+ //actionEntity4.ActionUrl = "";
+ //actionEntity4.ActionFun = "Duanxin";
+ //actionEntity4.PageIco = "";
+ //actionEntity4.ActionName = "鍙戦�佺煭淇�";
+ //actionlist.Add(actionEntity4);
+
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/OrderBanciOrder/Indexzhuanjia/");
+ 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;
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
+
ViewBag.kechengleixing = _liaotianService.GetSYScode("order_banci_order", "kechengleixing_id").Where(x => x.CodeSn != "3").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.Baomingtimebegin = DateTime.Now.AddYears(-1).ToString("yyyy-MM-dd");
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs
index 301ad4d..478e3ba 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperVisitController.cs
@@ -30,11 +30,13 @@
private readonly ICooperatecustomCustomerService _cooperatecustomCustomerService;
private readonly IUserService _userService;
private readonly ICooperVisitService _cooperVisitService;
- private readonly ICusFangwenjiluService _cusFangwenjiluService;
+ private readonly ICusFangwenjiluService _cusFangwenjiluService;
+ private readonly IPltPageService _pltPageService;
public CooperVisitController(ILogger<CooperVisitController> logger, IProjectService projectService, ILiaotianService liaotianService, ICooperatecustomCustomerService cooperatecustomCustomerService, IUserService userService, ICooperVisitService cooperVisitService
- , ICusFangwenjiluService cusFangwenjiluService)
+ , ICusFangwenjiluService cusFangwenjiluService
+ , IPltPageService pltPageService)
{
_logger = logger;
_projectService = projectService;
@@ -43,6 +45,7 @@
_userService = userService;
_cooperVisitService = cooperVisitService;
_cusFangwenjiluService = cusFangwenjiluService;
+ _pltPageService = pltPageService;
}
public IActionResult Index(string Viscustomer = "")
@@ -57,16 +60,26 @@
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, "/CooperVisit/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;
@@ -108,7 +121,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/CooperVisit/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
CooperVisitDTO dto = new CooperVisitDTO();
if (!String.IsNullOrEmpty(id))
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
index 46d9b4d..e5f2e87 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/CooperatecustomCustomerController.cs
@@ -29,10 +29,12 @@
private readonly IUserService _userService;
private readonly IHrDeptService _hrDeptService;
private readonly ISysAttachmentService _sysAttachmentService;
+ private readonly IPltPageService _pltPageService;
public CooperatecustomCustomerController(ILogger<CooperatecustomCustomerController> logger, IProjectService projectService, ILiaotianService liaotianService, ICooperatecustomCustomerService cooperatecustomCustomerService, IUserService userService, IHrDeptService hrDeptService
- , ISysAttachmentService sysAttachmentService)
+ , ISysAttachmentService sysAttachmentService
+ , IPltPageService pltPageService)
{
_logger = logger;
_projectService = projectService;
@@ -41,6 +43,7 @@
_userService = userService;
_hrDeptService = hrDeptService;
_sysAttachmentService = sysAttachmentService;
+ _pltPageService = pltPageService;
}
public IActionResult Index()
@@ -48,58 +51,85 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
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);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Add";
- actionEntity1.PageIco = "fa fa-plus";
- actionEntity1.ActionName = "鏂板";
- actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity = new ActionEntity();
+ //actionEntity.OpenType = 0;
+ //actionEntity.ActionUrl = "";
+ //actionEntity.ActionFun = "Search";
+ //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 actionEntity3 = new ActionEntity();
- actionEntity3.OpenType = 0;
- actionEntity3.ActionUrl = "";
- actionEntity3.ActionFun = "Print";
- actionEntity3.PageIco = "fa fa-print";
- actionEntity3.ActionName = "鎵撳嵃璧勬枡";
- actionlist.Add(actionEntity3);
+ //ActionEntity actionEntity3 = new ActionEntity();
+ //actionEntity3.OpenType = 0;
+ //actionEntity3.ActionUrl = "";
+ //actionEntity3.ActionFun = "Print";
+ //actionEntity3.PageIco = "fa fa-print";
+ //actionEntity3.ActionName = "鎵撳嵃璧勬枡";
+ //actionlist.Add(actionEntity3);
- ActionEntity actionEntity4 = new ActionEntity();
- actionEntity4.OpenType = 0;
- actionEntity4.ActionUrl = "";
- actionEntity4.ActionFun = "Duanxin";
- actionEntity4.PageIco = "";
- actionEntity4.ActionName = "缇ゅ彂鐭俊";
- actionlist.Add(actionEntity4);
+ //ActionEntity actionEntity4 = new ActionEntity();
+ //actionEntity4.OpenType = 0;
+ //actionEntity4.ActionUrl = "";
+ //actionEntity4.ActionFun = "Duanxin";
+ //actionEntity4.PageIco = "";
+ //actionEntity4.ActionName = "缇ゅ彂鐭俊";
+ //actionlist.Add(actionEntity4);
- ActionEntity actionEntity5 = new ActionEntity();
- actionEntity5.OpenType = 0;
- actionEntity5.ActionUrl = "";
- actionEntity5.ActionFun = "Youjian";
- actionEntity5.PageIco = "";
- actionEntity5.ActionName = "缇ゅ彂閭欢";
- actionlist.Add(actionEntity5);
+ //ActionEntity actionEntity5 = new ActionEntity();
+ //actionEntity5.OpenType = 0;
+ //actionEntity5.ActionUrl = "";
+ //actionEntity5.ActionFun = "Youjian";
+ //actionEntity5.PageIco = "";
+ //actionEntity5.ActionName = "缇ゅ彂閭欢";
+ //actionlist.Add(actionEntity5);
- ActionEntity actionEntity6 = new ActionEntity();
- actionEntity6.OpenType = 0;
- actionEntity6.ActionUrl = "";
- actionEntity6.ActionFun = "Xinhan";
- actionEntity6.PageIco = "";
- actionEntity6.ActionName = "鍟嗕笟淇″嚱";
- actionlist.Add(actionEntity6);
+ //ActionEntity actionEntity6 = new ActionEntity();
+ //actionEntity6.OpenType = 0;
+ //actionEntity6.ActionUrl = "";
+ //actionEntity6.ActionFun = "Xinhan";
+ //actionEntity6.PageIco = "";
+ //actionEntity6.ActionName = "鍟嗕笟淇″嚱";
+ //actionlist.Add(actionEntity6);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/CooperatecustomCustomer/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+ if (pageEntities1.Count(x => x.PageShortcut == "Search") <= 0)
+ {
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+
+ ViewData["Creater"] = curentuser.Id;
+ }
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").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;
-
+ ViewData["ActionInfo2"] = pageEntities2;
+
ViewBag.khlx = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.khly = _liaotianService.GetSYScode("CooperatecustomCustomer", "khly").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -139,7 +169,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/CooperatecustomCustomer/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
CooperatecustomCustomerDTO cooperatecustomCustomerDTO = new CooperatecustomCustomerDTO();
if (!String.IsNullOrEmpty(id))
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
index 9dfdbf6..11d978b 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionCustomerController.cs
@@ -57,78 +57,104 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
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);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Add";
- actionEntity1.PageIco = "fa fa-plus";
- actionEntity1.ActionName = "鏂板";
- actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity = new ActionEntity();
+ //actionEntity.OpenType = 0;
+ //actionEntity.ActionUrl = "";
+ //actionEntity.ActionFun = "Search";
+ //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 actionEntity2 = new ActionEntity();
- actionEntity2.OpenType = 0;
- actionEntity2.ActionUrl = "";
- actionEntity2.ActionFun = "Zhuanyi";
- actionEntity2.PageIco = "fa fa-exchange";
- actionEntity2.ActionName = "杞Щ瀹㈡埛";
- actionlist.Add(actionEntity2);
+ //ActionEntity actionEntity2 = new ActionEntity();
+ //actionEntity2.OpenType = 0;
+ //actionEntity2.ActionUrl = "";
+ //actionEntity2.ActionFun = "Zhuanyi";
+ //actionEntity2.PageIco = "fa fa-exchange";
+ //actionEntity2.ActionName = "杞Щ瀹㈡埛";
+ //actionlist.Add(actionEntity2);
- ActionEntity actionEntity3 = new ActionEntity();
- actionEntity3.OpenType = 0;
- actionEntity3.ActionUrl = "";
- actionEntity3.ActionFun = "Print";
- actionEntity3.PageIco = "fa fa-print";
- actionEntity3.ActionName = "鎵撳嵃璧勬枡";
- actionlist.Add(actionEntity3);
+ //ActionEntity actionEntity3 = new ActionEntity();
+ //actionEntity3.OpenType = 0;
+ //actionEntity3.ActionUrl = "";
+ //actionEntity3.ActionFun = "Print";
+ //actionEntity3.PageIco = "fa fa-print";
+ //actionEntity3.ActionName = "鎵撳嵃璧勬枡";
+ //actionlist.Add(actionEntity3);
- ActionEntity actionEntity4 = new ActionEntity();
- actionEntity4.OpenType = 0;
- actionEntity4.ActionUrl = "";
- actionEntity4.ActionFun = "Duanxin";
- actionEntity4.PageIco = "";
- actionEntity4.ActionName = "缇ゅ彂鐭俊";
- actionlist.Add(actionEntity4);
+ //ActionEntity actionEntity4 = new ActionEntity();
+ //actionEntity4.OpenType = 0;
+ //actionEntity4.ActionUrl = "";
+ //actionEntity4.ActionFun = "Duanxin";
+ //actionEntity4.PageIco = "";
+ //actionEntity4.ActionName = "缇ゅ彂鐭俊";
+ //actionlist.Add(actionEntity4);
- ActionEntity actionEntity5 = new ActionEntity();
- actionEntity5.OpenType = 0;
- actionEntity5.ActionUrl = "";
- actionEntity5.ActionFun = "Youjian";
- actionEntity5.PageIco = "";
- actionEntity5.ActionName = "缇ゅ彂閭欢";
- actionlist.Add(actionEntity5);
+ //ActionEntity actionEntity5 = new ActionEntity();
+ //actionEntity5.OpenType = 0;
+ //actionEntity5.ActionUrl = "";
+ //actionEntity5.ActionFun = "Youjian";
+ //actionEntity5.PageIco = "";
+ //actionEntity5.ActionName = "缇ゅ彂閭欢";
+ //actionlist.Add(actionEntity5);
- ActionEntity actionEntity6 = new ActionEntity();
- actionEntity6.OpenType = 0;
- actionEntity6.ActionUrl = "";
- actionEntity6.ActionFun = "Xinhan";
- actionEntity6.PageIco = "";
- actionEntity6.ActionName = "鍟嗕笟淇″嚱";
- actionlist.Add(actionEntity6);
+ //ActionEntity actionEntity6 = new ActionEntity();
+ //actionEntity6.OpenType = 0;
+ //actionEntity6.ActionUrl = "";
+ //actionEntity6.ActionFun = "Xinhan";
+ //actionEntity6.PageIco = "";
+ //actionEntity6.ActionName = "鍟嗕笟淇″嚱";
+ //actionlist.Add(actionEntity6);
- ActionEntity actionEntity7 = new ActionEntity();
- actionEntity7.OpenType = 0;
- actionEntity7.ActionUrl = "";
- actionEntity7.ActionFun = "Daochu";
- actionEntity7.PageIco = "";
- actionEntity7.ActionName = "瀵煎嚭";
- actionlist.Add(actionEntity7);
+ //ActionEntity actionEntity7 = new ActionEntity();
+ //actionEntity7.OpenType = 0;
+ //actionEntity7.ActionUrl = "";
+ //actionEntity7.ActionFun = "Daochu";
+ //actionEntity7.PageIco = "";
+ //actionEntity7.ActionName = "瀵煎嚭";
+ //actionlist.Add(actionEntity7);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/IntentionCustomer/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+ if (pageEntities1.Count(x => x.PageShortcut == "Search") <= 0)
+ {
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+
+ ViewData["Creater11"] = curentuser.Id;
+ }
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").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;
-
+ ViewData["ActionInfo2"] = pageEntities2;
ViewBag.khlx = _liaotianService.GetSYScode("CooperatecustomCustomer", "khlx").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.khly = _liaotianService.GetSYScode("IntentionCustomer", "khly").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -268,34 +294,40 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
List<ActionEntity> actionlist = new List<ActionEntity>();
-
-
-
-
- List<PageEntity> pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/IntentionCustomer/IndexYiXiang/");
- foreach(var pageEntity in pageEntities)
+
+
+
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/IntentionCustomer/IndexYiXiang/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+ if (pageEntities1.Count(x => x.PageShortcut == "Search") <= 0)
{
ActionEntity actionEntity = new ActionEntity();
- actionEntity.OpenType = pageEntity.OpenType;
+ actionEntity.OpenType = 0;
actionEntity.ActionUrl = "";
- actionEntity.ActionFun = pageEntity.PageShortcut;
- actionEntity.PageIco = pageEntity.PageIco;
- actionEntity.ActionName = pageEntity.PageName;
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
actionlist.Add(actionEntity);
+
+
}
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
- ActionEntity actionEntity4 = new ActionEntity();
- actionEntity4.OpenType = 0;
- actionEntity4.ActionUrl = "";
- actionEntity4.ActionFun = "Duanxin";
- actionEntity4.PageIco = "";
- actionEntity4.ActionName = "缇ゅ彂鐭俊";
- actionlist.Add(actionEntity4);
-
+ 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;
+ ViewData["ActionInfo2"] = pageEntities2;
ViewBag.khly = _liaotianService.GetSYScode("IntentionCustomer", "khly").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -350,7 +382,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/IntentionCustomer/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
IntentionCustomerDTO intentionCustomerDTO = new IntentionCustomerDTO();
if (!String.IsNullOrEmpty(id))
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs
index 52729aa..9c398df 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Customer/IntentionVisitController.cs
@@ -32,10 +32,11 @@
private readonly IUserService _userService;
private readonly IIntentionVisitService _intentionVisitService;
private readonly ICusFangwenjiluService _cusFangwenjiluService;
-
+ private readonly IPltPageService _pltPageService;
public IntentionVisitController(ILogger<IntentionVisitController> logger, IProjectService projectService, ILiaotianService liaotianService, IIntentionCustomerService intentionCustomerService, IUserService userService, IIntentionVisitService intentionVisitService
- , ICusFangwenjiluService cusFangwenjiluService)
+ , ICusFangwenjiluService cusFangwenjiluService
+ , IPltPageService pltPageService)
{
_logger = logger;
_projectService = projectService;
@@ -44,6 +45,7 @@
_userService = userService;
_intentionVisitService = intentionVisitService;
_cusFangwenjiluService = cusFangwenjiluService;
+ _pltPageService = pltPageService;
}
@@ -59,17 +61,27 @@
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, "/IntentionVisit/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;
@@ -114,7 +126,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/IntentionVisit/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
IntentionVisitDTO dto = new IntentionVisitDTO();
if (!String.IsNullOrEmpty(id))
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/Expert/ZhuanjiahuidaController.cs b/zhengcaioa/zhengcaioa/Controllers/Expert/ZhuanjiahuidaController.cs
index 3904acf..cb26f66 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Expert/ZhuanjiahuidaController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Expert/ZhuanjiahuidaController.cs
@@ -21,16 +21,18 @@
private readonly ILogger<ZhuanjiahuidaController> _logger;
private readonly ILZhuanjiahuidumService _lZhuanjiahuidumService;
private readonly ILiaotianService _liaotianService;
- private readonly IConfiguration _configuration;
+ //private readonly IConfiguration _configuration;
+ private readonly IPltPageService _pltPageService;
-
- public ZhuanjiahuidaController(ILogger<ZhuanjiahuidaController> logger, ILZhuanjiahuidumService lZhuanjiahuidumService, ILiaotianService liaotianService)
+ public ZhuanjiahuidaController(ILogger<ZhuanjiahuidaController> logger, ILZhuanjiahuidumService lZhuanjiahuidumService, ILiaotianService liaotianService
+ , IPltPageService pltPageService)
{
_logger = logger;
_lZhuanjiahuidumService = lZhuanjiahuidumService;
_liaotianService = liaotianService;
+ _pltPageService = pltPageService;
}
[CheckLogin]
public IActionResult Index()
@@ -54,6 +56,10 @@
//actionlist.Add(actionEntity1);
ViewData["ActionInfo"] = actionlist;
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/Zhuanjiahuida/Index");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
+
ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
return View();
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs b/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
index 69ca945..b68f175 100644
--- a/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/ExpertTest/ExpertTestTopicController.cs
@@ -64,35 +64,48 @@
- 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);
- ActionEntity actionEntity2 = new ActionEntity();
- actionEntity2.OpenType = 0;
- actionEntity2.ActionUrl = "";
- actionEntity2.ActionFun = "Print";
- actionEntity2.PageIco = "fa fa-print";
- actionEntity2.ActionName = "鎵撳嵃";
- actionlist.Add(actionEntity2);
+ //ActionEntity actionEntity2 = new ActionEntity();
+ //actionEntity2.OpenType = 0;
+ //actionEntity2.ActionUrl = "";
+ //actionEntity2.ActionFun = "Print";
+ //actionEntity2.PageIco = "fa fa-print";
+ //actionEntity2.ActionName = "鎵撳嵃";
+ //actionlist.Add(actionEntity2);
- ActionEntity actionEntity3 = new ActionEntity();
- actionEntity3.OpenType = 0;
- actionEntity3.ActionUrl = "";
- actionEntity3.ActionFun = "Zhuanyi";
- actionEntity3.PageIco = "fa fa-plus";
- actionEntity3.ActionName = "鏁版嵁杞Щ";
- actionlist.Add(actionEntity3);
-
+ //ActionEntity actionEntity3 = new ActionEntity();
+ //actionEntity3.OpenType = 0;
+ //actionEntity3.ActionUrl = "";
+ //actionEntity3.ActionFun = "Zhuanyi";
+ //actionEntity3.PageIco = "fa fa-plus";
+ //actionEntity3.ActionName = "鏁版嵁杞Щ";
+ //actionlist.Add(actionEntity3);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/ExpertTestTopic/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;
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
@@ -140,6 +153,11 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
+
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/ExpertTestTopic/Index");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
+
var expertTestTopicanwserDTOs = new List<ExpertTestTopicanwserDTO>();
var expertTestTopicjiexiDTOs = new List<ExpertTestTopicjiexiDTO>();
@@ -299,8 +317,6 @@
ViewBag.Area = areaDTOs;
-
- List<PageEntity> pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/ExpertTestTopic/Index");
ViewData["pageEntities"] = pageEntities;
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs
index 233c683..0080aa9 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs
@@ -22,18 +22,20 @@
private readonly ILiaotianService _liaotianService;
private readonly IFiSubjectService _ifiSubjectService;
private readonly IFiAccountRecordService _iFiAccountRecordService;
-
+ private readonly IPltPageService _pltPageService;
public FiAccountController(ILogger<FiAccountController> logger, IFiAccountService fiAccountService, ILiaotianService liaotianService, IFiSubjectService ifiSubjectService
- , IFiAccountRecordService iFiAccountRecordService)
+ , IFiAccountRecordService iFiAccountRecordService
+ , IPltPageService pltPageService)
{
_logger = logger;
_fiAccountService = fiAccountService;
_liaotianService = liaotianService;
_ifiSubjectService = ifiSubjectService;
_iFiAccountRecordService = iFiAccountRecordService;
+ _pltPageService = pltPageService;
}
public IActionResult Index()
@@ -48,14 +50,30 @@
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, "/FiAccount/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").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;
+ ViewData["ActionInfo2"] = pageEntities2;
+
ViewBag.accounttype = _liaotianService.GetSYScode("fi_account", "accounttype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.qiyongstatus = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
return View();
@@ -79,20 +97,35 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
List<ActionEntity> actionlist = new List<ActionEntity>();
- ActionEntity actionEntity = new ActionEntity();
- actionEntity.OpenType = 0;
- actionEntity.ActionUrl = "";
- actionEntity.ActionFun = "Save";
- actionEntity.PageIco = "glyphicon glyphicon-ok";
- actionEntity.ActionName = "淇濆瓨";
- actionlist.Add(actionEntity);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Nullify";
- actionEntity1.PageIco = "fa fa-remove";
- actionEntity1.ActionName = "鍒犻櫎";
- actionlist.Add(actionEntity1);
+
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/FiAccount/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "02" && x.PageShortcut != "Liushuizhang").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);
+ }
+
+ //ActionEntity actionEntity = new ActionEntity();
+ //actionEntity.OpenType = 0;
+ //actionEntity.ActionUrl = "";
+ //actionEntity.ActionFun = "Save";
+ //actionEntity.PageIco = "glyphicon glyphicon-ok";
+ //actionEntity.ActionName = "淇濆瓨";
+ //actionlist.Add(actionEntity);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Nullify";
+ //actionEntity1.PageIco = "fa fa-remove";
+ //actionEntity1.ActionName = "鍒犻櫎";
+ //actionlist.Add(actionEntity1);
ViewData["ActionInfo"] = actionlist;
ViewBag.accounttype = _liaotianService.GetSYScode("fi_account", "accounttype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.qiyongstatus = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountExpensesController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountExpensesController.cs
index a1d3f64..71a6b48 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountExpensesController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountExpensesController.cs
@@ -23,15 +23,18 @@
private readonly IFiAccountRecordService _iFiAccountRecordService;
private readonly IFiSubjectService _ifiSubjectService;
+ private readonly IPltPageService _pltPageService;
- public FiAccountExpensesController(ILogger<FiAccountExpensesController> logger, IFiAccountService fiAccountService, ILiaotianService liaotianService, IFiAccountRecordService iFiAccountRecordService, IFiSubjectService ifiSubjectService)
+ public FiAccountExpensesController(ILogger<FiAccountExpensesController> logger, IFiAccountService fiAccountService, ILiaotianService liaotianService, IFiAccountRecordService iFiAccountRecordService, IFiSubjectService ifiSubjectService
+ , IPltPageService pltPageService)
{
_logger = logger;
_fiAccountService = fiAccountService;
_liaotianService = liaotianService;
_iFiAccountRecordService = iFiAccountRecordService;
_ifiSubjectService = ifiSubjectService;
+ _pltPageService = pltPageService;
}
@@ -48,20 +51,32 @@
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 actionEntity2 = new ActionEntity();
- actionEntity2.OpenType = 0;
- actionEntity2.ActionUrl = "";
- actionEntity2.ActionFun = "PrintDetail";
- actionEntity2.PageIco = "fa fa-plus";
- actionEntity2.ActionName = "鎵撳嵃鏄庣粏";
- actionlist.Add(actionEntity2);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Add";
+ //actionEntity1.PageIco = "fa fa-plus";
+ //actionEntity1.ActionName = "鏂板";
+ //actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity2 = new ActionEntity();
+ //actionEntity2.OpenType = 0;
+ //actionEntity2.ActionUrl = "";
+ //actionEntity2.ActionFun = "PrintDetail";
+ //actionEntity2.PageIco = "fa fa-plus";
+ //actionEntity2.ActionName = "鎵撳嵃鏄庣粏";
+ //actionlist.Add(actionEntity2);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/FiAccountExpenses/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;
ViewBag.accounttype = _liaotianService.GetSYScode("fi_account", "accounttype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountIncomeController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountIncomeController.cs
index 0d3ef77..f96dc4a 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountIncomeController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountIncomeController.cs
@@ -23,15 +23,17 @@
private readonly IFiAccountRecordService _iFiAccountRecordService;
private readonly IFiSubjectService _ifiSubjectService;
+ private readonly IPltPageService _pltPageService;
-
- public FiAccountIncomeController(ILogger<FiAccountIncomeController> logger, IFiAccountService fiAccountService, ILiaotianService liaotianService, IFiAccountRecordService iFiAccountRecordService, IFiSubjectService ifiSubjectService)
+ public FiAccountIncomeController(ILogger<FiAccountIncomeController> logger, IFiAccountService fiAccountService, ILiaotianService liaotianService, IFiAccountRecordService iFiAccountRecordService, IFiSubjectService ifiSubjectService
+ , IPltPageService pltPageService)
{
_logger = logger;
_fiAccountService = fiAccountService;
_liaotianService = liaotianService;
_iFiAccountRecordService = iFiAccountRecordService;
_ifiSubjectService = ifiSubjectService;
+ _pltPageService = pltPageService;
}
@@ -47,20 +49,34 @@
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 actionEntity2 = new ActionEntity();
- actionEntity2.OpenType = 0;
- actionEntity2.ActionUrl = "";
- actionEntity2.ActionFun = "PrintDetail";
- actionEntity2.PageIco = "fa fa-plus";
- actionEntity2.ActionName = "鎵撳嵃鏄庣粏";
- actionlist.Add(actionEntity2);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Add";
+ //actionEntity1.PageIco = "fa fa-plus";
+ //actionEntity1.ActionName = "鏂板";
+ //actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity2 = new ActionEntity();
+ //actionEntity2.OpenType = 0;
+ //actionEntity2.ActionUrl = "";
+ //actionEntity2.ActionFun = "PrintDetail";
+ //actionEntity2.PageIco = "fa fa-plus";
+ //actionEntity2.ActionName = "鎵撳嵃鏄庣粏";
+ //actionlist.Add(actionEntity2);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/FiAccountIncome/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;
ViewBag.accounttype = _liaotianService.GetSYScode("fi_account", "accounttype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs
index 2b73183..e088107 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/FiOrderrecievemoneyController.cs
@@ -41,6 +41,7 @@
private readonly IConfiguration _configuration;
private readonly IHttpClientFactory _clientFactory;
private readonly IFiMemberService _iMemberService;
+ private readonly IPltPageService _pltPageService;
public FiOrderrecievemoneyController(ILogger<FiOrderrecievemoneyController> logger, ILiaotianService liaotianService, IFiOrderrecievemoneyService fiOrderrecievemoneyService, ICooperOrderService cooperOrderService, IFiSubjectService ifiSubjectService
, IFiAccountService fiAccountService, IFiAccountRecordService iFiAccountRecordService, ICooperatecustomCustomerService cooperatecustomCustomerService
@@ -49,7 +50,8 @@
, IFiCustomerrecievemoneyService fiCustomerrecievemoneyService
, IConfiguration configuration
, IHttpClientFactory clientFactory
- , IFiMemberService iMemberService)
+ , IFiMemberService iMemberService
+ , IPltPageService pltPageService)
{
_logger = logger;
_liaotianService = liaotianService;
@@ -65,6 +67,7 @@
_configuration = configuration;
_clientFactory = clientFactory;
_iMemberService = iMemberService;
+ _pltPageService = pltPageService;
}
public IActionResult Index()
@@ -81,7 +84,9 @@
actionlist.Add(actionEntity);
ViewData["ActionInfo"] = actionlist;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/FiOrderrecievemoney/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
ViewBag.OrderType = _liaotianService.GetSYScode("CooperVisit", "jtype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -332,7 +337,9 @@
actionEntity.PageIco = "fa fa-search";
actionEntity.ActionName = "鏌ヨ";
actionlist.Add(actionEntity);
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/FiOrderrecievemoney/IndexCustomer/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
ViewData["ActionInfo"] = actionlist;
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiPiecerateController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiPiecerateController.cs
index 5b753ea..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;
@@ -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))
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiSubjectController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiSubjectController.cs
index 065e44e..1fb8a0a 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/FiSubjectController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/FiSubjectController.cs
@@ -20,15 +20,17 @@
private readonly ILogger<FiSubjectController> _logger;
private readonly IFiSubjectService _fiSubjectService;
private readonly ILiaotianService _liaotianService;
+ private readonly IPltPageService _pltPageService;
-
- public FiSubjectController(ILogger<FiSubjectController> logger, IFiSubjectService fiSubjectService, ILiaotianService liaotianService)
+ public FiSubjectController(ILogger<FiSubjectController> logger, IFiSubjectService fiSubjectService, ILiaotianService liaotianService
+ , IPltPageService pltPageService)
{
_logger = logger;
_fiSubjectService = fiSubjectService;
_liaotianService = liaotianService;
+ _pltPageService = pltPageService;
}
public IActionResult Index()
@@ -43,13 +45,26 @@
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, "/FiSubject/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;
ViewBag.subjecttype = _liaotianService.GetSYScode("fi_subject", "subjecttype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.qiyongstatus = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -74,20 +89,32 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
List<ActionEntity> actionlist = new List<ActionEntity>();
- ActionEntity actionEntity = new ActionEntity();
- actionEntity.OpenType = 0;
- actionEntity.ActionUrl = "";
- actionEntity.ActionFun = "Save";
- actionEntity.PageIco = "glyphicon glyphicon-ok";
- actionEntity.ActionName = "淇濆瓨";
- actionlist.Add(actionEntity);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Nullify";
- actionEntity1.PageIco = "fa fa-remove";
- actionEntity1.ActionName = "鍒犻櫎";
- actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity = new ActionEntity();
+ //actionEntity.OpenType = 0;
+ //actionEntity.ActionUrl = "";
+ //actionEntity.ActionFun = "Save";
+ //actionEntity.PageIco = "glyphicon glyphicon-ok";
+ //actionEntity.ActionName = "淇濆瓨";
+ //actionlist.Add(actionEntity);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Nullify";
+ //actionEntity1.PageIco = "fa fa-remove";
+ //actionEntity1.ActionName = "鍒犻櫎";
+ //actionlist.Add(actionEntity1);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/FiSubject/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "02").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;
ViewBag.subjecttype = _liaotianService.GetSYScode("fi_subject", "subjecttype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.qiyongstatus = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/ServiceChargeController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/ServiceChargeController.cs
index 00efc6d..d1c5008 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/ServiceChargeController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/ServiceChargeController.cs
@@ -32,18 +32,27 @@
private readonly IFiServiceService _fiServiceService;
private readonly IFiMemberService _fiMemberService;
private readonly IFiBookService _fiBookService;
+ private readonly IPltPageService _pltPageService;
- public ServiceChargeController(ILogger<ServiceChargeController> logger, IFiServiceService fiServiceService, IFiMemberService fiMemberService, IFiBookService fiBookService)
+ public ServiceChargeController(ILogger<ServiceChargeController> logger, IFiServiceService fiServiceService, IFiMemberService fiMemberService, IFiBookService fiBookService
+ , IPltPageService pltPageService)
{
_logger = logger;
_fiServiceService = fiServiceService;
_fiMemberService = fiMemberService;
_fiBookService = fiBookService;
+ _pltPageService = pltPageService;
}
public IActionResult Index()
{
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/ServiceCharge/Index");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
+
List<FiServiceDTO> fiServiceDTOs = _fiServiceService.GetList();
List<FiMemberDTO> fiMemberDTOs = _fiMemberService.GetList();
List<FiBookDTO> fiBookDTOs = _fiBookService.GetList();
diff --git a/zhengcaioa/zhengcaioa/Controllers/HR/HrDeptController.cs b/zhengcaioa/zhengcaioa/Controllers/HR/HrDeptController.cs
index e5a97e2..f01158d 100644
--- a/zhengcaioa/zhengcaioa/Controllers/HR/HrDeptController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/HR/HrDeptController.cs
@@ -20,16 +20,19 @@
private readonly IHrDeptService _hrDeptService;
private readonly ILiaotianService _liaotianService;
private readonly IUserService _userService;
-
+ private readonly IPltPageService _pltPageService;
- public HrDeptController(ILogger<HrDeptController> logger, IHrDeptService hrDeptService, ILiaotianService liaotianService, IUserService userService)
+
+ public HrDeptController(ILogger<HrDeptController> logger, IHrDeptService hrDeptService, ILiaotianService liaotianService, IUserService userService
+ , IPltPageService pltPageService)
{
_logger = logger;
_hrDeptService = hrDeptService;
_liaotianService = liaotianService;
_userService = userService;
+ _pltPageService = pltPageService;
}
@@ -48,13 +51,27 @@
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, "/HrDept/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;
ViewBag.depttype = _liaotianService.GetSYScode("hr_dept", "dept_type").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.qiyongstatus = _liaotianService.GetSYScode("system", "shifou").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -80,20 +97,35 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
List<ActionEntity> actionlist = new List<ActionEntity>();
- ActionEntity actionEntity = new ActionEntity();
- actionEntity.OpenType = 0;
- actionEntity.ActionUrl = "";
- actionEntity.ActionFun = "Save";
- actionEntity.PageIco = "glyphicon glyphicon-ok";
- actionEntity.ActionName = "淇濆瓨";
- actionlist.Add(actionEntity);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Nullify";
- actionEntity1.PageIco = "fa fa-remove";
- actionEntity1.ActionName = "鍒犻櫎";
- actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity = new ActionEntity();
+ //actionEntity.OpenType = 0;
+ //actionEntity.ActionUrl = "";
+ //actionEntity.ActionFun = "Save";
+ //actionEntity.PageIco = "glyphicon glyphicon-ok";
+ //actionEntity.ActionName = "淇濆瓨";
+ //actionlist.Add(actionEntity);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Nullify";
+ //actionEntity1.PageIco = "fa fa-remove";
+ //actionEntity1.ActionName = "鍒犻櫎";
+ //actionlist.Add(actionEntity1);
+
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/HrDept/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "02").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;
ViewBag.depttype = _liaotianService.GetSYScode("hr_dept", "dept_type").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.dept = _hrDeptService.GetList().Select(x => new { code = x.Id, label = x.DeptName }).ToList();
diff --git a/zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs b/zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs
index e18ff3d..e245aa7 100644
--- a/zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs
@@ -21,15 +21,17 @@
private readonly IHrJibengongziService _hrJibengongziService;
private readonly ILiaotianService _liaotianService;
private readonly IHrPositionService _hrPositionService;
+ private readonly IPltPageService _pltPageService;
-
- public HrJibengongziController(ILogger<HrJibengongziController> logger, IHrJibengongziService hrJibengongziService, ILiaotianService liaotianService, IHrPositionService hrPositionService)
+ public HrJibengongziController(ILogger<HrJibengongziController> logger, IHrJibengongziService hrJibengongziService, ILiaotianService liaotianService, IHrPositionService hrPositionService
+ , IPltPageService pltPageService)
{
_logger = logger;
_hrJibengongziService = hrJibengongziService;
_liaotianService = liaotianService;
_hrPositionService = hrPositionService;
+ _pltPageService = pltPageService;
}
@@ -45,13 +47,26 @@
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, "/HrJibengongzi/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;
ViewBag.post = _hrPositionService.GetList().Select(x => new { code = x.Id, label = x.PostName }).ToList();
@@ -77,7 +92,9 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/HrJibengongzi/Index");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
HrJibengongziDTO dto = new HrJibengongziDTO();
if (!String.IsNullOrEmpty(id))
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/HR/HrJixiaotichengController.cs b/zhengcaioa/zhengcaioa/Controllers/HR/HrJixiaotichengController.cs
index 2624935..4f42068 100644
--- a/zhengcaioa/zhengcaioa/Controllers/HR/HrJixiaotichengController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/HR/HrJixiaotichengController.cs
@@ -21,17 +21,19 @@
private readonly ILiaotianService _liaotianService;
private readonly IHrPositionService _hrPositionService;
private readonly IFiPiecerateService _fiPiecerateService;
-
+ private readonly IPltPageService _pltPageService;
public HrJixiaotichengController(ILogger<HrJixiaotichengController> logger, IHrJixiaotichengService hrJixiaotichengService, ILiaotianService liaotianService, IHrPositionService hrPositionService
- , IFiPiecerateService fiPiecerateService)
+ , IFiPiecerateService fiPiecerateService
+ , IPltPageService pltPageService)
{
_logger = logger;
_hrJixiaotichengService = hrJixiaotichengService;
_liaotianService = liaotianService;
_hrPositionService = hrPositionService;
_fiPiecerateService = fiPiecerateService;
+ _pltPageService = pltPageService;
}
public IActionResult Index()
@@ -46,13 +48,26 @@
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, "/HrJixiaoticheng/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;
ViewBag.post = _hrPositionService.GetList().Select(x => new { code = x.Id, label = x.PostName }).ToList();
@@ -79,7 +94,9 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/HrJixiaoticheng/Index");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
HrJixiaotichengDTO dto = new HrJixiaotichengDTO();
if (!String.IsNullOrEmpty(id))
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/HR/HrPositionController.cs b/zhengcaioa/zhengcaioa/Controllers/HR/HrPositionController.cs
index 1285a39..9b8c140 100644
--- a/zhengcaioa/zhengcaioa/Controllers/HR/HrPositionController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/HR/HrPositionController.cs
@@ -17,12 +17,14 @@
{
private readonly ILogger<HrPositionController> _logger;
private readonly IHrPositionService _hrPositionService;
+ private readonly IPltPageService _pltPageService;
-
- public HrPositionController(ILogger<HrPositionController> logger, IHrPositionService hrPositionService)
+ public HrPositionController(ILogger<HrPositionController> logger, IHrPositionService hrPositionService
+ , IPltPageService pltPageService)
{
_logger = logger;
_hrPositionService = hrPositionService;
+ _pltPageService = pltPageService;
}
@@ -41,13 +43,26 @@
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, "/HrPosition/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;
return View();
}
@@ -70,20 +85,35 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
List<ActionEntity> actionlist = new List<ActionEntity>();
- ActionEntity actionEntity = new ActionEntity();
- actionEntity.OpenType = 0;
- actionEntity.ActionUrl = "";
- actionEntity.ActionFun = "Save";
- actionEntity.PageIco = "glyphicon glyphicon-ok";
- actionEntity.ActionName = "淇濆瓨";
- actionlist.Add(actionEntity);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Nullify";
- actionEntity1.PageIco = "fa fa-remove";
- actionEntity1.ActionName = "鍒犻櫎";
- actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity = new ActionEntity();
+ //actionEntity.OpenType = 0;
+ //actionEntity.ActionUrl = "";
+ //actionEntity.ActionFun = "Save";
+ //actionEntity.PageIco = "glyphicon glyphicon-ok";
+ //actionEntity.ActionName = "淇濆瓨";
+ //actionlist.Add(actionEntity);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Nullify";
+ //actionEntity1.PageIco = "fa fa-remove";
+ //actionEntity1.ActionName = "鍒犻櫎";
+ //actionlist.Add(actionEntity1);
+
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/HrPosition/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "02").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;
return View();
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs b/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
index 27559c9..858095c 100644
--- a/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/HR/SalaryCheckController.cs
@@ -21,9 +21,11 @@
private readonly IWfRunProcessService _wfRunProcessService;
private readonly IWfHistoryService _wfHistoryService;
private readonly IWfNeeddeelService _wfNeeddeelService;
+ private readonly IPltPageService _pltPageService;
public SalaryCheckController(ILogger<SalaryCheckController> logger, IHrSalaryService hrSalaryService, IHrDeptService hrDeptService, IWfRunProcessService wfRunProcessService
- , IWfHistoryService wfHistoryService, IWfNeeddeelService wfNeeddeelService)
+ , IWfHistoryService wfHistoryService, IWfNeeddeelService wfNeeddeelService
+ , IPltPageService pltPageService)
{
_logger = logger;
_hrDeptService = hrDeptService;
@@ -31,10 +33,13 @@
_wfRunProcessService = wfRunProcessService;
_wfHistoryService = wfHistoryService;
_wfNeeddeelService = wfNeeddeelService;
+ _pltPageService = pltPageService;
}
public IActionResult Index()
{
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
List<ActionEntity> actionlist = new List<ActionEntity>();
ActionEntity actionEntity = new ActionEntity();
actionEntity.OpenType = 0;
@@ -44,14 +49,25 @@
actionEntity.ActionName = "鏌ヨ";
actionlist.Add(actionEntity);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Edit";
- actionEntity1.PageIco = "fa fa-plus";
- actionEntity1.ActionName = "鏍稿噯";
- actionlist.Add(actionEntity1);
-
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Edit";
+ //actionEntity1.PageIco = "fa fa-plus";
+ //actionEntity1.ActionName = "鏍稿噯";
+ //actionlist.Add(actionEntity1);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/SalaryCheck/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);
+ }
ViewBag.editBtn = false;
ViewData["ActionInfo"] = actionlist;
@@ -84,7 +100,13 @@
/// <param name="id"></param>
/// <returns></returns>
public IActionResult Edit(string id)
- {
+ {
+
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/SalaryCheck/Index");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
HrSalaryDTO dto = new HrSalaryDTO();
if (!string.IsNullOrEmpty(id))
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs b/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs
index 7b1b755..0b53eac 100644
--- a/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/LiaotianController.cs
@@ -122,31 +122,42 @@
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);
- ActionEntity actionEntity2 = new ActionEntity();
- actionEntity2.OpenType = 0;
- actionEntity2.ActionUrl = "";
- actionEntity2.ActionFun = "Print";
- actionEntity2.PageIco = "fa fa-print";
- actionEntity2.ActionName = "鎵撳嵃";
- actionlist.Add(actionEntity2);
+ //ActionEntity actionEntity2 = new ActionEntity();
+ //actionEntity2.OpenType = 0;
+ //actionEntity2.ActionUrl = "";
+ //actionEntity2.ActionFun = "Print";
+ //actionEntity2.PageIco = "fa fa-print";
+ //actionEntity2.ActionName = "鎵撳嵃";
+ //actionlist.Add(actionEntity2);
- ActionEntity actionEntity3 = new ActionEntity();
- actionEntity3.OpenType = 0;
- actionEntity3.ActionUrl = "";
- actionEntity3.ActionFun = "Zhuanyi";
- actionEntity3.PageIco = "fa fa-plus";
- actionEntity3.ActionName = "鏁版嵁杞Щ";
- actionlist.Add(actionEntity3);
-
+ //ActionEntity actionEntity3 = new ActionEntity();
+ //actionEntity3.OpenType = 0;
+ //actionEntity3.ActionUrl = "";
+ //actionEntity3.ActionFun = "Zhuanyi";
+ //actionEntity3.PageIco = "fa fa-plus";
+ //actionEntity3.ActionName = "鏁版嵁杞Щ";
+ //actionlist.Add(actionEntity3);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/Liaotian/Indexcheck");
+ 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;
ViewBag.problemtype = _liaotianService.GetSYScode("Liaotian", "problemtype").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -274,6 +285,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/Liaotian/Indexcheck");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
LiaotianDTO liaotianDTO = new LiaotianDTO();
if (!String.IsNullOrEmpty(id))
{
@@ -291,8 +305,6 @@
}
ViewData.Model = liaotianDTO;
-
- List<PageEntity> pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/Liaotian/Indexcheck");
ViewData["pageEntities"] = pageEntities;
diff --git a/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs b/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
index 3f77fd8..e23b9a9 100644
--- a/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/ProjectController.cs
@@ -30,12 +30,14 @@
private readonly ISysBaimingdanService _sysBaimingdanService;
private readonly IFiOrderrecievemoneyService _fiOrderrecievemoneyService;
private readonly IAreaService _areaService;
+ private readonly IPltPageService _pltPageService;
public ProjectController(ILogger<ProjectController> logger, IProjectService projectService, ILiaotianService liaotianService,IIntentionCustomerService intentionCustomerService, IUserService userService
, ICooperatecustomCustomerService cooperatecustomCustomerService
, ISysBaimingdanService sysBaimingdanService
, IFiOrderrecievemoneyService fiOrderrecievemoneyService
- , IAreaService areaService)
+ , IAreaService areaService
+ , IPltPageService pltPageService)
{
_logger = logger;
_projectService = projectService;
@@ -46,6 +48,7 @@
_sysBaimingdanService = sysBaimingdanService;
_fiOrderrecievemoneyService = fiOrderrecievemoneyService;
_areaService = areaService;
+ _pltPageService = pltPageService;
}
[CheckLogin]
public IActionResult Index()
@@ -75,7 +78,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/Project/Select");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
ProjectDTO projectDTO = new ProjectDTO();
if (!String.IsNullOrEmpty(id))
{
@@ -305,20 +310,45 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
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);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Add";
- actionEntity1.PageIco = "fa fa-plus";
- actionEntity1.ActionName = "鏂板";
- actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity = new ActionEntity();
+ //actionEntity.OpenType = 0;
+ //actionEntity.ActionUrl = "";
+ //actionEntity.ActionFun = "Search";
+ //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);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/Project/Select");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+ if (pageEntities1.Count(x => x.PageShortcut == "Search") <= 0)
+ {
+ ActionEntity actionEntity = new ActionEntity();
+ actionEntity.OpenType = 0;
+ actionEntity.ActionUrl = "";
+ actionEntity.ActionFun = "Search";
+ actionEntity.PageIco = "fa fa-search";
+ actionEntity.ActionName = "鏌ヨ";
+ actionlist.Add(actionEntity);
+
+ ViewData["Creater11"] = curentuser.Id;
+ }
+ 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;
ViewBag.ProjectDropDown = _projectService.AllcgfsDropDown().Select(x => new { code = x.Value, label = x.Text }).ToList();
//ViewBag.flbx = _liaotianService.GetSYScode("Project", "flbx").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
diff --git a/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs b/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
index 7b95a97..3e42b4d 100644
--- a/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/SysCodeController.cs
@@ -18,13 +18,15 @@
private readonly ILogger<SysCodeController> _logger;
private readonly ISysCodeService _sysCodeService;
private readonly ILiaotianService _liaotianService;
+ private readonly IPltPageService _pltPageService;
-
- public SysCodeController(ILogger<SysCodeController> logger, ISysCodeService sysCodeService, ILiaotianService liaotianService)
+ public SysCodeController(ILogger<SysCodeController> logger, ISysCodeService sysCodeService, ILiaotianService liaotianService
+ , IPltPageService pltPageService)
{
_logger = logger;
_sysCodeService = sysCodeService;
_liaotianService = liaotianService;
+ _pltPageService = pltPageService;
}
[CheckLogin]
@@ -537,13 +539,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);
+ List<PageEntity> pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/SysCode/Indexrequestinfo");
+ 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;
return View();
}
@@ -567,7 +581,9 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/SysCode/Indexrequestinfo");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
SysCodeDtlEntity sysCodeDtlEntity = new SysCodeDtlEntity();
@@ -619,13 +635,26 @@
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);
+ List<PageEntity> pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/SysCode/Indexquestion");
+ 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;
return View();
}
@@ -649,7 +678,9 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/SysCode/Indexquestion");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
SysCodeDtlEntity sysCodeDtlEntity = new SysCodeDtlEntity();
@@ -681,13 +712,26 @@
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);
+ List<PageEntity> pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/SysCode/Indexlaw");
+ 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;
ViewBag.falv = _liaotianService.GetSYScode("expert_test_topicjiexi", "falv").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.question = _liaotianService.GetSYScode("t_challenge_items", "question").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -732,7 +776,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/SysCode/Indexlaw");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
SysCodeDtlEntity sysCodeDtlEntity = new SysCodeDtlEntity();
diff --git a/zhengcaioa/zhengcaioa/Controllers/UserController.cs b/zhengcaioa/zhengcaioa/Controllers/UserController.cs
index d255ea0..d6b4099 100644
--- a/zhengcaioa/zhengcaioa/Controllers/UserController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/UserController.cs
@@ -25,10 +25,12 @@
private readonly IPltJiatingchengyuanService _pltJiatingchengyuanService;
private readonly ISysAttachmentService _sysAttachmentService;
private readonly IPltRoleService _pltRoleService;
+ private readonly IPltPageService _pltPageService;
public UserController(ILogger<UserController> logger, IUserService userService, IHrDeptService hrDeptService, IHrPositionService hrPositionService, ILiaotianService liaotianService, IPltJiatingchengyuanService pltJiatingchengyuanService, ISysAttachmentService sysAttachmentService
- , IPltRoleService pltRoleService)
+ , IPltRoleService pltRoleService
+ , IPltPageService pltPageService)
{
_logger = logger;
_userService = userService;
@@ -38,6 +40,7 @@
_pltJiatingchengyuanService = pltJiatingchengyuanService;
_sysAttachmentService = sysAttachmentService;
_pltRoleService = pltRoleService;
+ _pltPageService = pltPageService;
}
@@ -55,14 +58,30 @@
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, "/User/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").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;
+ ViewData["ActionInfo2"] = pageEntities2;
+
ViewBag.zhiwustatus = _liaotianService.GetSYScode("plt_user", "zhiwustatus").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
ViewBag.dept = _hrDeptService.GetList().Select(x => new { code = x.Id, label = x.DeptName }).ToList();
ViewBag.post = _hrPositionService.GetList().Select(x => new { code = x.Id, label = x.PostName }).ToList();
@@ -104,7 +123,15 @@
actionEntity1.PageIco = "fa fa-remove";
actionEntity1.ActionName = "鍒犻櫎";
actionlist.Add(actionEntity1);
+
+
+
ViewData["ActionInfo"] = actionlist;
+
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/User/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
+
ViewBag.dept = _hrDeptService.GetList();//.Select(x => new { code = x.Id, label = x.DeptName }).ToList();
ViewBag.post = _hrPositionService.GetList();//.Select(x => new { code = x.Id, label = x.PostName }).ToList();
ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou");//.Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -495,8 +522,10 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/User/JiBenGongZi");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
ViewBag.shifou = _liaotianService.GetSYScode("system", "shifou");//.Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
PltUserDTO PltUserDTO = new PltUserDTO();
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/AdmBreakPrecedentController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/AdmBreakPrecedentController.cs
index db54142..e0eb911 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/AdmBreakPrecedentController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/AdmBreakPrecedentController.cs
@@ -29,10 +29,12 @@
private readonly IAdmBreakPrecedentService _admBreakPrecedentService;
private readonly IHrDeptService _hrDeptService;
private readonly IPltRoleService _ltRoleService;
-
+ private readonly IPltPageService _pltPageService;
- public AdmBreakPrecedentController(ILogger<AdmBreakPrecedentController> logger, ILiaotianService liaotianService, IUserService userService, IAdmBreakPrecedentService admBreakPrecedentService, IHrDeptService hrDeptService, IPltRoleService ltRoleService)
+
+ public AdmBreakPrecedentController(ILogger<AdmBreakPrecedentController> logger, ILiaotianService liaotianService, IUserService userService, IAdmBreakPrecedentService admBreakPrecedentService, IHrDeptService hrDeptService, IPltRoleService ltRoleService
+ , IPltPageService pltPageService)
{
_logger = logger;
_liaotianService = liaotianService;
@@ -40,6 +42,8 @@
_admBreakPrecedentService = admBreakPrecedentService;
_hrDeptService = hrDeptService;
_ltRoleService = ltRoleService;
+ _pltPageService = pltPageService;
+
}
public IActionResult Index()
{
@@ -53,13 +57,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, "/AdmBreakPrecedent/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;
@@ -82,6 +98,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/AdmBreakPrecedent/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
AdmBreakPrecedentDTO dto = new AdmBreakPrecedentDTO();
if (!String.IsNullOrEmpty(id))
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/AdmDocBaseController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/AdmDocBaseController.cs
index b898a96..ba25cba 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/AdmDocBaseController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/AdmDocBaseController.cs
@@ -17,12 +17,14 @@
{
private readonly ILogger<AdmDocBaseController> _logger;
private readonly IAdmDocBaseService _admDocBaseService;
+ private readonly IPltPageService _pltPageService;
- public AdmDocBaseController(ILogger<AdmDocBaseController> logger, IAdmDocBaseService admDocBaseService)
+ public AdmDocBaseController(ILogger<AdmDocBaseController> logger, IAdmDocBaseService admDocBaseService, IPltPageService pltPageService)
{
_logger = logger;
_admDocBaseService = admDocBaseService;
+ _pltPageService = pltPageService;
}
public IActionResult Index()
@@ -37,13 +39,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, "/AdmDocBase/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;
return View();
}
@@ -66,20 +80,32 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
List<ActionEntity> actionlist = new List<ActionEntity>();
- ActionEntity actionEntity = new ActionEntity();
- actionEntity.OpenType = 0;
- actionEntity.ActionUrl = "";
- actionEntity.ActionFun = "Save";
- actionEntity.PageIco = "glyphicon glyphicon-ok";
- actionEntity.ActionName = "淇濆瓨";
- actionlist.Add(actionEntity);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Nullify";
- actionEntity1.PageIco = "fa fa-remove";
- actionEntity1.ActionName = "鍒犻櫎";
- actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity = new ActionEntity();
+ //actionEntity.OpenType = 0;
+ //actionEntity.ActionUrl = "";
+ //actionEntity.ActionFun = "Save";
+ //actionEntity.PageIco = "glyphicon glyphicon-ok";
+ //actionEntity.ActionName = "淇濆瓨";
+ //actionlist.Add(actionEntity);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Nullify";
+ //actionEntity1.PageIco = "fa fa-remove";
+ //actionEntity1.ActionName = "鍒犻櫎";
+ //actionlist.Add(actionEntity1);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/AdmDocBase/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "02").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;
return View();
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/AdmDocDocController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/AdmDocDocController.cs
index 52d0ab4..92da09d 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/AdmDocDocController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/AdmDocDocController.cs
@@ -29,15 +29,17 @@
private readonly IAdmDocDocService _admDocDocService;
private readonly IHrDeptService _hrDeptService;
private readonly IAdmDocBaseService _admDocBaseService;
+ private readonly IPltPageService _pltPageService;
-
- public AdmDocDocController(ILogger<AdmDocDocController> logger, ILiaotianService liaotianService, IAdmDocDocService admDocDocService, IHrDeptService hrDeptService, IAdmDocBaseService admDocBaseService)
+ public AdmDocDocController(ILogger<AdmDocDocController> logger, ILiaotianService liaotianService, IAdmDocDocService admDocDocService, IHrDeptService hrDeptService, IAdmDocBaseService admDocBaseService
+ , IPltPageService pltPageService)
{
_logger = logger;
_liaotianService = liaotianService;
_admDocDocService = admDocDocService;
_hrDeptService = hrDeptService;
_admDocBaseService = admDocBaseService;
+ _pltPageService = pltPageService;
}
@@ -53,14 +55,30 @@
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, "/AdmDocDoc/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").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;
+ ViewData["ActionInfo2"] = pageEntities2;
@@ -90,7 +108,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/AdmDocDoc/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
AdmDocDocDTO dto = new AdmDocDocDTO();
if (!String.IsNullOrEmpty(id))
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/AdmGoodsClassifyController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/AdmGoodsClassifyController.cs
index 3405baa..530a604 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/AdmGoodsClassifyController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/AdmGoodsClassifyController.cs
@@ -17,12 +17,15 @@
{
private readonly ILogger<AdmGoodsClassifyController> _logger;
private readonly IAdmGoodsClassifyService _admGoodsClassifyService;
+ private readonly IPltPageService _pltPageService;
- public AdmGoodsClassifyController(ILogger<AdmGoodsClassifyController> logger, IAdmGoodsClassifyService admGoodsClassifyService)
+ public AdmGoodsClassifyController(ILogger<AdmGoodsClassifyController> logger, IAdmGoodsClassifyService admGoodsClassifyService
+ , IPltPageService pltPageService)
{
_logger = logger;
_admGoodsClassifyService = admGoodsClassifyService;
+ _pltPageService = pltPageService;
}
public IActionResult Index()
@@ -37,13 +40,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, "/AdmGoodsClassify/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;
return View();
}
@@ -66,20 +81,32 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
List<ActionEntity> actionlist = new List<ActionEntity>();
- ActionEntity actionEntity = new ActionEntity();
- actionEntity.OpenType = 0;
- actionEntity.ActionUrl = "";
- actionEntity.ActionFun = "Save";
- actionEntity.PageIco = "glyphicon glyphicon-ok";
- actionEntity.ActionName = "淇濆瓨";
- actionlist.Add(actionEntity);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "Nullify";
- actionEntity1.PageIco = "fa fa-remove";
- actionEntity1.ActionName = "鍒犻櫎";
- actionlist.Add(actionEntity1);
+ //ActionEntity actionEntity = new ActionEntity();
+ //actionEntity.OpenType = 0;
+ //actionEntity.ActionUrl = "";
+ //actionEntity.ActionFun = "Save";
+ //actionEntity.PageIco = "glyphicon glyphicon-ok";
+ //actionEntity.ActionName = "淇濆瓨";
+ //actionlist.Add(actionEntity);
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "Nullify";
+ //actionEntity1.PageIco = "fa fa-remove";
+ //actionEntity1.ActionName = "鍒犻櫎";
+ //actionlist.Add(actionEntity1);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/AdmGoodsClassify/Index/");
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "02").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;
return View();
}
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/AdmGoodsManageController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/AdmGoodsManageController.cs
index 07e284c..307b08a 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/AdmGoodsManageController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/AdmGoodsManageController.cs
@@ -32,6 +32,7 @@
private readonly IAdmGoodsRecordService _admGoodsRecordService;
+
public AdmGoodsManageController(ILogger<AdmGoodsManageController> logger, ILiaotianService liaotianService, IAdmGoodsManageService admGoodsManageService, IAdmGoodsClassifyService admGoodsClassifyService, IPltPageService pltPageService
, IAdmGoodsRecordService admGoodsRecordService)
{
@@ -58,8 +59,8 @@
actionlist.Add(actionEntity);
List<PageEntity> pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/AdmGoodsManage/Index/");
-
- foreach (var pageEntity in pageEntities )
+ var pageEntities1 = pageEntities.Where(x => x.PageMethod == "01").ToList();
+ foreach (var pageEntity in pageEntities1)
{
ActionEntity actionEntity1 = new ActionEntity();
actionEntity1.OpenType = pageEntity.OpenType;
@@ -102,7 +103,7 @@
ViewData["ActionInfo"] = actionlist;
-
+ ViewData["ActionInfo2"] = pageEntities1;
ViewBag.GoodsStatus = _liaotianService.GetSYScode("adm_goods_manage", "goods_status").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -160,6 +161,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/AdmGoodsManage/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
AdmGoodsManageDTO dto = new AdmGoodsManageDTO();
if (!String.IsNullOrEmpty(id))
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/AdmPieceCheckController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/AdmPieceCheckController.cs
index 2100a32..52ec47f 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/AdmPieceCheckController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/AdmPieceCheckController.cs
@@ -29,9 +29,11 @@
private readonly IAdmPieceCheckService _admPieceCheckService;
private readonly IHrDeptService _hrDeptService;
private readonly IFiPiecerateService _fiPiecerateService;
+ private readonly IPltPageService _pltPageService;
- public AdmPieceCheckController(ILogger<AdmPieceCheckController> logger, ILiaotianService liaotianService, IUserService userService, IAdmPieceCheckService admPieceCheckService, IHrDeptService hrDeptService, IFiPiecerateService fiPiecerateService)
+ public AdmPieceCheckController(ILogger<AdmPieceCheckController> logger, ILiaotianService liaotianService, IUserService userService, IAdmPieceCheckService admPieceCheckService, IHrDeptService hrDeptService, IFiPiecerateService fiPiecerateService
+ , IPltPageService pltPageService)
{
_logger = logger;
_liaotianService = liaotianService;
@@ -39,6 +41,7 @@
_admPieceCheckService = admPieceCheckService;
_hrDeptService = hrDeptService;
_fiPiecerateService = fiPiecerateService;
+ _pltPageService = pltPageService;
}
public IActionResult Index()
{
@@ -52,22 +55,34 @@
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);
- ActionEntity actionEntity3 = new ActionEntity();
- actionEntity3.OpenType = 0;
- actionEntity3.ActionUrl = "";
- actionEntity3.ActionFun = "Print";
- actionEntity3.PageIco = "fa fa-print";
- actionEntity3.ActionName = "鎵撳嵃";
- actionlist.Add(actionEntity3);
+ //ActionEntity actionEntity3 = new ActionEntity();
+ //actionEntity3.OpenType = 0;
+ //actionEntity3.ActionUrl = "";
+ //actionEntity3.ActionFun = "Print";
+ //actionEntity3.PageIco = "fa fa-print";
+ //actionEntity3.ActionName = "鎵撳嵃";
+ //actionlist.Add(actionEntity3);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/AdmPieceCheck/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;
@@ -130,7 +145,9 @@
{
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
-
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/AdmPieceCheck/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
AdmPieceCheckDTO dto = new AdmPieceCheckDTO();
if (!String.IsNullOrEmpty(id))
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/AdmTongxunluController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/AdmTongxunluController.cs
index 989fd47..5756093 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/AdmTongxunluController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/AdmTongxunluController.cs
@@ -27,14 +27,17 @@
private readonly ILogger<AdmTongxunluController> _logger;
private readonly ILiaotianService _liaotianService;
private readonly IAdmTongxunluService _admTongxunluService;
+ private readonly IPltPageService _pltPageService;
- public AdmTongxunluController(ILogger<AdmTongxunluController> logger, ILiaotianService liaotianService, IAdmTongxunluService admTongxunluService) {
+ public AdmTongxunluController(ILogger<AdmTongxunluController> logger, ILiaotianService liaotianService, IAdmTongxunluService admTongxunluService
+ , IPltPageService pltPageService)
+ {
_logger = logger;
_liaotianService = liaotianService;
_admTongxunluService = admTongxunluService;
-
+ _pltPageService = pltPageService;
}
@@ -55,21 +58,32 @@
- 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, "/AdmTongxunlu/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;
-
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
ViewBag.TypeId = _liaotianService.GetSYScode("adm_tongxunlu", "type_id").Select(x => new { code = x.CodeSn, label = x.Comments }).ToList();
@@ -96,6 +110,7 @@
var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
ViewData["curentuser"] = curentuser;
+
AdmTongxunluDTO dto = new AdmTongxunluDTO();
if (!String.IsNullOrEmpty(id))
{
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/AdmZhanghaomimaController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/AdmZhanghaomimaController.cs
index 7f96079..b55cffe 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/AdmZhanghaomimaController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/AdmZhanghaomimaController.cs
@@ -27,14 +27,16 @@
private readonly ILogger<AdmZhanghaomimaController> _logger;
private readonly ILiaotianService _liaotianService;
private readonly IAdmZhanghaomimaService _admZhanghaomimaService;
+ private readonly IPltPageService _pltPageService;
- public AdmZhanghaomimaController(ILogger<AdmZhanghaomimaController> logger, ILiaotianService liaotianService, IAdmZhanghaomimaService admZhanghaomimaService)
+ public AdmZhanghaomimaController(ILogger<AdmZhanghaomimaController> logger, ILiaotianService liaotianService, IAdmZhanghaomimaService admZhanghaomimaService, IPltPageService pltPageService)
{
_logger = logger;
_liaotianService = liaotianService;
_admZhanghaomimaService = admZhanghaomimaService;
+ _pltPageService = pltPageService;
}
@@ -56,20 +58,37 @@
- 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, "/AdmZhanghaomima/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;
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
+
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/SimController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/SimController.cs
index adfd74c..fd3b723 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/SimController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/SimController.cs
@@ -21,13 +21,16 @@
private readonly ILiaotianService _liaotianService;
private readonly IUserService _userService;
private readonly ISimService _simService;
+ private readonly IPltPageService _pltPageService;
- public SimController(ILogger<SimController> logger, IUserService userService, ILiaotianService liaotianService,ISimService simService)
+ public SimController(ILogger<SimController> logger, IUserService userService, ILiaotianService liaotianService,ISimService simService
+ , IPltPageService pltPageService)
{
_logger = logger;
_liaotianService = liaotianService;
_userService = userService;
_simService = simService;
+ _pltPageService = pltPageService;
}
/// <summary>
@@ -36,6 +39,8 @@
/// <returns></returns>
public IActionResult Index()
{
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
List<ActionEntity> actionlist = new List<ActionEntity>();
ActionEntity actionEntity = new ActionEntity();
actionEntity.OpenType = 0;
@@ -45,14 +50,25 @@
actionEntity.ActionName = "鏌ヨ";
actionlist.Add(actionEntity);
- ActionEntity actionEntity1 = new ActionEntity();
- actionEntity1.OpenType = 0;
- actionEntity1.ActionUrl = "";
- actionEntity1.ActionFun = "UnBind";
- actionEntity1.PageIco = "fa fa-remove";
- actionEntity1.ActionName = "鎵归噺瑙ｉ櫎缁戝畾";
- actionlist.Add(actionEntity1);
-
+ //ActionEntity actionEntity1 = new ActionEntity();
+ //actionEntity1.OpenType = 0;
+ //actionEntity1.ActionUrl = "";
+ //actionEntity1.ActionFun = "UnBind";
+ //actionEntity1.PageIco = "fa fa-remove";
+ //actionEntity1.ActionName = "鎵归噺瑙ｉ櫎缁戝畾";
+ //actionlist.Add(actionEntity1);
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/Sim/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;
return View();
}
@@ -74,6 +90,12 @@
/// <returns></returns>
public IActionResult Edit(string id)
{
+ var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+ ViewData["curentuser"] = curentuser;
+ var pageEntities = _pltPageService.GetUserPage(curentuser.Id, "/Sim/Index/");
+ var pageEntities2 = pageEntities.Where(x => x.PageMethod == "02").ToList();
+ ViewData["ActionInfo2"] = pageEntities2;
+
ViewBag.CardPro = _liaotianService.GetSYScode("t_sim_bind", "cardpro");
ViewData["users"] = _userService.GetList();
SimBindView dto = new SimBindView();
diff --git a/zhengcaioa/zhengcaioa/Views/AdmBreakPrecedent/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/AdmBreakPrecedent/Edit.cshtml
index ef12873..64be367 100644
--- a/zhengcaioa/zhengcaioa/Views/AdmBreakPrecedent/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/AdmBreakPrecedent/Edit.cshtml
@@ -10,6 +10,7 @@
List<PltUserDTO> chufa = ViewData["chufa"] as List<PltUserDTO>; //鍛樺伐
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@{
Layout = null;
@@ -234,11 +235,11 @@
<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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -351,7 +352,7 @@
-
+
//var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" }
$.ajax({
type: "POST",
@@ -360,7 +361,7 @@
global: false,
data: $('form').serializeArray(),
success: function (data) {
-
+
if (data.Result) {
@@ -404,7 +405,7 @@
global: false,
data: "",
success: function (data) {
-
+
var quxian = $("#UserId");
var userid = '@Model.UserId';
quxian.find('option').remove();
@@ -444,7 +445,7 @@
global: false,
data: "",
success: function (data) {
-
+
var quxian = $("#QianfaUserId");
var userid = '@Model.QianfaUserId';
quxian.find('option').remove();
@@ -478,6 +479,18 @@
parent.layer.close(index);
return false;
}
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/AdmDocDoc/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/AdmDocDoc/Edit.cshtml
index 3e97214..c6bc53a 100644
--- a/zhengcaioa/zhengcaioa/Views/AdmDocDoc/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/AdmDocDoc/Edit.cshtml
@@ -9,6 +9,7 @@
List<HrDeptDTO> DocDept = ViewData["DocDept"] as List<HrDeptDTO>; //閮ㄩ棬
List<AdmDocBaseDTO> DocType = ViewData["DocType"] as List<AdmDocBaseDTO>; //鍏枃绫诲瀷
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@{
Layout = null;
@@ -263,11 +264,11 @@
<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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -387,7 +388,7 @@
-
+
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({
@@ -397,7 +398,7 @@
global: false,
data: data,//$('form').serializeArray(),
success: function (data) {
-
+
if (data.Result) {
@@ -440,6 +441,18 @@
parent.layer.close(index);
return false;
}
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/AdmDocDoc/Index.cshtml b/zhengcaioa/zhengcaioa/Views/AdmDocDoc/Index.cshtml
index bb21fb9..f6e50e6 100644
--- a/zhengcaioa/zhengcaioa/Views/AdmDocDoc/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/AdmDocDoc/Index.cshtml
@@ -1,6 +1,9 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "AdmDocDoc";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@section headerStyle{
<script type="text/javascript">
@@ -29,11 +32,11 @@
{
label: '鎵撳嵃', name: 'print', labtype: 'txt', hidden: false, width: 100,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('鎵撳嵃','100%','100%', '/AdmDocDoc/Print?id=" + rowObject.Id + "')\" >鎵撳嵃</a>";
+ return "<a class='Print' style='display: none;' onclick=\"OpenWindow('鎵撳嵃','100%','100%', '/AdmDocDoc/Print?id=" + rowObject.Id + "')\" >鎵撳嵃</a>";
}
},
-
-
+
+
];
dataUrl = "/AdmDocDoc/GetList";
@@ -74,7 +77,18 @@
toastr.error("鍒犻櫎鎴愬姛");
/**/
}
-}
+ }
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+ var _afterLoadDataload = function (xhr) {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+
+
+ };
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Edit.cshtml
index b550e75..7a2e5da 100644
--- a/zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Edit.cshtml
@@ -12,6 +12,7 @@
string ClassifyIds = ViewData["ClassifyIds"] as string; //鐗╁搧绫诲瀷
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@{
Layout = null;
@@ -251,11 +252,11 @@
<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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -444,6 +445,17 @@
parent.layer.close(index);
return false;
}
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Index.cshtml b/zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Index.cshtml
index 10658fb..f633a87 100644
--- a/zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/AdmGoodsManage/Index.cshtml
@@ -1,6 +1,9 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "AdmGoodsManage";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@section headerStyle{
<script type="text/javascript">
@@ -9,7 +12,7 @@
var ClassifyId = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ClassifyId))';
var Goods = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.Goods))';
-
+
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
@@ -32,13 +35,13 @@
{
label: '鍏ュ簱', name: 'GoodsName', labtype: 'txt', hidden: false, width: 50,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('鍏ュ簱','98%','100%', '/AdmGoodsManage/Ruku?id=" + rowObject.Id + "')\" >鍏ュ簱</a>";
+ return "<a class='Ruku' style='display: none;' onclick=\"OpenWindow('鍏ュ簱','98%','100%', '/AdmGoodsManage/Ruku?id=" + rowObject.Id + "')\" >鍏ュ簱</a>";
}
},
{
label: '鍑哄簱', name: 'GoodsName', labtype: 'txt', hidden: false, width: 50,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('鍑哄簱','98%','100%', '/AdmGoodsManage/Chuku?id=" + rowObject.Id + "')\" >鍑哄簱</a>";
+ return "<a class='Chuku' style='display: none;' onclick=\"OpenWindow('鍑哄簱','98%','100%', '/AdmGoodsManage/Chuku?id=" + rowObject.Id + "')\" >鍑哄簱</a>";
}
},
{
@@ -93,7 +96,21 @@
toastr.error("鍒犻櫎鎴愬姛");
/**/
}
-}
+ }
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+ var _afterLoadDataload = function (xhr) {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+
+ }
+
+
+ };
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Edit.cshtml
index 6b322f2..468c843 100644
--- a/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Edit.cshtml
@@ -10,7 +10,7 @@
//List<SysCodeDtl> PayType = ViewData["PayType"] as List<SysCodeDtl>; //绫诲瀷
List<FiPiecerateDTO> WorkPro = ViewData["WorkPro"] as List<FiPiecerateDTO>; //椤圭洰
-
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@{
@@ -236,11 +236,11 @@
<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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -346,10 +346,10 @@
toastr.warning("鏁伴噺涓嶈兘涓虹┖");
return;
}
-
-
+
+
//var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" }
$.ajax({
type: "POST",
@@ -358,7 +358,7 @@
global: false,
data: $('form').serializeArray(),
success: function (data) {
-
+
if (data.Result) {
@@ -400,7 +400,7 @@
global: false,
data: "",
success: function (data) {
-
+
var quxian = $("#UserId");
var userid = '@Model.UserId';
quxian.find('option').remove();
@@ -439,6 +439,18 @@
parent.layer.close(index);
return false;
}
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/AdmTongxunlu/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/AdmTongxunlu/Edit.cshtml
index 03c1dcc..8f77657 100644
--- a/zhengcaioa/zhengcaioa/Views/AdmTongxunlu/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/AdmTongxunlu/Edit.cshtml
@@ -6,7 +6,7 @@
List<SysCodeDtl> TypeId = ViewData["TypeId"] as List<SysCodeDtl>; //鐗╁搧鐘舵��
-
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@{
@@ -221,9 +221,9 @@
var id = '@Model.Id';
-
-
+
+
// 淇濆瓨宀椾綅淇℃伅
var savePosition = function () {
@@ -268,7 +268,7 @@
if (data.Result) {
// parent._afterSave(true);
parent.layer.msg('鎴愬姛淇濆瓨', { icon: 6 });
-
+
try {
@@ -304,6 +304,18 @@
parent.layer.close(index);
return false;
}
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/AdmTongxunlu/Index.cshtml b/zhengcaioa/zhengcaioa/Views/AdmTongxunlu/Index.cshtml
index 9a76606..a79d0e6 100644
--- a/zhengcaioa/zhengcaioa/Views/AdmTongxunlu/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/AdmTongxunlu/Index.cshtml
@@ -1,13 +1,16 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "AdmTongxunlu";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@section headerStyle{
<script type="text/javascript">
-
+
var TypeId = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.TypeId))';
-
+
dataCol = [
@@ -24,21 +27,21 @@
{ label: '鑱旂郴鐢佃瘽', name: 'Lianxidianhua', labtype: 'txt', hidden: false, width: 100 },
{ label: '澶囨敞', name: 'Beuzhu', labtype: 'txt', hidden: false, width: 100 },
-
+
{
label: '鎿嶄綔', name: 'caozuo', labtype: 'txt', hidden: false, width: 50,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('淇敼','98%','100%', '/AdmTongxunlu/Edit?id=" + rowObject.Id + "')\" >淇敼</a> <a onclick=\"_pagedel('" + rowObject.Id + "')\" >鍒犻櫎</a>";
+ return "<a class='Update' style='display: none;' onclick=\"OpenWindow('淇敼','98%','100%', '/AdmTongxunlu/Edit?id=" + rowObject.Id + "')\" >淇敼</a> <a class='Delete' style='display: none;' onclick=\"_pagedel('" + rowObject.Id + "')\" >鍒犻櫎</a>";
}
},
-
+
];
dataUrl = "/AdmTongxunlu/GetList";
searchCol = [
{ label: '绫诲埆', name: 'TypeId', labtype: 'combox', hidden: false, data: JSON.parse(TypeId), cwidth: '5%', cccwidth: '15%' },
{ label: '鍗曚綅鍚嶇О', name: 'DanweiName', labtype: 'txt', hidden: false },
-
+
@@ -65,7 +68,7 @@
if (data.Result) {
-
+
layer.msg('鍒犻櫎鎴愬姛', { icon: 6 });
window._reloadPageData();
}
@@ -86,10 +89,10 @@
});
}
-
+
}
-
+
var _afterSave = function (result) {
@@ -108,7 +111,20 @@
toastr.error("鍒犻櫎鎴愬姛");
/**/
}
-}
+ }
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+ var _afterLoadDataload = function (xhr) {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+
+ }
+
+
+ };
</script>
}
@@ -117,7 +133,7 @@
-
+
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/AdmZhanghaomima/Index.cshtml b/zhengcaioa/zhengcaioa/Views/AdmZhanghaomima/Index.cshtml
index feb3b24..1eae86b 100644
--- a/zhengcaioa/zhengcaioa/Views/AdmZhanghaomima/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/AdmZhanghaomima/Index.cshtml
@@ -1,6 +1,9 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "AdmZhanghaomima";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@section headerStyle{
<script type="text/javascript">
@@ -28,7 +31,7 @@
{
label: '鎿嶄綔', name: 'caozuo', labtype: 'txt', hidden: false, width: 50,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('淇敼','98%','100%', '/AdmZhanghaomima/Edit?id=" + rowObject.Id + "')\" >淇敼</a> <a onclick=\"_pagedel('" + rowObject.Id + "')\" >鍒犻櫎</a>";
+ return "<a class='Update' style='display: none;' onclick=\"OpenWindow('淇敼','98%','100%', '/AdmZhanghaomima/Edit?id=" + rowObject.Id + "')\" >淇敼</a> <a class='Delete' style='display: none;' onclick=\"_pagedel('" + rowObject.Id + "')\" >鍒犻櫎</a>";
}
},
@@ -108,7 +111,20 @@
toastr.error("鍒犻櫎鎴愬姛");
/**/
}
-}
+ }
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+ var _afterLoadDataload = function (xhr) {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+
+ }
+
+
+ };
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
index 3786ce5..2ac3108 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Edit.cshtml
@@ -40,6 +40,7 @@
List<TChallengeletterDTO> ChallengeletterChosen = ViewData["ChallengeletterChosen"] as List<TChallengeletterDTO>;
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@{
Layout = null;
@@ -989,11 +990,11 @@
<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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -1345,7 +1346,7 @@
});
$("#Price").change(function () {
-
+
var OrderNum = $("#OrderNum").val();
var Price = $("#Price").val();
var Money = $("#Money");
@@ -1524,7 +1525,7 @@
$("#OrderType2").change(function () {
-
+
var OrderType = $("#OrderType").val();
var OrderType1 = $("#OrderType1").val();
var OrderType2 = $("#OrderType2").val();
@@ -1644,7 +1645,7 @@
$("#OrderType2").trigger("change");
}
-
+
},
error: function () {
@@ -2075,8 +2076,21 @@
}
});
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ if ("@ShouliStatus" == "1") {
+ $("." + data[o].PageShortcut).show();
+ }
+
+
+ }
+ });
+
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
index 34368e1..2627445 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/Index.cshtml
@@ -1,6 +1,11 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "CooperOrder";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
+
+ string Creater = ViewData["Creater"] as string;
}
@section headerStyle{
<script type="text/javascript">
@@ -11,7 +16,7 @@
var HuifangStatus = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.HuifangStatus))';
var PingjiaStatus = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.PingjiaStatus))';
var ShouliStatus = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShouliStatus))';
-
+
var pageEntities = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.pageEntities))';
var pageEntitiesJson = JSON.parse(pageEntities);
@@ -187,7 +192,7 @@
{
label: '鎵撳嵃', name: 'OrderType', labtype: 'txt', hidden: false, width: 60,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('" + rowObject.OrderNo.replace(/'/g, '') + "','98%','100%', '/CooperOrder/Print?id=" + rowObject.Id + "')\" >鎵撳嵃</a>";
+ return "<a class='Dayin' style='display: none;' onclick=\"OpenWindow('" + rowObject.OrderNo.replace(/'/g, '') + "','98%','100%', '/CooperOrder/Print?id=" + rowObject.Id + "')\" >鎵撳嵃</a>";
}
@@ -196,23 +201,23 @@
label: '鎵撳嵃鍚堝悓', name: 'OrderType', labtype: 'txt', hidden: false, width: 60,
formatter: function (cellvalue, options, rowObject) {
if (rowObject.OrderType == '03') {
- return "<a onclick=\"OpenWindow('" + rowObject.OrderNo.replace(/'/g, '') + "','100%','100%', '/CooperOrder/Printbiaoshuhetong?id=" + rowObject.Id + "')\" >鎵撳嵃鍚堝悓</a>";
+ return "<a class='Dayinhetong' style='display: none;' onclick=\"OpenWindow('" + rowObject.OrderNo.replace(/'/g, '') + "','100%','100%', '/CooperOrder/Printbiaoshuhetong?id=" + rowObject.Id + "')\" >鎵撳嵃鍚堝悓</a>";
}
else if (rowObject.OrderType == '02' && (rowObject.OrderType1 == '浠ｆ嫙璐ㄧ枒鍑�' || rowObject.OrderType1 == '浠ｆ嫙鎶曡瘔涔�')) {
- return "<a onclick=\"OpenWindow('" + rowObject.OrderNo.replace(/'/g, '') + "','100%','100%', '/CooperOrder/Printzhiyitousuhetong?id=" + rowObject.Id + "')\" >鎵撳嵃鍚堝悓</a>";
+ return "<a class='Dayinhetong' style='display: none;' onclick=\"OpenWindow('" + rowObject.OrderNo.replace(/'/g, '') + "','100%','100%', '/CooperOrder/Printzhiyitousuhetong?id=" + rowObject.Id + "')\" >鎵撳嵃鍚堝悓</a>";
}
else if (rowObject.OrderType == '05') {
- return "<a onclick=\"OpenWindow('" + rowObject.OrderNo.replace(/'/g, '') + "','100%','100%', '/CooperOrder/Printhuiyuanhetong?id=" + rowObject.Id + "')\" >鎵撳嵃鍚堝悓</a>";
+ return "<a class='Dayinhetong' style='display: none;' onclick=\"OpenWindow('" + rowObject.OrderNo.replace(/'/g, '') + "','100%','100%', '/CooperOrder/Printhuiyuanhetong?id=" + rowObject.Id + "')\" >鎵撳嵃鍚堝悓</a>";
}
else if (rowObject.OrderType == '08') {
- return "<a onclick=\"OpenWindow('" + rowObject.OrderNo.replace(/'/g, '') + "','100%','100%', '/CooperOrder/Printfengxianhetong?id=" + rowObject.Id + "')\" >鎵撳嵃鍚堝悓</a>";
+ return "<a class='Dayinhetong' style='display: none;' onclick=\"OpenWindow('" + rowObject.OrderNo.replace(/'/g, '') + "','100%','100%', '/CooperOrder/Printfengxianhetong?id=" + rowObject.Id + "')\" >鎵撳嵃鍚堝悓</a>";
}
else {
return "";
}
-
+
}
@@ -222,13 +227,13 @@
label: '鏂板璁㈠崟', name: 'dingdantype', labtype: 'txt', hidden: false, width: 60,
formatter: function (cellvalue, options, rowObject) {
if (rowObject.OrderType == '02' && rowObject.OrderType1 == '浠ｆ嫙璐ㄧ枒鍑�' ) {
- return "<a onclick=\"OpenWindow('浠ｆ嫙鎶曡瘔涔�','100%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&dingdantype=1')\" >浠ｆ嫙鎶曡瘔涔�</a>";
+ return "<a class='Xinzeng' style='display: none;' onclick=\"OpenWindow('浠ｆ嫙鎶曡瘔涔�','100%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&dingdantype=1')\" >浠ｆ嫙鎶曡瘔涔�</a>";
}
else if (rowObject.OrderType == '02' && rowObject.OrderType1 == '浠ｆ嫙鎶曡瘔涔�') {
- return "<a onclick=\"OpenWindow('澶嶈璇夎','100%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&dingdantype=2')\" >澶嶈璇夎</a>";
+ return "<a class='Xinzeng' style='display: none;' onclick=\"OpenWindow('澶嶈璇夎','100%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&dingdantype=2')\" >澶嶈璇夎</a>";
}
else if (rowObject.OrderType == '08' && rowObject.OrderType1 == '澶嶈璇夎') {
- return "<a onclick=\"OpenWindow('澶嶈璇夎','100%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&dingdantype=3')\" >澶嶈璇夎</a>";
+ return "<a class='Xinzeng' style='display: none;' onclick=\"OpenWindow('澶嶈璇夎','100%','100%', '/CooperOrder/Edit?id=" + rowObject.Id + "&dingdantype=3')\" >澶嶈璇夎</a>";
}
else {
return "";
@@ -245,7 +250,7 @@
- dataUrl = "/CooperOrder/GetList";
+ dataUrl = "/CooperOrder/GetList"+"@(string.IsNullOrEmpty(Creater)?"": "?Ywjl=" + Creater)";
searchCol = [
{ label: '涓嬪崟鏃堕棿', name: 'XdTime', labtype: 'datearea', hidden: false },
{ label: '璁㈠崟缂栧彿', name: 'OrderNo', labtype: 'txt', hidden: false },
@@ -257,7 +262,7 @@
{ label: '璇勪环', name: 'PingjiaStatus', labtype: 'combox', hidden: false, data: JSON.parse(PingjiaStatus), cwidth: '5%', cccwidth: '8%' },
{ label: '璁㈠崟鐘舵��', name: 'ShouliStatus', labtype: 'combox', hidden: false, data: JSON.parse(ShouliStatus), cwidth: '5%', cccwidth: '8%' },
-
+
@@ -456,7 +461,21 @@
toastr.error("鍒犻櫎鎴愬姛");
/**/
}
-}
+ }
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+ var _afterLoadDataload = function (xhr) {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+
+ }
+
+
+ };
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/CooperOrder/selectWenshu.cshtml b/zhengcaioa/zhengcaioa/Views/CooperOrder/selectWenshu.cshtml
index 086a35a..bd53497 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperOrder/selectWenshu.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperOrder/selectWenshu.cshtml
@@ -1,13 +1,17 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "CooperOrder";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
+
}
@section headerStyle{
<script type="text/javascript">
var Wenshuleixing = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.Wenshuleixing))';
var status = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.status))';
-
+
gridConfig = { multiselect: true, selectcol: "Id" };
loseherght = 40;
dataCol = [
@@ -24,17 +28,17 @@
{ label: '閲囪喘浜�', name: 'PurchaserName', labtype: 'txt', hidden: false, width: 100 },
{ label: '閲囪喘浠ｇ悊鏈烘瀯', name: 'Agency', labtype: 'txt', hidden: false, width: 100 },
{ label: '瀹㈡埛鍗曚綅', name: 'KhdwName', labtype: 'txt', hidden: false, width: 100 },
- { label: '鐘舵��', name: 'StatusName', labtype: 'txt', hidden: false, width: 100 },
+ { label: '鐘舵��', name: 'StatusName', labtype: 'txt', hidden: false, width: 100 },
{
label: '鏌ョ湅鏂囦功', name: 'Status', labtype: 'txt', hidden: false, width: 100
,
formatter: function (cellvalue, options, rowObject) {
if (rowObject.OrderType1 == "浠ｆ嫙鎶曡瘔涔�") {
- return "<a onclick=\"OpenWindow('鎵撳嵃瀵煎嚭鎶曡瘔涔�','98%','100%', '/CooperOrder/Printtousushu?id=" + rowObject.Id + "')\" >鎵撳嵃瀵煎嚭鎶曡瘔涔�</a>";
+ return "<a class=\"Dayin\" style=\"display: none;\" onclick=\"OpenWindow('鎵撳嵃瀵煎嚭鎶曡瘔涔�','98%','100%', '/CooperOrder/Printtousushu?id=" + rowObject.Id + "')\" >鎵撳嵃瀵煎嚭鎶曡瘔涔�</a>";
}
else if (rowObject.OrderType1 == "浠ｆ嫙璐ㄧ枒鍑�") {
- return "<a onclick=\"OpenWindow('鎵撳嵃瀵煎嚭璐ㄧ枒鍑�','98%','100%', '/CooperOrder/PrintZhiyihan?id=" + rowObject.Id + "')\" >鎵撳嵃瀵煎嚭璐ㄧ枒鍑�</a>";
+ return "<a class=\"Dayin\" style=\"display: none;\" onclick=\"OpenWindow('鎵撳嵃瀵煎嚭璐ㄧ枒鍑�','98%','100%', '/CooperOrder/PrintZhiyihan?id=" + rowObject.Id + "')\" >鎵撳嵃瀵煎嚭璐ㄧ枒鍑�</a>";
}
}
},
@@ -52,7 +56,7 @@
{ label: '閲囪喘浠ｇ悊鏈烘瀯', name: 'Agency', labtype: 'txt', hidden: false },
{ label: '瀹㈡埛鍚嶇О', name: 'KhdwName', labtype: 'txt', hidden: false },
{ label: '鐢熸垚鐘舵��', name: 'status', labtype: 'combox', hidden: false, data: JSON.parse(status) },
-
+
@@ -128,6 +132,19 @@
}
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+ var _afterLoadDataload = function (xhr) {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+
+ }
+
+
+ };
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/CooperVisit/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/CooperVisit/Edit.cshtml
index 97790be..974bbcb 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperVisit/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperVisit/Edit.cshtml
@@ -11,7 +11,7 @@
List<SysCodeDtl> yx = ViewData["yx"] as List<SysCodeDtl>; //鎴愪氦鎰忓悜
List<SysCodeDtl> jy = ViewData["jy"] as List<SysCodeDtl>; //璺熻釜寤鸿
-
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@{
Layout = null;
@@ -314,11 +314,11 @@
<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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -443,7 +443,7 @@
return;
}
-
+
//var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" }
$.ajax({
type: "POST",
@@ -452,7 +452,7 @@
global: false,
data: $('form').serializeArray(),
success: function (data) {
-
+
if (data.Result) {
@@ -496,6 +496,18 @@
parent.layer.close(index);
return false;
}
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml
index 7081907..43d23ca 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Edit.cshtml
@@ -28,6 +28,8 @@
}
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
+
//string[] arrJobLevel = (Model.Zhuanjia ?? "").Split(',');
}
@@ -536,11 +538,11 @@
<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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -569,7 +571,7 @@
$("#Ywjl").chosen();
$("#Hyfl").chosen();
-
+
var id = '@Model.Id';
var bUpload = false;
@@ -811,7 +813,7 @@
global: false,
data: $('form').serializeArray(),
success: function (data) {
-
+
if (data.Result) {
@@ -853,7 +855,7 @@
global: false,
data: "",
success: function (data) {
-
+
var city = $("#City");
city.find('option').remove();
var aaa = '<option value="" hassubinfo="true">璇烽�夋嫨</option>';
@@ -885,7 +887,7 @@
global: false,
data: "",
success: function (data) {
-
+
var quxian = $("#AreaId");
quxian.find('option').remove();
var aaa = '<option value="" hassubinfo="true">璇烽�夋嫨</option>';
@@ -938,7 +940,7 @@
global: false,
data: "",
success: function (data) {
-
+
var quxian = $("#Ywjl");
var userid = '@Model.Ywjl';
quxian.find('option').remove();
@@ -1010,6 +1012,18 @@
parent.layer.close(index);
return false;
}
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
index ecfa364..0a95e18 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
@@ -1,6 +1,11 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "CooperatecustomCustomer";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
+
+ string Creater = ViewData["Creater"] as string;
}
@section headerStyle{
<script type="text/javascript">
@@ -11,7 +16,7 @@
var users = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.users))';
var shengDropDown = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShengDropDown))';
var shifou = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.shifou))';
-
+
loseherght = 60;
gridConfig = { multiselect: true, selectcol: "Id" };
dataCol = [
@@ -35,17 +40,17 @@
{
label: '瀹㈡埛鍥炶', name: 'Name111', labtype: 'txt', hidden: false, width: 100,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('鏂板鍚堜綔瀹㈡埛鍥炶','98%','100%', '/CooperVisit/Edit?id=&Viscustomer=" + rowObject.Id + "')\" >瀹㈡埛鍥炶</a>";
+ return "<a class='Huifang' style='display: none;' onclick=\"OpenWindow('鏂板鍚堜綔瀹㈡埛鍥炶','98%','100%', '/CooperVisit/Edit?id=&Viscustomer=" + rowObject.Id + "')\" >瀹㈡埛鍥炶</a>";
}
},
{
label: '鍥炶璁板綍', name: 'Name112', labtype: 'txt', hidden: false, width: 100,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('鍥炶璁板綍','98%','100%', '/CooperVisit/Index?IsYwjl=true&Viscustomer=" + rowObject.Id + "')\" >鍥炶璁板綍</a>";
+ return "<a class='Huifang' style='display: none;' onclick=\"OpenWindow('鍥炶璁板綍','98%','100%', '/CooperVisit/Index?IsYwjl=true&Viscustomer=" + rowObject.Id + "')\" >鍥炶璁板綍</a>";
}
},
];
- dataUrl = "/CooperatecustomCustomer/GetList";
+ dataUrl = "/CooperatecustomCustomer/GetList"+"@(string.IsNullOrEmpty(Creater)?"": "?Ywjl=" + Creater)";
searchCol = [
{ label: '瀹㈡埛鏉ユ簮', name: 'Khly', labtype: 'combox', hidden: false, data: JSON.parse(khlys), cwidth: '5%', cccwidth: '8%' },
@@ -176,7 +181,7 @@
var msg = $("#PBSSheng");
-
+
if (msg.length > 0) {
$("#PBSSheng").change(function () {
var sheng = $("#PBSSheng").val();
@@ -187,7 +192,7 @@
global: false,
data: "",
success: function (data) {
-
+
var city = $("#PBSCity");
city.find('option').remove();
var aaa = '<option value="" hassubinfo="true"> </option>';
@@ -211,7 +216,8 @@
} else {
setTimeout(send, 1000);
- } }
+ }
+ }
send();
@@ -222,7 +228,7 @@
var msg = $("#PBSCity");
-
+
if (msg.length > 0) {
$("#PBSCity").change(function () {
@@ -234,7 +240,7 @@
global: false,
data: "",
success: function (data) {
-
+
var quxian = $("#PBSAreaId");
quxian.find('option').remove();
var aaa = '<option value="" hassubinfo="true"> </option>';
@@ -265,7 +271,18 @@
sendCity();
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+ var _afterLoadDataload = function (xhr) {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+
+ }
+ };
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/DailyManagement/HoldPhone.cshtml b/zhengcaioa/zhengcaioa/Views/DailyManagement/HoldPhone.cshtml
index 1178fec..7bcc177 100644
--- a/zhengcaioa/zhengcaioa/Views/DailyManagement/HoldPhone.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/DailyManagement/HoldPhone.cshtml
@@ -1,19 +1,27 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "HoldPhone";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
+
+ string Creater = ViewData["Creater"] as string;
+
}
@section headerStyle{
<script type="text/javascript">
var LineType = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.LineType))';
var Intention = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.Intention))';
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
{
- label: '鏉ョ數鏃堕棿', name: 'InTime', labtype: 'txt', width: 80, hidden: false,
- formatter: function (cellvalue, options, rowObject) {
- return '<a href="javascript: void (0)" onclick="edit(\'' + rowObject.Id + '\');">' + new Date(cellvalue).Format("yyyy-MM-dd hh:mm") + '</a>';
- }
+ label: '鏉ョ數鏃堕棿', name: 'InTime', labtype: 'txt', width: 80, hidden: false
+ //,
+ //formatter: function (cellvalue, options, rowObject) {
+ // return '<a href="javascript: void (0)" onclick="edit(\'' + rowObject.Id + '\');">' + new Date(cellvalue).Format("yyyy-MM-dd hh:mm") + '</a>';
+ //}
},
{
label: '鐢佃瘽绫诲瀷', name: 'LineType', labtype: 'txt', width: 50, hidden: false,
@@ -51,10 +59,10 @@
{
label: '鎿嶄綔', name: 'RecStatus', align: "center", align: "center", sortable: false, width: 100, labtype: 'txt',
formatter: function (cellvalue, options, rowObject) {
- return '<a href="javascript:void(0)" onclick="edit(\'' + rowObject.Id + '\');"> <span style="background: #ECF3FF;"> 淇敼 </span> </a > '
- + ' <a href="javascript:void(0)" onclick="del(\'' + rowObject.Id + '\');"> <span style="background: #ECF3FF;"> 鍒犻櫎 </span></a>'
+ return '<a href="javascript:void(0)" class="Update" style="display:none;" onclick="edit(\'' + rowObject.Id + '\');"> <span style="background: #ECF3FF;"> 淇敼 </span> </a > '
+ + ' <a href="javascript:void(0)" class="Delete" style="display:none;" onclick="del(\'' + rowObject.Id + '\');"> <span style="background: #ECF3FF;"> 鍒犻櫎 </span></a>'
}
- },
+ },
{ label: '鐘舵��', name: 'RecStatus', labtype: 'txt', hidden: true },
{ label: '鍒涘缓浜�', name: 'Creater', labtype: 'txt', hidden: true },
@@ -63,7 +71,7 @@
{ label: '淇敼鏃堕棿', name: 'Modifytime', labtype: 'txt', hidden: true }
];
- dataUrl = "/DailyManagement/GetList";
+ dataUrl = "/DailyManagement/GetList"+"@(string.IsNullOrEmpty(Creater)?"":"?Creater="+ Creater)";
searchCol = [
{ label: '鏉ョ數鏃堕棿', name: 'Createtime', labtype: 'datearea', hidden: false },
{ label: '鐢佃瘽绫诲瀷', name: 'LineType', labtype: 'combox', hidden: false, data: JSON.parse(LineType) },
@@ -94,7 +102,7 @@
async: false,
data: $('form').serializeArray(),
success: function (data) {
-
+
if (data.Result) {
parent.layer.msg('鍒犻櫎鎴愬姛', { icon: 6 });
@@ -131,7 +139,18 @@
}
}
+ var _afterLoadDataload = function (xhr) {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+
+ }
+
+ };
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/DailyManagement/MemoWorkAnPai.cshtml b/zhengcaioa/zhengcaioa/Views/DailyManagement/MemoWorkAnPai.cshtml
index 0dbb192..8bfb523 100644
--- a/zhengcaioa/zhengcaioa/Views/DailyManagement/MemoWorkAnPai.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/DailyManagement/MemoWorkAnPai.cshtml
@@ -1,6 +1,9 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "MemoBook";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@{PltUser user = (PltUser)ViewData["curentuser"];}
@section headerStyle{
@@ -19,7 +22,7 @@
},
{ label: '宸ヤ綔鍐呭', name: 'Context', labtype: 'txt', width: 300, hidden: false },
{
- label: '瑕佹眰瀹屾垚鏃堕棿', name: 'TimeName', labtype: 'txt', width: 100, hidden: false
+ label: '瑕佹眰瀹屾垚鏃堕棿', name: 'TimeName', labtype: 'txt', width: 100, hidden: false
},
{ label: '鍔炵悊鎯呭喌', name: 'BanLi', labtype: 'txt', width: 300, hidden: false },
{ label: '瀹屾垚鏃堕棿', name: 'WanchengTimeName', labtype: 'txt', width: 100, hidden: false },
@@ -27,7 +30,7 @@
label: '宸ヤ綔鑰冩牳', name: 'KaoHe', labtype: 'txt', width: 100, hidden: false,
formatter: function (cellvalue, options, rowObject) {
if (cellvalue == null || cellvalue == "" ) {
- return '<a href="javascript: void (0)" onclick="kaohe(\'' + rowObject.Rtype + '\',\'' + rowObject.Id + '\');">鑰冩牳</a>';
+ return '<a href="javascript: void (0)" class="Kaohe" style="display:none;" onclick="kaohe(\'' + rowObject.Rtype + '\',\'' + rowObject.Id + '\');">鑰冩牳</a>';
} else {
return rowObject.KaoHeName;
}
@@ -57,8 +60,8 @@
{
label: '鎿嶄綔', name: 'RecStatus', align: "center", align: "center", sortable: false, width: 100, labtype: 'txt',
formatter: function (cellvalue, options, rowObject) {
- return '<a href="javascript:void(0)" onclick="edit(\'' + rowObject.Rtype + '\',\'' + rowObject.Id + '\');"> <span style="background: #ECF3FF;"> 淇敼 </span> </a > '
- + ' <a href="javascript:void(0)" onclick="del(\'' + rowObject.Id + '\');"> <span style="background: #ECF3FF;"> 鍒犻櫎 </span></a>'
+ return '<a href="javascript:void(0)" class="Update" style="display:none;" onclick="edit(\'' + rowObject.Rtype + '\',\'' + rowObject.Id + '\');"> <span style="background: #ECF3FF;"> 淇敼 </span> </a > '
+ + ' <a href="javascript:void(0)" class="Delete" style="display:none;" onclick="del(\'' + rowObject.Id + '\');"> <span style="background: #ECF3FF;"> 鍒犻櫎 </span></a>'
}
},
@@ -106,7 +109,7 @@
}
OpenWindow(caption, "500px", "600px", "/DailyManagement/EditWorkKaoHe/?id=" + id);
- }
+ }
function del(id) {
$.ajax({
@@ -210,10 +213,10 @@
-
-
+
+
function sendZhiwustatus() {
@@ -232,5 +235,20 @@
sendZhiwustatus();
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+ var _afterLoadDataload = function (xhr) {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+
+ }
+
+
+ };
</script>
}
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml
index 3537a18..b8f3117 100644
--- a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Edit.cshtml
@@ -32,6 +32,8 @@
tijiaobingshenhe = tijiaobingshenhesto.PageName;
}
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
+
}
@{
Layout = null;
@@ -491,7 +493,7 @@
<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;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
@@ -1251,6 +1253,14 @@
//}
}
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml
index 7148016..a51b574 100644
--- a/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ExpertTestTopic/Index.cshtml
@@ -1,6 +1,9 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "ExpertTestTopic";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@section headerStyle{
<script type="text/javascript">
@@ -34,7 +37,7 @@
{
label: '鎿嶄綔', name: 'caozuo', labtype: 'txt', hidden: false, width: 50,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('淇敼','98%','100%', '/ExpertTestTopic/Edit?id=" + rowObject.Id + "')\" >淇敼</a> <a onclick=\"_pagedel('" + rowObject.Id + "')\" >鍒犻櫎</a>";
+ return "<a onclick=\"OpenWindow('淇敼瀹℃牳','98%','100%', '/ExpertTestTopic/Edit?id=" + rowObject.Id + "')\" >淇敼瀹℃牳</a> <a class=\"Delete\" style=\"display: none;\" onclick=\"_pagedel('" + rowObject.Id + "')\" >鍒犻櫎</a>";
}
},
//{
@@ -201,6 +204,21 @@
}
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+ var _afterLoadDataload = function (xhr) {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+
+ }
+
+
+ };
+
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/FiAccount/Index.cshtml b/zhengcaioa/zhengcaioa/Views/FiAccount/Index.cshtml
index c792538..b3bbb7e 100644
--- a/zhengcaioa/zhengcaioa/Views/FiAccount/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/FiAccount/Index.cshtml
@@ -1,6 +1,9 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "FiAccount";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@section headerStyle{
<script type="text/javascript">
@@ -24,7 +27,7 @@
{
label: '娴佹按璐�', name: 'Remark', labtype: 'txt', hidden: false,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('" + rowObject.Accountname + "','98%','100%', '/FiAccount/Liushuizhang?id=" + rowObject.Id + "')\" >娴佹按璐�</a>";
+ return "<a class=\"Liushuizhang\" style=\"display: none;\" onclick=\"OpenWindow('" + rowObject.Accountname + "','98%','100%', '/FiAccount/Liushuizhang?id=" + rowObject.Id + "')\" >娴佹按璐�</a>";
}
},
@@ -48,7 +51,7 @@
var _pageAdd = function () {
OpenWindow("鏂板璐︽埛", "98%", "90%", "/FiAccount/Edit/");
}
-
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
var _afterLoadDataload = function (xhr) {
@@ -61,7 +64,14 @@
jQuery("#jqGrid").jqGrid("footerData", "set", { QiyongStatusName: "<font color='darkgoldenrod'>--褰撻〉鍚堣--</font> </br> <font color='darkgoldenrod'>--鍚堣--</font>", AllIncome: "<font color='darkgoldenrod'>" + xhr.DangyeHeji1 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji1 + "</font>", AllExpenses: "<font color='darkgoldenrod'>" + xhr.DangyeHeji2 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji2 + "</font>", Balance: "<font color='darkgoldenrod'>" + xhr.DangyeHeji3 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji3 + "</font>" });
-
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+
+ }
};
@@ -82,7 +92,11 @@
toastr.error("鍒犻櫎鎴愬姛");
/**/
}
-}
+ }
+
+
+
+
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Index.cshtml b/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Index.cshtml
index 7c90620..9786f2f 100644
--- a/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/Index.cshtml
@@ -1,13 +1,16 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "FiOrderrecievemoney";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@section headerStyle{
<script type="text/javascript">
var OrderType = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.OrderType))';
var Fkzt = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.Fkzt))';
-
+
loseherght = 30;
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
@@ -29,17 +32,17 @@
label: '鎿嶄綔', name: 'Caozuo', labtype: 'txt', hidden: false, width: 50,
formatter: function (cellvalue, options, rowObject) {
if (rowObject.WeishouMoney > 0) {
- return "<a onclick=\"OpenWindow('" + rowObject.OrderNo + "','98%','100%', '/FiOrderrecievemoney/Edit?OrderId=" + rowObject.Id + "')\" > 璁㈠崟鏀舵</a>";
+ return "<a class=\"Shoukuan\" style=\"display: none;\" onclick=\"OpenWindow('" + rowObject.OrderNo + "','98%','100%', '/FiOrderrecievemoney/Edit?OrderId=" + rowObject.Id + "')\" > 璁㈠崟鏀舵</a>";
} else {
return "宸蹭粯娆�";
}
-
+
}
},
-
+
];
dataUrl = "/FiOrderrecievemoney/GetList";
searchCol = [
@@ -56,8 +59,8 @@
];
-
-
+
+
var _afterSave = function (result) {
@@ -76,7 +79,23 @@
toastr.error("鍒犻櫎鎴愬姛");
/**/
}
-}
+ }
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+ var _afterLoadDataload = function (xhr) {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+
+ }
+
+
+ };
+
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/IndexCustomer.cshtml b/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/IndexCustomer.cshtml
index 7d75c5b..c657e8a 100644
--- a/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/IndexCustomer.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/FiOrderrecievemoney/IndexCustomer.cshtml
@@ -1,6 +1,9 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "CooperatecustomCustomer";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@section headerStyle{
<script type="text/javascript">
@@ -19,7 +22,7 @@
{ label: '寤烘。鏃堕棿', name: 'CreatetimeName', labtype: 'txt', hidden: false, width: 100 },
{
label: '瀹㈡埛鍗曚綅', name: 'Name', labtype: 'txt', hidden: false, width: 400,
-
+
},
{ label: '鑱旂郴鐢佃瘽', name: 'Tel', labtype: 'txt', hidden: false, width: 100 },
{ label: '鎵�灞炲尯鍩�', name: 'ShengName', labtype: 'txt', hidden: false, width: 100 },
@@ -32,16 +35,16 @@
{
label: '瀛樻', name: 'Name111', labtype: 'txt', hidden: false, width: 100,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('瀛樻','100%','100%', '/FiOrderrecievemoney/EditCustomer?id=&CustomerId=" + rowObject.Id + "')\" >瀛樻</a>";
+ return "<a class=\"Cunkuan\" style=\"display: none; \" onclick=\"OpenWindow('瀛樻','100%','100%', '/FiOrderrecievemoney/EditCustomer?id=&CustomerId=" + rowObject.Id + "')\" >瀛樻</a>";
}
},
{
label: '瀛樻鏄庣粏', name: 'Name111111', labtype: 'txt', hidden: false, width: 100,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('" + rowObject.Name+"瀛樻鏄庣粏','100%','100%', '/FiOrderrecievemoney/IndexCustomerdtl?id=&CustomerId=" + rowObject.Id + "')\" >瀛樻鏄庣粏</a>";
+ return "<a class=\"Cunkuan\" style=\"display: none; \" onclick=\"OpenWindow('" + rowObject.Name+"瀛樻鏄庣粏','100%','100%', '/FiOrderrecievemoney/IndexCustomerdtl?id=&CustomerId=" + rowObject.Id + "')\" >瀛樻鏄庣粏</a>";
}
},
-
+
];
dataUrl = "/CooperatecustomCustomer/GetList";
searchCol = [
@@ -59,9 +62,9 @@
{ label: '鏄惁鍔犲井淇�', name: 'Shifouweixin', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
];
-
-
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
var _afterLoadDataload = function (xhr) {
//console.info(xhr);
//var rows = jQuery("#jqGrid").jqGrid("getRowData"), total_Xuefei = 0, total_Baomingrenshu = 0;
@@ -73,12 +76,19 @@
jQuery("#jqGrid").jqGrid("footerData", "set", { YwjlName: "<font color='darkgoldenrod'>--褰撻〉鍚堣--</font> </br> <font color='darkgoldenrod'>--鍚堣--</font>", YufukuanName: "<font color='darkgoldenrod'>" + xhr.DangyeHeji1 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji1 + "</font>", ShouxineduName: "<font color='darkgoldenrod'>" + xhr.DangyeHeji2 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji2 + "</font>", ShenyushouxinName: "<font color='darkgoldenrod'>" + xhr.DangyeHeji3 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji3 + "</font>", Moneycount: "<font color='darkgoldenrod'>" + xhr.DangyeHeji4 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji4 + "</font>"});
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+ }
};
-
-
-
+
+
+
var _afterSave = function (result) {
@@ -143,7 +153,8 @@
} else {
setTimeout(send, 1000);
- } }
+ }
+ }
send();
diff --git a/zhengcaioa/zhengcaioa/Views/FiPiecerate/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/FiPiecerate/Edit.cshtml
index de481ee..991984e 100644
--- a/zhengcaioa/zhengcaioa/Views/FiPiecerate/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/FiPiecerate/Edit.cshtml
@@ -3,13 +3,13 @@
@using zhengcaioa.Models;
@{
-//List<SysCodeDtl> Pieceratetype = ViewData["Pieceratetype"] as List<SysCodeDtl>; //琛屼笟鍒嗙被
+ //List<SysCodeDtl> Pieceratetype = ViewData["Pieceratetype"] as List<SysCodeDtl>; //琛屼笟鍒嗙被
-List<SysCodeDtl> Standard = ViewData["Standard"] as List<SysCodeDtl>; //鎻愭垚鏍囧噯
+ List<SysCodeDtl> Standard = ViewData["Standard"] as List<SysCodeDtl>; //鎻愭垚鏍囧噯
-
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@@ -235,11 +235,11 @@
<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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -335,12 +335,12 @@
// toastr.warning("椤圭洰浠锋牸涓嶈兘涓虹┖");
// return;
//}
-
+
//if ($.trim($("#Percent").val()) == '') {
// toastr.warning("鎻愭垚棰濆害涓嶈兘涓虹┖");
// return;
//}
-
+
//var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" }
$.ajax({
type: "POST",
@@ -349,7 +349,7 @@
global: false,
data: $('form').serializeArray(),
success: function (data) {
-
+
if (data.Result) {
@@ -391,6 +391,17 @@
parent.layer.close(index);
return false;
}
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/GroupGroup/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/GroupGroup/Edit.cshtml
index 489031d..e963a24 100644
--- a/zhengcaioa/zhengcaioa/Views/GroupGroup/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/GroupGroup/Edit.cshtml
@@ -10,7 +10,7 @@
List<HrDeptDTO> DeptId = ViewData["DeptId"] as List<HrDeptDTO>; //閮ㄩ棬
-
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
//string[] arrJobLevel = (Model.Zhuanjia ?? "").Split(',');
@@ -284,11 +284,11 @@
<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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -386,7 +386,7 @@
return;
}
-
+
//var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" }
$.ajax({
type: "POST",
@@ -395,7 +395,7 @@
global: false,
data: $('form').serializeArray(),
success: function (data) {
-
+
if (data.Result) {
@@ -436,7 +436,7 @@
global: false,
data: "",
success: function (data) {
-
+
var quxian = $("#Ywjl");
var userid = '@Model.Ywjl';
quxian.find('option').remove();
@@ -474,6 +474,18 @@
parent.layer.close(index);
return false;
}
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/GroupGroup/Index.cshtml b/zhengcaioa/zhengcaioa/Views/GroupGroup/Index.cshtml
index 188936c..e618f76 100644
--- a/zhengcaioa/zhengcaioa/Views/GroupGroup/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/GroupGroup/Index.cshtml
@@ -1,6 +1,9 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "GroupGroup";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@section headerStyle{
<script type="text/javascript">
@@ -10,7 +13,7 @@
var grouptypes = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.grouptype))';
-
+
loseherght = 60;
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
@@ -21,7 +24,7 @@
return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/GroupGroup/Edit?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
}
},
-
+
{ label: '缇や富濮撳悕', name: 'Qunzhuname', labtype: 'txt', hidden: false, width: 100 },
{ label: '缇ょ粍绫诲瀷', name: 'GrouptypeName', labtype: 'txt', hidden: false, width: 100 },
{ label: '琛屼笟绫诲埆', name: 'HylbName', labtype: 'txt', hidden: false, width: 100 },
@@ -32,7 +35,7 @@
{
label: '鎺ㄥ箍璁板綍', name: 'Remark', labtype: 'txt', hidden: false, width: 100,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('鎺ㄥ箍','40%','50%', '/GroupTuiguang/Edit?GroupId=" + rowObject.Id + "')\" >鎺ㄥ箍</a> <a onclick=\"OpenWindow('鎺ㄥ箍璁板綍','98%','90%', '/GroupTuiguang/Index?GroupId=" + rowObject.Id + "')\" >璁板綍</a>";
+ return "<a class=\"Tuiguangjilu\" style=\"display: none;\" onclick=\"OpenWindow('鎺ㄥ箍','40%','50%', '/GroupTuiguang/Edit?GroupId=" + rowObject.Id + "')\" >鎺ㄥ箍</a> <a class=\"Tuiguangjilu\" style=\"display: none;\" onclick=\"OpenWindow('鎺ㄥ箍璁板綍','98%','90%', '/GroupTuiguang/Index?GroupId=" + rowObject.Id + "')\" >璁板綍</a>";
}
},
@@ -76,14 +79,27 @@
toastr.error("鍒犻櫎鎴愬姛");
/**/
}
-}
+ }
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+ var _afterLoadDataload = function (xhr) {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+
+ }
+
+
+ };
</script>
}
@section footerScripts{
<script type="text/javascript">
-
+
diff --git a/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml
index bb99e4a..f2963bf 100644
--- a/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml
@@ -8,6 +8,7 @@
List<HrPositionDTO> PostId = ViewData["post"] as List<HrPositionDTO>; //鐗╁搧绫诲瀷
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@{
Layout = null;
@@ -250,11 +251,11 @@
<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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -447,6 +448,15 @@
parent.layer.close(index);
return false;
}
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/HrJixiaoticheng/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/HrJixiaoticheng/Edit.cshtml
index 614df19..6734672 100644
--- a/zhengcaioa/zhengcaioa/Views/HrJixiaoticheng/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/HrJixiaoticheng/Edit.cshtml
@@ -12,6 +12,7 @@
List<FiPiecerateDTO> Project = ViewData["Project"] as List<FiPiecerateDTO>; //鐗╁搧绫诲瀷
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@{
Layout = null;
@@ -271,11 +272,11 @@
<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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -324,7 +325,7 @@
$("#PostId").chosen();
$("#PiecerateId").chosen();
-
+
laydate({ elem: "#Effecttime", format: 'YYYY-MM-DD', istime: true, event: "focus" });
@@ -401,7 +402,7 @@
return;
}
-
+
if ($.trim($("#Effecttime").val()) == '') {
toastr.warning("鐢熸晥鏃ユ湡涓嶈兘涓虹┖");
return;
@@ -462,6 +463,17 @@
parent.layer.close(index);
return false;
}
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Edit.cshtml
index 42e9b49..d5ac17c 100644
--- a/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Edit.cshtml
@@ -12,7 +12,7 @@
List<SysCodeDtl> hyfl = ViewData["hyfl"] as List<SysCodeDtl>; //琛屼笟鍒嗙被
List<HrDeptDTO> DeptId = ViewData["DeptId"] as List<HrDeptDTO>; //閮ㄩ棬
-
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
//string[] arrJobLevel = (Model.Zhuanjia ?? "").Split(',');
@@ -456,11 +456,11 @@
<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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -567,7 +567,7 @@
return;
}
-
+
//var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" }
$.ajax({
type: "POST",
@@ -576,7 +576,7 @@
global: false,
data: $('form').serializeArray(),
success: function (data) {
-
+
if (data.Result) {
@@ -618,7 +618,7 @@
global: false,
data: "",
success: function (data) {
-
+
var city = $("#City");
city.find('option').remove();
var aaa = '<option value="" hassubinfo="true">璇烽�夋嫨</option>';
@@ -650,7 +650,7 @@
global: false,
data: "",
success: function (data) {
-
+
var quxian = $("#AreaId");
quxian.find('option').remove();
var aaa = '<option value="" hassubinfo="true">璇烽�夋嫨</option>';
@@ -701,7 +701,7 @@
global: false,
data: "",
success: function (data) {
-
+
var quxian = $("#Ywjl");
var userid = '@Model.Ywjl';
quxian.find('option').remove();
@@ -746,6 +746,18 @@
parent.layer.close(index);
return false;
}
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml b/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml
index 13788e4..70b8f99 100644
--- a/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml
@@ -1,6 +1,11 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "IntentionCustomer";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
+
+ string Creater11 = ViewData["Creater11"] as string;
}
@section headerStyle{
<script type="text/javascript">
@@ -32,12 +37,12 @@
{
label: '瀹㈡埛璁块棶', name: 'Name111', labtype: 'txt', hidden: false, width: 100,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('鏂板鎰忓悜瀹㈡埛鎷滆','98%','100%', '/IntentionVisit/Edit?id=&Viscustomer=" + rowObject.Id + "')\" >瀹㈡埛璁块棶</a>";
+ return "<a class='Fangwen' style='display: none;' onclick=\"OpenWindow('鏂板鎰忓悜瀹㈡埛鎷滆','98%','100%', '/IntentionVisit/Edit?id=&Viscustomer=" + rowObject.Id + "')\" >瀹㈡埛璁块棶</a>";
}
},
];
- dataUrl = "/IntentionCustomer/GetList";
+ dataUrl = "/IntentionCustomer/GetList"+"@(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%' },
@@ -74,7 +79,7 @@
var Creater = $("#PBSCreater").val();
var Shifouweixin = $("#PBSShifouweixin").val();
-
+
var url = "/IntentionCustomer/print?Khly=" + Khly + "&Hyfl=" + Hyfl + "&Khlx=" + Khlx + "&Ywjl=" + Ywjl + "&Sheng=" + Sheng + "&City=" + City + "&AreaId=" + AreaId + "&Name=" + Name + "&Createtime=" + Createtime
@@ -221,9 +226,9 @@
-
-
+
+
}
@@ -245,7 +250,20 @@
toastr.error("鍒犻櫎澶辫触");
/**/
}
-}
+ }
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+ var _afterLoadDataload = function (xhr) {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+
+ }
+
+
+ };
</script>
}
@@ -256,7 +274,7 @@
var msg = $("#PBSSheng");
-
+
if (msg.length > 0) {
$("#PBSSheng").change(function () {
var sheng = $("#PBSSheng").val();
@@ -267,7 +285,7 @@
global: false,
data: "",
success: function (data) {
-
+
var city = $("#PBSCity");
city.find('option').remove();
var aaa = '<option value="" hassubinfo="true"> </option>';
@@ -291,7 +309,8 @@
} else {
setTimeout(send, 1000);
- } }
+ }
+ }
send();
@@ -302,7 +321,7 @@
var msg = $("#PBSCity");
-
+
if (msg.length > 0) {
$("#PBSCity").change(function () {
@@ -314,7 +333,7 @@
global: false,
data: "",
success: function (data) {
-
+
var quxian = $("#PBSAreaId");
quxian.find('option').remove();
var aaa = '<option value="" hassubinfo="true"> </option>';
diff --git a/zhengcaioa/zhengcaioa/Views/IntentionCustomer/IndexYiXiang.cshtml b/zhengcaioa/zhengcaioa/Views/IntentionCustomer/IndexYiXiang.cshtml
index 8a85204..842467c 100644
--- a/zhengcaioa/zhengcaioa/Views/IntentionCustomer/IndexYiXiang.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/IntentionCustomer/IndexYiXiang.cshtml
@@ -1,16 +1,19 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "IntentionCustomer";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
string ywjlId = ViewBag.ywjlId as string;
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@section headerStyle{
<script type="text/javascript">
var ywjls = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ywjl))';
var khlys = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.khly))';
var Dianxiaozhuanyuans = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.Dianxiaozhuanyuan))';
-
-
+
+
loseherght = 60;
gridConfig = { multiselect: true, selectcol: "Id" };
dataCol = [
@@ -27,12 +30,12 @@
{ label: '鎵垮姙浜�', name: 'YwjlName', labtype: 'txt', hidden: false, width: 100 },
{ label: '鏈�杩戣窡韪椂闂�', name: 'ZuijinzhuizongtimeName', labtype: 'txt', hidden: false, width: 100 },
-
-
+
+
{
label: '璺熻釜璁板綍', name: 'Name111', labtype: 'txt', hidden: false, width: 100,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('璺熻釜璁板綍','98%','100%', '/IntentionVisit/Index?IsYwjl=true&Viscustomer=" + rowObject.Id + "')\" >璺熻釜璁板綍</a>";
+ return "<a class='Gengzong' style='display: none;' onclick=\"OpenWindow('璺熻釜璁板綍','98%','100%', '/IntentionVisit/Index?IsYwjl=true&Viscustomer=" + rowObject.Id + "')\" >璺熻釜璁板綍</a>";
}
},
@@ -44,7 +47,7 @@
{ label: '鐢甸攢涓撳憳', name: 'Dianxiaozhuanyuan', labtype: 'combox', hidden: false, data: JSON.parse(Dianxiaozhuanyuans)/*, cwidth: '5%', cccwidth: '8%' */},
{ label: '瀹㈡埛鍗曚綅', name: 'Name', labtype: 'txt', hidden: false },
{ label: '鎵垮姙浜�', name: 'Ywjl', labtype: 'combox', hidden: false, data: JSON.parse(ywjls) },
-
+
@@ -138,7 +141,7 @@
-
+
}
@@ -162,14 +165,27 @@
toastr.error("鍒犻櫎澶辫触");
/**/
}
-}
+ }
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+ var _afterLoadDataload = function (xhr) {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+
+ }
+
+
+ };
</script>
}
@section footerScripts{
<script type="text/javascript">
-
+
diff --git a/zhengcaioa/zhengcaioa/Views/IntentionVisit/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/IntentionVisit/Edit.cshtml
index 4101485..2619500 100644
--- a/zhengcaioa/zhengcaioa/Views/IntentionVisit/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/IntentionVisit/Edit.cshtml
@@ -17,6 +17,7 @@
List<IntentionVisitDTO> visitlishi = ViewData["visitlishi"] as List<IntentionVisitDTO>; //鎰忓悜瀹㈡埛
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@{
Layout = null;
@@ -404,11 +405,11 @@
<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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -519,7 +520,7 @@
// toastr.warning("鑱屽姟涓嶈兘涓虹┖");
// return;
//};
-
+
//if ($("#Jdr").val() == '') {
// toastr.warning("鎺ュ緟浜轰笉鑳戒负绌�");
// return;
@@ -545,7 +546,7 @@
return;
}
-
+
//var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" }
$.ajax({
type: "POST",
@@ -554,7 +555,7 @@
global: false,
data: $('form').serializeArray(),
success: function (data) {
-
+
if (data.Result) {
@@ -586,8 +587,8 @@
}
-
-
+
+
$("#Duanxin").change(function () {
var sheng = $("#Duanxin").val();
$.ajax({
@@ -623,6 +624,18 @@
parent.layer.close(index);
return false;
}
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/Liaotian/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/Liaotian/Edit.cshtml
index dd4cfc8..136207f 100644
--- a/zhengcaioa/zhengcaioa/Views/Liaotian/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Liaotian/Edit.cshtml
@@ -1,4 +1,5 @@
锘緻model DTO.LiaotianDTO
+@using DTO;
@{
Layout = null;
List<SysCodeDtl> problemtype = ViewData["problemtype"] as List<SysCodeDtl>; //闂绫诲瀷
@@ -17,7 +18,7 @@
{
tijiaobingshenhe = tijiaobingshenhesto.PageName;
}
-
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
<!DOCTYPE html>
@@ -176,21 +177,21 @@
</div>
@*<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">
- @if ("A" == Model.ShouCangStatus)
- {
- <input type="checkbox" class="form-control" id="ShouCangStatusName" checked="checked" name="ShouCangStatusName" value="A" />
- }
- else
- {
- <input type="checkbox" class="form-control" id="ShouCangStatusName" name="ShouCangStatusName" value="A" />
- }
- <input type="hidden" id="ShouCangStatus" name="ShouCangStatus" value="" />
+ 鏀惰棌
+ </label>
+ <div class="col-sm-2 col-md-2" grouptype="Vdata">
+ @if ("A" == Model.ShouCangStatus)
+ {
+ <input type="checkbox" class="form-control" id="ShouCangStatusName" checked="checked" name="ShouCangStatusName" value="A" />
+ }
+ else
+ {
+ <input type="checkbox" class="form-control" id="ShouCangStatusName" name="ShouCangStatusName" value="A" />
+ }
+ <input type="hidden" id="ShouCangStatus" name="ShouCangStatus" value="" />
- </div>*@
-
+ </div>*@
+
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label class="text-right col-sm-1 col-md-1 control-label">闂<i class="red">*</i></label>
@@ -200,18 +201,18 @@
</div>
-
+
</div>
<div class="clearfix layer-area" style="padding-bottom:15px;">
<label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">绛旀<i class="red">*</i></label>
<div class="col-sm-11 col-md-11">
- <textarea class="form-control bt" id="Anwser" name="Anwser" title="绛旀" isempty="" maxlength="4000" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'" >@Model.Anwser</textarea>
+ <textarea class="form-control bt" id="Anwser" name="Anwser" title="绛旀" isempty="" maxlength="4000" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@Model.Anwser</textarea>
</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-11 col-md-11"> <textarea class="form-control bt" id="Shiyongfatiao" name="Shiyongfatiao" title="绛旀" isempty="" maxlength="450" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@Model.Shiyongfatiao</textarea> </div>
+ <div class="col-sm-11 col-md-11"> <textarea class="form-control bt" id="Shiyongfatiao" name="Shiyongfatiao" title="绛旀" isempty="" maxlength="450" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'">@Model.Shiyongfatiao</textarea> </div>
</div>
</div>
@@ -228,10 +229,10 @@
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦骞跺鏍�</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
@@ -294,7 +295,7 @@
};
-
+
var delPosition = function () {
if (id == null || id=='') {
@@ -395,15 +396,15 @@
toastr.warning("绛旀涓嶈兘涓虹┖");
return;
}
-
+
if ($("#ChushuStatusName").is(':checked')) {
$("#ChushuStatus").val("A");
} else {
$("#ChushuStatus").val("D");
}
-
-
+
+
imgLoad = parent.layer.load(2, { shade: [0.2, '#fff'] });
$.ajax({
@@ -461,13 +462,13 @@
toastr.warning("绛旀涓嶈兘涓虹┖");
return;
}
-
+
if ($("#ChushuStatusName").is(':checked')) {
$("#ChushuStatus").val("A");
} else {
$("#ChushuStatus").val("D");
}
-
+
imgLoad = parent.layer.load(2, { shade: [0.2, '#fff'] });
$.ajax({
@@ -504,8 +505,8 @@
});
}
-
-
+
+
$("#ShouCangStatusName").change(function () {
if ($("#ShouCangStatusName").is(':checked')) {
@@ -514,7 +515,7 @@
$("#ShouCangStatus").val("D");
}
-
+
$.ajax({
type: "POST",
url: "/Liaotian/ShouCang",
@@ -526,10 +527,10 @@
if (data.Result) {
// parent._afterSave(true);
parent.layer.msg('鎿嶄綔鎴愬姛', { icon: 6 });
-
+
}
else {
-
+
parent.layer.msg(data.Message, { icon: 5 });
}
},
@@ -552,7 +553,7 @@
global: false,
data: "",
success: function (data) {
-
+
var quxian = $("#Problemtype");
quxian.find('option').remove();
var aaa = '<option value="" hassubinfo="true">璇烽�夋嫨</option>';
@@ -563,7 +564,7 @@
if (i == 0) {
o = '<option value="' + data[i].CodeSn + '" hassubinfo="true" selected="selected" >' + data[i].Comments + '</option>';
}
-
+
quxian.append(o);
}
}
@@ -578,8 +579,8 @@
if (id == null || id == '') {
- $('#Questiontype option:eq(1)').attr('selected', 'selected');
- $('#Questiontype').trigger('change');
+ $('#Questiontype option:eq(1)').attr('selected', 'selected');
+ $('#Questiontype').trigger('change');
}
function _pageAutoClose() {
@@ -589,7 +590,18 @@
parent.layer.closeAll('loading');
parent.layer.close(index);
return false;
- }
+ }
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/OrderBanci/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/OrderBanci/Edit.cshtml
index d1cb762..f003ea8 100644
--- a/zhengcaioa/zhengcaioa/Views/OrderBanci/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/OrderBanci/Edit.cshtml
@@ -3,8 +3,8 @@
@using zhengcaioa.Models;
@{
-
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@{
@@ -192,11 +192,11 @@
<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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -305,7 +305,7 @@
toastr.warning("鍦扮偣涓嶈兘涓虹┖");
return;
}
-
+
@@ -364,6 +364,17 @@
parent.layer.close(index);
return false;
}
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/OrderBanci/Index.cshtml b/zhengcaioa/zhengcaioa/Views/OrderBanci/Index.cshtml
index 3a5730a..15a0877 100644
--- a/zhengcaioa/zhengcaioa/Views/OrderBanci/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/OrderBanci/Index.cshtml
@@ -1,10 +1,13 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "OrderBanci";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@section headerStyle{
<script type="text/javascript">
-
+
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
@@ -22,10 +25,10 @@
{
label: '璇剧▼浠锋牸', name: 'Creater', labtype: 'txt', hidden: false, width: 100,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('" + rowObject.Banci.replace(/'/g, '') + "','98%','100%', '/OrderBanci/IndexDtl?OrderBanciId=" + rowObject.Id + "')\" >璇剧▼浠锋牸</a>";
+ return "<a class='Jiage' style='display: none;' onclick=\"OpenWindow('" + rowObject.Banci.replace(/'/g, '') + "','98%','100%', '/OrderBanci/IndexDtl?OrderBanciId=" + rowObject.Id + "')\" >璇剧▼浠锋牸</a>";
}
},
-
+
];
dataUrl = "/OrderBanci/GetList";
@@ -62,9 +65,23 @@
} else {
/**/
toastr.error("鍒犻櫎鎴愬姛");
- /**/
- }
-}
+ /**/
+ }
+ }
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+ var _afterLoadDataload = function (xhr) {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+
+ }
+
+
+ };
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Indexzhuanjia.cshtml b/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Indexzhuanjia.cshtml
index 6984fff..013094b 100644
--- a/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Indexzhuanjia.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/OrderBanciOrder/Indexzhuanjia.cshtml
@@ -1,6 +1,9 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "OrderBanciOrder";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@section headerStyle{
<script type="text/javascript">
@@ -32,7 +35,7 @@
label: '鎵撳嵃鍚堝悓', name: 'dayin', labtype: 'txt', hidden: false, width: 70
,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('鎵撳嵃鍚堝悓','100%','100%', '/OrderBanciOrder/Printhetong?id=" + rowObject.Id + "')\" >鎵撳嵃鍚堝悓</a>";
+ return "<a class=\"Dayin\" style=\"display: none;\" onclick=\"OpenWindow('鎵撳嵃鍚堝悓','100%','100%', '/OrderBanciOrder/Printhetong?id=" + rowObject.Id + "')\" >鎵撳嵃鍚堝悓</a>";
}
},
@@ -65,6 +68,8 @@
}
LoadGrid(jsons);
}
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
var _afterLoadDataload = function (xhr) {
//console.info(xhr);
//var rows = jQuery("#jqGrid").jqGrid("getRowData"), total_Xuefei = 0, total_Baomingrenshu = 0;
@@ -75,9 +80,21 @@
jQuery("#jqGrid").jqGrid("footerData", "set", { Shenfenzheng: "<font color='darkgoldenrod'>--褰撻〉鍚堣--</font> </br> <font color='darkgoldenrod'>--鍚堣--</font>", Xuefei: "<font color='darkgoldenrod'>" + xhr.DangyeHeji1 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji1 + "</font>", Baomingrenshu: "<font color='darkgoldenrod'>" + xhr.DangyeHeji2 + "</font></br><font color='darkgoldenrod'>" + xhr.Heji2 + "</font>" });
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+ }
};
+
+
+
+
+
var _afterSave = function (result) {
@@ -152,6 +169,8 @@
});
+
+
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml b/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml
index 91b8c57..5968002 100644
--- a/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Project/Add.cshtml
@@ -8,8 +8,8 @@
List<Area> shi = ViewData["shi"] as List<Area>; //甯�
List<Area> quxian = ViewData["quxian"] as List<Area>; //鍖哄幙
List<SysCodeDtl> flbx = ViewData["flbx"] as List<SysCodeDtl>; //闂绫诲瀷
-
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
List<Projectreason> projectreasons = Model.projectreasons;
@@ -554,11 +554,11 @@
<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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -951,6 +951,18 @@
function _pageAdd(namecus) {
OpenWindow("鏂板鎰忓悜瀹㈡埛", "98%", "90%", "/IntentionCustomer/Edit?namecus=" + namecus);
}
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml b/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
index de02a90..b45e2d4 100644
--- a/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
@@ -1,6 +1,11 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "Liaotian";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
+
+ string Creater11 = ViewData["Creater11"] as string;
}
@section headerStyle{
<script type="text/javascript">
@@ -9,7 +14,7 @@
var Creater = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.Creater))';
var flbx = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.flbx))';
var ShiFouyReasonname = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShiFouyReasonname))';
-
+
loseherght = 110;
dataCol = [
@@ -83,7 +88,7 @@
{ label: '搴熸爣娆℃暟', name: 'Feibiaocishu', labtype: 'txt', hidden: true },
{ label: '涓爣閲戦', name: 'Zhongbiaojine', labtype: 'txt', hidden: true }
];
- dataUrl = "/Project/GetLiaotianList";
+ dataUrl = "/Project/GetLiaotianList"+"@(string.IsNullOrEmpty(Creater11) ?"":"?Creater="+ Creater11)";
searchCol = [
//{ label: '鍏憡鏃堕棿', name: 'StartTimestar', labtype: 'date', hidden: false },
//{ label: '--', name: 'StartTimeend', labtype: 'date', hidden: false, cwidth: '1%', cccwidth: '15%' },
@@ -97,23 +102,23 @@
{ label: '閲囪喘浠ｇ悊浜�', name: 'Caigourenname', labtype: 'txt', hidden: false },
{ label: '閲囪喘浠ｇ悊鏈烘瀯', name: 'Dailiname', labtype: 'txt', hidden: false },
-
+
{ label: '閲囪喘鏂瑰紡', name: 'Cgfs', labtype: 'combox', hidden: false, data: JSON.parse(projectDropDown) },
{ label: '鏄惁搴熸爣', name: 'fblx', labtype: 'combox', hidden: false, data: JSON.parse(flbx)/*, cwidth: '5%', cccwidth: '8%' */ },
{ label: '涓爣渚涘簲鍟�', name: 'Names', labtype: 'txt', hidden: false },
{ label: '鎶曟爣渚涘簲鍟�', name: 'NamesToubiao', labtype: 'txt', hidden: false },
{ label: '鏄惁鏈夋棤鏁堜緵搴斿晢', name: 'ShiFouyReasonname', labtype: 'combox', hidden: false, data: JSON.parse(ShiFouyReasonname), cwidth: '8%', cccwidth: '12%'},
{ label: '鏃犳晥渚涘簲鍟�', name: 'Reasonname', labtype: 'txt', hidden: false },
-
+
{ label: '褰曞叆鏃堕棿', name: 'Createtime', labtype: 'datearea', hidden: false },
{ label: '褰曞叆浜�', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(Creater)/*, cwidth: '5%', cccwidth: '8%'*/ },
-
+
{ label: '鍒嗗樊灏忎簬', name: 'Fencha', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */ },
{ label: '鍒嗗樊澶т簬', name: 'Fenchadayu', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */ },
{ label: '渚涘簲鍟嗘暟閲�', name: 'Shuliang', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */ },
//{ label: '浠峰樊灏忎簬', name: 'Baojiachaxiaoyu', labtype: 'txt', hidden: false/*, cwidth: '8.5%', cccwidth: '15%' */ },
-
+
];
var _pageAdd = function () {
@@ -144,10 +149,10 @@
<script type="text/javascript">
function send() {
-
+
var msg = $("#PBSSheng");
-
-
+
+
if (msg.length > 0) {
$("#PBSSheng").change(function () {
var sheng = $("#PBSSheng").val();
@@ -158,7 +163,7 @@
global: false,
data: "",
success: function (data) {
-
+
var city = $("#PBSCity");
city.find('option').remove();
var aaa = '<option value="" hassubinfo="true"> </option>';
@@ -179,12 +184,13 @@
}
});
});
-
+
} else {
setTimeout(send, 1000);
- } }
+ }
+ }
-
+
send();
@@ -192,11 +198,11 @@
function sendCity() {
var msg = $("#PBSCity");
-
-
+
+
if (msg.length > 0) {
$("#PBSCity").change(function () {
-
+
var city = $("#PBSCity").val();
$.ajax({
type: "GET",
@@ -205,7 +211,7 @@
global: false,
data: "",
success: function (data) {
-
+
var quxian = $("#PBSAreaId");
quxian.find('option').remove();
var aaa = '<option value="" hassubinfo="true"> </option>';
@@ -226,7 +232,7 @@
}
});
});
-
+
} else {
setTimeout(sendCity, 1000);
}
@@ -235,7 +241,7 @@
sendCity();
-
+
$(function () {
$("#PBSAreaId").parent().next().remove();
@@ -246,8 +252,8 @@
$("#PBSReasonname").parent().after("<br>");
$("#PBSCreater").parent().next().remove();
$("#PBSFenchadayu").parent().after("<br>");
-
- });
-
+
+ });
+
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml
index 938c759..50f0504 100644
--- a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml
@@ -3,6 +3,8 @@
@using zhengcaioa.Models;
@{
Layout = null;
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
<!DOCTYPE html>
@@ -140,7 +142,7 @@
<a class="btn btn-success" href="javascript:void(0)" onclick="_pageAutoClose();" style="margin-left:4px; border-radius:4px;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍙栨秷</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="saveCheck();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="saveCheck();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -157,7 +159,7 @@
else {
$("#panelss").hide();
}
-
+
});
var hh = document.body.clientHeight - $("#top").height() * 2 - 75;
@@ -199,7 +201,7 @@
return;
}
-
+
$.ajax({
type: "POST",
url: "/SalaryCheck/SaveCheck",
@@ -210,7 +212,7 @@
if (data.Result) {
parent.layer.msg('璁剧疆鎴愬姛', { icon: 6 });
- _pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶
+ _pageAutoClose();//鑷姩鍏抽棴椤甸潰鏂规硶
}
else {
// toastr.error("澶辫触");
@@ -236,15 +238,27 @@
//鐢ㄦ埛鍙兘杈撳叆姝ｈ礋鏁颁笌灏忔暟
function CheckNum(obj) {
-
+
if (isNaN(obj.value) && !/^-$/.test(obj.value)) {
obj.value = "";
}
if (!/^[+-]?\d*\.{0,1}\d{0,1}$/.test(obj.value)) {
obj.value = obj.value.replace(/\.\d{2,}$/, obj.value.substr(obj.value.indexOf('.'), 3));
}
-
+
}
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml b/zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml
index 4f709c1..1a13117 100644
--- a/zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml
@@ -7,6 +7,7 @@
int nookcount = Book == null ? 0 : Book.Count;
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@{
Layout = null;
@@ -165,7 +166,7 @@
</div>
<div>
- <a class="btn btn-default" href="javascript:void(0)" onclick="OpenWindow('鏂板鍥句功','98%','100%', '/ServiceCharge/Edit');" style="margin-right:40px;margin-bottom:5px; border-radius:4px;float:right;width:5%;">
+ <a class="btn btn-default Update" href="javascript:void(0)" onclick="OpenWindow('鏂板鍥句功','98%','100%', '/ServiceCharge/Edit');" style="margin-right:40px;margin-bottom:5px; border-radius:4px;float:right;width:5%;display:none;">
<i class="glyphicon glyphicon-plus"></i> <span class="bold">鏂板</span>
</a>
</div>
@@ -219,10 +220,10 @@
<td>@Book[i].Danjia.Value.ToString("F2")</td>
<td>
- <a href="javascript:void(0)" onclick="OpenWindow('@Book[i].BookName','98%','100%', '/ServiceCharge/Edit?id=@Book[i].Id');" style="margin-left:4px; border-radius:4px;">
+ <a href="javascript:void(0)" class="Update" onclick="OpenWindow('@Book[i].BookName','98%','100%', '/ServiceCharge/Edit?id=@Book[i].Id');" style="margin-left: 4px; border-radius: 4px; display: none;">
<span class="bold">淇敼</span>
</a>
- <a href="javascript:void(0)" onclick="delPosition('@Book[i].Id');" style="margin-left:4px; border-radius:4px;">
+ <a href="javascript:void(0)" class="Update" onclick="delPosition('@Book[i].Id');" style="margin-left:4px; border-radius:4px;display:none;">
<span class="bold">鍒犻櫎</span>
</a>
</td>
@@ -728,11 +729,11 @@
<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-default" href="javascript:void(0)" onclick="Print();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-default Dayin" href="javascript:void(0)" onclick="Print();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-print"></i> <span class="bold">鎵撳嵃</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -764,7 +765,7 @@
var delPosition = function (id) {
-
+
$.ajax({
type: "GET",
url: "/ServiceCharge/Nullify?id=" + id,
@@ -810,7 +811,7 @@
-
+
//var data = { id: $("#Id").val(), StartTime:$("#StartTime").val(), Sheng: $("#Sheng").val(), job_level: $("#Job_level").val().toString(), ExistsAttachment: fileId != "" }
$.ajax({
type: "POST",
@@ -819,7 +820,7 @@
global: false,
data: $('form').serializeArray(),
success: function (data) {
-
+
if (data.Result) {
@@ -851,7 +852,7 @@
}
-
+
function _pageAutoClose() {
window.location = "/ServiceCharge/Index";
@@ -861,6 +862,18 @@
//parent.layer.close(index);
return false;
}
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/Signin/AttendanceRule.cshtml b/zhengcaioa/zhengcaioa/Views/Signin/AttendanceRule.cshtml
index f066608..f83425e 100644
--- a/zhengcaioa/zhengcaioa/Views/Signin/AttendanceRule.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Signin/AttendanceRule.cshtml
@@ -11,6 +11,9 @@
var jiabanri = admAttendanceRulesDtlDTOs.Where(x => x.Name == "jiabanri").ToList();
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
+
+ string Creater = ViewData["Creater"] as string;
}
<!DOCTYPE html>
@@ -429,7 +432,7 @@
<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="SaveAttendanceRule();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="SaveAttendanceRule();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -539,7 +542,7 @@
//鎻愪氦璇锋眰
var SaveAttendanceRule = function () {
-
+
$.ajax({
type: "POST",
@@ -580,7 +583,7 @@
} ;
//鏈湀鑺傚亣鏃ヨ缃�
function addBtn(obj) {
-
+
var int = $('.holiday_s').length - 1;
var id = $('.holiday_s').eq(int).attr('id');
var holiday_ss = parseInt(id.replace("holiday_s", "")) + 1;
@@ -588,7 +591,7 @@
var int1 = $('.holiday_e').length - 1
var id1 = $('.holiday_e').eq(int1).attr('id');
var holiday_es = parseInt(id1.replace("holiday_e", "")) + 1;
-
+
var html = ' <div class="setSelect">\n' +
' <span></span>\n' +
' <input type="text" value="" class="layui-input layer-date ldate form-control holiday_s" id="holiday_s' + holiday_ss + '" name="holiday_s" style="width:150px;" onfocus=\'laydate({elem:"#holiday_s' + holiday_ss + '",format:"YYYY-MM-DD",theme:"#fdd5004"})\' /> -\n' +
@@ -598,13 +601,13 @@
$(obj).parent('div').parent('div').append(html);
-
-
-
-
-
+
+
+
+
+
};
function addRestBtn(obj) {
var int = $('.rest_s').length - 1;
@@ -624,7 +627,7 @@
$(obj).parent('div').parent('div').append(html);
-
+
};
@@ -648,7 +651,7 @@
};
-
+
function delBtn(obj, id, tb) {
//if (id > 0) {
// var url = "/index.php/home/white/del.html"
@@ -662,8 +665,17 @@
//}
$(obj).parent().remove();
}
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/Sim/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/Sim/Edit.cshtml
index ac486f9..f8ed51c 100644
--- a/zhengcaioa/zhengcaioa/Views/Sim/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Sim/Edit.cshtml
@@ -5,6 +5,7 @@
Layout = null;
List<SysCodeDtl> CardPro = ViewData["CardPro"] as List<SysCodeDtl>; //鐢佃瘽琛ヨ创
List<PltUserDTO> users = ViewData["users"] as List<PltUserDTO>;
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
<!DOCTYPE html>
@@ -130,7 +131,7 @@
<a class="btn btn-success" href="javascript:void(0)" onclick="_pageAutoClose();" style="margin-left:4px; border-radius:4px;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍙栨秷</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="saveSim();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="saveSim();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
</div>
@@ -140,8 +141,8 @@
<script type="text/javascript">
$(function () {
-
- $("#cbbUser").chosen();
+
+ $("#cbbUser").chosen();
});
@@ -175,7 +176,7 @@
toastr.warning("鐢佃瘽琛ヨ创涓嶈兘涓虹┖");
return;
}
-
+
$.ajax({
type: "POST",
url: "/Sim/SaveSimBind",
@@ -214,6 +215,17 @@
parent.layer.close(index);
return false;
}
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml b/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml
index 7ca128a..e7698f2 100644
--- a/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SysCode/Editlaw.cshtml
@@ -11,7 +11,7 @@
List<SysCodeDtlEntity> sysCodeDtlEntities = ViewData["sysCodeDtlEntities"] as List<SysCodeDtlEntity>; //娉曞緥
-
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@{
@@ -259,11 +259,11 @@
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>*@
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="closepage();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="closepage();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍏抽棴</span>
</a>
</div>
@@ -277,7 +277,7 @@
var hh = document.body.clientHeight - $('.ibox-title').height() - $("#top").height() * 2;
$("#div_content").height(hh);
-
+
var Contentss = document.getElementsByName("Contentss");
for (var a = 0; a < Contentss.length; a++) {
@@ -448,7 +448,7 @@
</div>
-
+
</div>
@@ -456,19 +456,19 @@
<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-10 col-md-10">
-
+
<select class="form-control" name="Commentss" data-placeholder="閫夋嫨 搴忓垪 ...">
<option value="" hassubinfo="true">璇烽�夋嫨</option>
@foreach (var item in falv)
{
-
+
<option value="@item.CodeSn" hassubinfo="true">
@item.Comments
</option>
-
+
}
-
+
</select>
</div>
</div>
@@ -482,7 +482,7 @@
<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-10 col-md-10">
-
+
<textarea class="form-control bt" name="Contentss" title="鍐呭" isempty="" maxlength="500" length="long" style="resize:none;overflow-y:hidden; min-height:60px;" onpropertychange="this.style.height=this.scrollHeight + 'px'" oninput="this.style.height=this.scrollHeight + 'px'"></textarea>
</div>
@@ -512,7 +512,17 @@
}
}
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/SysCode/Editquestion.cshtml b/zhengcaioa/zhengcaioa/Views/SysCode/Editquestion.cshtml
index 1c125cb..cadd889 100644
--- a/zhengcaioa/zhengcaioa/Views/SysCode/Editquestion.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SysCode/Editquestion.cshtml
@@ -5,7 +5,7 @@
-
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
@@ -177,11 +177,11 @@
<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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
@@ -340,7 +340,17 @@
return false;
}
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/SysCode/Editrequestinfo.cshtml b/zhengcaioa/zhengcaioa/Views/SysCode/Editrequestinfo.cshtml
index b422b95..67726f2 100644
--- a/zhengcaioa/zhengcaioa/Views/SysCode/Editrequestinfo.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SysCode/Editrequestinfo.cshtml
@@ -6,7 +6,7 @@
-
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
@@ -177,11 +177,11 @@
<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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">鎻愪氦</span>
</a>
@@ -339,8 +339,18 @@
parent.layer.close(index);
return false;
}
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
+
</script>
</body>
</html>
\ No newline at end of file
diff --git a/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml b/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml
index 8976f7b..0c47b43 100644
--- a/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/User/Edit.cshtml
@@ -2,6 +2,7 @@
@using DTO;
@using zhengcaioa.Models;
@{
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
List<HrPositionDTO> post = ViewBag.post as List<HrPositionDTO>; //鑱屼綅
List<HrDeptDTO> dept = ViewBag.dept as List<HrDeptDTO>; //閮ㄩ棬
@@ -21,7 +22,7 @@
shenfenzhengsssss = shenfenzheng.DataList;
}
- ResultDataEntity<SysAttachmentDTO> shenfenzhengbeimian = ViewBag.shenfenzhengbeimian as ResultDataEntity<SysAttachmentDTO>; //闂绫诲瀷
+ ResultDataEntity<SysAttachmentDTO> shenfenzhengbeimian = ViewBag.shenfenzhengbeimian as ResultDataEntity<SysAttachmentDTO>; //闂绫诲瀷
List<SysAttachmentDTO> shenfenzhengbeimiansssss = new List<SysAttachmentDTO>();
if (shenfenzhengbeimian.DataList != null)
{
@@ -808,11 +809,11 @@
<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="delPosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Delete" href="javascript:void(0)" onclick="delPosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-remove"></i> <span class="bold">鍒犻櫎</span>
</a>
- <a class="btn btn-success" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left: 4px; border-radius: 4px; display: none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">淇濆瓨</span>
</a>
</div>
@@ -970,7 +971,7 @@
global: false,
data: $('form').serializeArray(),
success: function (data) {
-
+
if (data.Result) {
@@ -1531,8 +1532,18 @@
parent.layer.close(index);
return false;
}
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
+
</script>
</body>
</html>
diff --git a/zhengcaioa/zhengcaioa/Views/User/EditBeizhu.cshtml b/zhengcaioa/zhengcaioa/Views/User/EditBeizhu.cshtml
index 1947301..f452e84 100644
--- a/zhengcaioa/zhengcaioa/Views/User/EditBeizhu.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/User/EditBeizhu.cshtml
@@ -5,7 +5,7 @@
List<SysCodeDtl> shifou = ViewBag.shifou as List<SysCodeDtl>; //鏄惁
-
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@{
Layout = null;
@@ -239,7 +239,7 @@
<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;">
+ <a class="btn btn-success Update" href="javascript:void(0)" onclick="savePosition();" style="margin-left:4px; border-radius:4px;display:none;">
<i class="glyphicon glyphicon-ok"></i> <span class="bold">淇濆瓨</span>
</a>
</div>
@@ -275,15 +275,15 @@
//remark.style.height = remark.scrollHeight + 'px';
-
-
+
+
// 淇濆瓨宀椾綅淇℃伅
var savePosition = function () {
-
+
//if ($.trim($("#Beizhu").val()) == '') {
// toastr.warning("宸ヨ祫澶囨敞涓嶈兘涓虹┖");
@@ -327,7 +327,7 @@
}
});
}
-
+
function _pageAutoClose() {
@@ -339,7 +339,17 @@
return false;
}
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+
+
+ $(function () {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ $("." + data[o].PageShortcut).show();
+
+ }
+ });
</script>
</body>
</html>
diff --git a/zhengcaioa/zhengcaioa/Views/User/Index.cshtml b/zhengcaioa/zhengcaioa/Views/User/Index.cshtml
index 603e858..2cc3698 100644
--- a/zhengcaioa/zhengcaioa/Views/User/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/User/Index.cshtml
@@ -1,6 +1,9 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "User";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@section headerStyle{
<script type="text/javascript">
@@ -102,15 +105,15 @@
{
label: '妗ｆ鏌ヨ', name: 'Education', labtype: 'txt', hidden: false, width: 100,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('濂栨儵','98%','100%', '/AdmBreakPrecedent/IndexRenshi?UserId=" + rowObject.Id + "')\" >濂栨儵</a> "
- + "<a onclick=\"OpenWindow('鐗╁搧','98%','100%', '/AdmBreakPrecedent/IndexGoods?UserId=" + rowObject.Id + "')\" >鐗╁搧</a> "
- + "<a onclick=\"OpenWindow('钖祫','98%','100%', '/SalaryCheck/SearchIndexRenshi?UserId=" + rowObject.Id + "')\" >钖祫</a> ";
+ return "<a class=\"danganchaxun\" style=\"display: none;\" onclick=\"OpenWindow('濂栨儵','98%','100%', '/AdmBreakPrecedent/IndexRenshi?UserId=" + rowObject.Id + "')\" >濂栨儵</a> "
+ + "<a class=\"danganchaxun\" style=\"display: none;\" onclick=\"OpenWindow('鐗╁搧','98%','100%', '/AdmBreakPrecedent/IndexGoods?UserId=" + rowObject.Id + "')\" >鐗╁搧</a> "
+ + "<a class=\"danganchaxun\" style=\"display: none;\" onclick=\"OpenWindow('钖祫','98%','100%', '/SalaryCheck/SearchIndexRenshi?UserId=" + rowObject.Id + "')\" >钖祫</a> ";
}
},
{
label: '鎵撳嵃绠�鍘�', name: 'Imei', labtype: 'txt', hidden: false, width: 100,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('鎵撳嵃绠�鍘�','98%','100%', '/User/Print?id=" + rowObject.Id + "')\" > 鎵撳嵃 </a>";
+ return "<a class=\"Dayin\" style=\"display: none;\" onclick=\"OpenWindow('鎵撳嵃绠�鍘�','98%','100%', '/User/Print?id=" + rowObject.Id + "')\" > 鎵撳嵃 </a>";
}
},
@@ -137,7 +140,7 @@
{ label: '鎬у埆', name: 'Sex', labtype: 'combox', hidden: false, data: JSON.parse(sex) },
{ label: '鐢ㄦ埛鎵嬫満', name: 'Phone', labtype: 'txt', hidden: false },
{ label: '鍦ㄨ亴鐘舵��', name: 'Zhiwustatus', labtype: 'combox', hidden: false, data: JSON.parse(zhiwustatusDropDown) },
-
+
@@ -182,13 +185,24 @@
}
}
-
-
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
-
-
+ var _afterLoadDataload = function (xhr) {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+
+ }
+
+
+ };
+
+
</script>
}
diff --git a/zhengcaioa/zhengcaioa/Views/Zhuanjiahuida/Index.cshtml b/zhengcaioa/zhengcaioa/Views/Zhuanjiahuida/Index.cshtml
index 23bd36b..bd34b02 100644
--- a/zhengcaioa/zhengcaioa/Views/Zhuanjiahuida/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Zhuanjiahuida/Index.cshtml
@@ -1,6 +1,9 @@
-锘緻{
+锘緻using DTO;
+@{
ViewBag.Title = "Zhuanjiahuida";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+
+ List<PageEntity> ActionInfo2 = ViewData["ActionInfo2"] as List<PageEntity>;
}
@section headerStyle{
<script type="text/javascript">
@@ -15,12 +18,13 @@
// label: '鎻愰棶浜�', name: 'Username', labtype: 'txt', hidden: false, width: 100
//},
{
- label: '闂', name: 'Question', labtype: 'txt', hidden: false, width: 200,
- formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('鍥炵瓟闂','98%','100%', '/Zhuanjiahuida/Edit?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
- }
+ label: '闂', name: 'Question', labtype: 'txt', hidden: false, width: 200
+ //,
+ //formatter: function (cellvalue, options, rowObject) {
+ // return "<a onclick=\"OpenWindow('鍥炵瓟闂','98%','100%', '/Zhuanjiahuida/Edit?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
+ //}
},
-
+
{
label: '鍥炵瓟', name: 'Anwser', labtype: 'txt', hidden: false, width: 300
@@ -29,10 +33,10 @@
{
label: '鎿嶄綔', name: 'caozuo', labtype: 'txt', hidden: false, width: 50,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('淇敼','98%','100%', '/Zhuanjiahuida/Edit?id=" + rowObject.Id + "')\" >鍥炵瓟</a> <a onclick=\"_pagedel('" + rowObject.Id + "')\" >鍒犻櫎</a>";
+ return "<a class=\"Huida\" style=\"display: none;\" onclick=\"OpenWindow('鍥炵瓟','98%','100%', '/Zhuanjiahuida/Edit?id=" + rowObject.Id + "')\" >鍥炵瓟</a> <a class=\"Shanchu\" style=\"display: none;\" onclick=\"_pagedel('" + rowObject.Id + "')\" >鍒犻櫎</a>";
}
},
-
+
];
dataUrl = "/Zhuanjiahuida/GetList";
searchCol = [
@@ -107,7 +111,21 @@
toastr.error("鍒犻櫎鎴愬姛");
/**/
}
-}
+ }
+
+ var ActionInfo22 = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ActionInfo2))';
+ var _afterLoadDataload = function (xhr) {
+ var data = JSON.parse(ActionInfo22);
+ for (var o in data) {
+ //alert(o);
+ //alert(data[o]);
+ /* alert("PageShortcut:" + data[o].PageShortcut + " PageName:" + data[o].PageName);*/
+ $("." + data[o].PageShortcut).show();
+
+ }
+
+
+ };
</script>
}
--
Gitblit v1.9.1