Procházet zdrojové kódy

公文接收增加【角色签字办理】功能

金隅分支
zhangli před 3 roky
rodič
revize
747b4b5744
10 změnil soubory, kde provedl 212 přidání a 2 odebrání
  1. +21
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleBLL.cs
  2. +1
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleIBLL.cs
  3. +26
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleService.cs
  4. +29
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveDocumentController.cs
  5. +25
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs
  6. +2
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.cshtml
  7. +25
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js
  8. +11
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/RoleForm.cshtml
  9. +70
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/RoleForm.js
  10. +2
    -0
      Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

+ 21
- 0
Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleBLL.cs Zobrazit soubor

@@ -125,6 +125,27 @@ namespace Learun.Application.Organization
}
}
}
/// 获取分页数据
/// <returns></returns>
public List<RoleEntity> GetListForSelect()
{
try
{
return (List<RoleEntity>)roleService.GetListForSelect();
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowBusinessException(ex);
}
}
}
/// <summary>
/// 根据角色名获取角色
/// </summary>


+ 1
- 0
Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleIBLL.cs Zobrazit soubor

@@ -23,6 +23,7 @@ namespace Learun.Application.Organization
/// <param name="keyword">关键字</param>
/// <returns></returns>
List<RoleEntity> GetList(string keyword);
List<RoleEntity> GetListForSelect();
/// <summary>
/// 获取分页数据
/// </summary>


+ 26
- 0
Learun.Framework.Ultimate V7/Learun.Application.Organization/Role/RoleService.cs Zobrazit soubor

@@ -65,6 +65,32 @@ namespace Learun.Application.Organization
}
}
}
/// <summary>
/// 获取角色数据列表
/// </summary>
/// <returns></returns>
public IEnumerable<RoleEntity> GetListForSelect()
{
try
{
var strSql = new StringBuilder();
strSql.Append("SELECT t.F_RoleId,t.F_FullName,t.F_EnCode");
strSql.Append(" FROM LR_Base_Role t WHERE t.F_EnabledMark = 1 AND t.F_DeleteMark = 0 ORDER BY t.F_EnCode ");
return this.BaseRepository().FindList<RoleEntity>(strSql.ToString());
}
catch (Exception ex)
{
if (ex is ExceptionEx)
{
throw;
}
else
{
throw ExceptionEx.ThrowServiceException(ex);
}
}
}

public IEnumerable<RoleEntity> GetPageList(Pagination pagination, string keyword)
{
try


+ 29
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveDocumentController.cs Zobrazit soubor

@@ -4,6 +4,7 @@ using Learun.Application.TwoDevelopment.EducationalAdministration;
using System.Web.Mvc;
using System.Collections.Generic;
using System.Linq;
using Learun.Application.Organization;

namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
{
@@ -18,6 +19,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
{
private SYS_ReceiveDocumentIBLL sYS_ReceiveDocumentIBLL = new SYS_ReceiveDocumentBLL();
private Sys_ReceiveFileIBLL receiveFileIbll=new Sys_ReceiveFileBLL();
private RoleIBLL roleIBLL = new RoleBLL();

#region 视图功能

@@ -30,7 +32,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
{
return View();
}

/// <summary>
/// 主页面
/// <summary>
/// <returns></returns>
[HttpGet]
public ActionResult RoleForm()
{
return View();
}
/// <summary>
/// 公文接收归档
/// <summary>
@@ -129,6 +140,23 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
/// <returns></returns>
[HttpGet]
[AjaxOnly]
public ActionResult GetRoleData()
{
var data = roleIBLL.GetListForSelect();

//var jsonData = new
//{
// data = data
//};

return Success(data);
}
/// <summary>
/// 获取表单数据
/// <summary>
/// <returns></returns>
[HttpGet]
[AjaxOnly]
public ActionResult GetFormData(string keyValue)
{
var Sys_ReceiveDocumentData = sYS_ReceiveDocumentIBLL.GetSys_ReceiveDocumentEntity(keyValue);


+ 25
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Sys_ReceiveFileController.cs Zobrazit soubor

@@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Web;
using Learun.Application.Base.SystemModule;
using Learun.Application.Base.AuthorizeModule;

namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
{
@@ -20,6 +21,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
{
private Sys_ReceiveFileIBLL sys_ReceiveFileIBLL = new Sys_ReceiveFileBLL();
private AnnexesFileIBLL annexesFileIbll = new AnnexesFileBLL();
private UserRelationIBLL userRelationIBLL = new UserRelationBLL();

#region 视图功能

@@ -300,6 +302,29 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
sys_ReceiveFileIBLL.ReceiveDocumentIssue(entity);
return Success("发送成功");
}
/// <summary>
/// 根据角色批示
/// </summary>
/// <returns></returns>
[HttpPost]
[AjaxOnly]
public ActionResult RoleReceive(string strEntity)
{
Sys_IssueEntity entity = strEntity.ToObject<Sys_IssueEntity>();
var data = userRelationIBLL.GetUserIdList(entity.SpecifyReceiver);
string userIds = "";
foreach (var item in data)
{
if (userIds != "")
{
userIds += ",";
}
userIds += item.F_UserId;
}
entity.SpecifyReceiver = userIds;
sys_ReceiveFileIBLL.ReceiveDocumentIssue(entity);
return Success("发送成功");
}


/// <summary>


+ 2
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.cshtml Zobrazit soubor

@@ -39,11 +39,12 @@
<a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
@*<a id="lr_submit" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;提交</a>*@
</div>
<div class=" btn-group btn-group-sm" >
<div class=" btn-group btn-group-sm">
<a id="lr_view" class="btn btn-default"><i class="fa fa-search-minus"></i>&nbsp;查看</a>
<a id="lr_IssueSpecifyReceiver1" class="btn btn-default"><i class="fa fa-envelope"></i>&nbsp;校办主任阅签</a>
<a id="lr_IssueSpecifyReceiver2" class="btn btn-default"><i class="fa fa-envelope"></i>&nbsp;校长书记批办</a>
<a id="lr_IssueSpecifyReceiver" class="btn btn-default"><i class="fa fa-envelope"></i>&nbsp;部门签字办理</a>
<a id="lr_IssueSpecifyRole" class="btn btn-default"><i class="fa fa-envelope"></i>&nbsp;角色签字办理</a>
<a id="lr_OverIssue" class="btn btn-default"><i class="fa fa-minus-square"></i>&nbsp;结束下发</a>
<a id="lr_read" class="btn btn-default"><i class="fa fa-calendar-minus-o"></i>&nbsp;查阅情况</a>
<a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>


+ 25
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/Index.js Zobrazit soubor

@@ -228,6 +228,31 @@ var bootstrap = function ($, learun) {
});
}
});
// 下发审批指定角色
$('#lr_IssueSpecifyRole').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('RID');
if (learun.checkrow(keyValue)) {
learun.layerForm({
id: 'form',
title: '下发审批指定接收人',
url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/RoleForm?keyValue=' + keyValue,
width: 600,
height: 400,
callBack: function (id) {
var res = false;
// 验证数据
res = top[id].validForm();
// 保存数据
if (res) {
res = top[id].save('', function () {
page.search();
});
}
return res;
}
});
}
});
// 结束下发
$('#lr_OverIssue').on('click', function () {
var keyValue = $('#gridtable').jfGridValue('RID');


+ 11
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/RoleForm.cshtml Zobrazit soubor

@@ -0,0 +1,11 @@
@{
ViewBag.Title = "公文发送";
Layout = "~/Views/Shared/_Form.cshtml";
}
<div class="lr-form-wrap" id="form">
<div class="col-xs-12 lr-form-item" data-table="Sys_SendFile" id="ReceiverIddiv">
<div class="lr-form-item-title">接收角色<font face="宋体">*</font></div>
<div id="SpecifyReceiver" isvalid="yes" checkexpession="NotNull" ></div>
</div>
</div>
@Html.AppendJsFile("/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/RoleForm.js")

+ 70
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Sys_ReceiveDocument/RoleForm.js Zobrazit soubor

@@ -0,0 +1,70 @@
/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn)
* Copyright (c) 2013-2018 北京泉江科技有限公司
* 创建人:超级管理员
* 日 期:2019-04-11 10:31
* 描 述:公文发送
*/
var acceptClick;
var keyValue = request('keyValue');
var rFileId = request('rFileId');
var specifyReceiver = request('specifyReceiver');
// 设置权限
var setAuthorize;
// 设置表单数据
var setFormData;
// 验证数据是否填写完整
var validForm;
// 保存数据
var save;
var bootstrap = function ($, learun) {
"use strict";
// 设置权限
setAuthorize = function (data) {
};
var page = {
init: function () {
$('.lr-form-wrap').lrscroll();
page.bind();
page.initData();
},
bind: function () {
//$('#SpecifyReceiver').lrUserSelect({ type: '1' });
$('#SpecifyReceiver').lrselect({
allowSearch: true,
url: top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveDocument/GetRoleData',
value: 'F_RoleId',
text: 'F_FullName',
maxHeight: 200
});

},
initData: function () {
if (rFileId) {
$('#SpecifyReceiver').lrformselectSet(specifyReceiver);
}
}
};
// 验证数据是否填写完整
validForm = function () {
if (!$('#form').lrValidform()) {
return false;
}
return true;
};
// 保存数据
save = function (processId, callBack, i) {
var formData = $('body').lrGetFormData();
formData.RFileId = rFileId;
formData.SFileId = keyValue;
var postData = {
strEntity: JSON.stringify(formData)
};
$.lrSaveForm(top.$.rootUrl + '/EducationalAdministration/Sys_ReceiveFile/RoleReceive', postData, function (res) {
// 保存成功后才回调
if (!!callBack) {
callBack(res, formData, i);
}
});
};
page.init();
}

+ 2
- 0
Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj Zobrazit soubor

@@ -1058,6 +1058,7 @@
<Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\IndexFile.js" />
<Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\Index.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\Index.js" />
<Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\RoleForm.js" />
<Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\IssueForm.js" />
<Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\PrintView.js" />
<Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\ReadList.js" />
@@ -7402,6 +7403,7 @@
<Content Include="Areas\LogisticsManagement\Views\ProjectDataManage\FormView.cshtml" />
<Content Include="Areas\LogisticsManagement\Views\ProjectManage\Index1.cshtml" />
<Content Include="Areas\LogisticsManagement\Views\ProjectProcessManage\IndexData1.cshtml" />
<Content Include="Areas\EducationalAdministration\Views\Sys_ReceiveDocument\RoleForm.cshtml" />
<None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" />
<Content Include="Views\Login\Default-beifen.cshtml" />


Načítá se…
Zrušit
Uložit