From 6029feaa79bc2c10e495b6620c032112b86fbbad Mon Sep 17 00:00:00 2001 From: zhichao lei <442149704@qq.com> Date: Tue, 9 Mar 2021 11:35:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E6=89=AB=E7=A0=81=E7=AD=BE?= =?UTF-8?q?=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/MeetingMinutesController.cs | 124 +++++++ .../Views/MeetingMinutes/Form.cshtml | 23 ++ .../Views/MeetingMinutes/Form.js | 52 +++ .../Views/MeetingMinutes/Index.cshtml | 41 +++ .../Views/MeetingMinutes/Index.js | 94 +++++ .../Learun.Application.Web.csproj | 5 + .../Learun.Application.WebApi.csproj | 1 + .../PersonnelManagement/MeetingMinutesApi.cs | 116 ++++++ .../MeetingSignInRecordApi.cs | 19 + .../CodeGeneratorModule/CodeGeneratorWx.cs | 2 +- .../Learun.Application.Mapping.csproj | 1 + .../PersonnelManagement/MeetingMinutesMap.cs | 29 ++ .../Learun.Application.TwoDevelopment.csproj | 4 + .../MeetingMinutes/MeetingMinutesBLL.cs | 149 ++++++++ .../MeetingMinutes/MeetingMinutesEntity.cs | 79 ++++ .../MeetingMinutes/MeetingMinutesIBLL.cs | 56 +++ .../MeetingMinutes/MeetingMinutesService.cs | 212 +++++++++++ .../MeetingSignInRecordBLL.cs | 19 + .../MeetingSignInRecordIBLL.cs | 1 + .../MeetingSignInRecordService.cs | 34 +- .../LearunApp-2.2.0/config.js | 11 +- .../LearunApp-2.2.0/pages.json | 32 ++ .../MeetingManagement/list.vue | 314 +++++++++------- .../MeetingMinutes/list.vue | 338 ++++++++++++++++++ .../MeetingMinutes/single.vue | 259 ++++++++++++++ .../MeetingSignInRecord/list.vue | 2 +- .../MeetingSignInScan/list.vue | 45 +++ .../ConfirmStudentsCheckIn/list.vue | 1 - 28 files changed, 1926 insertions(+), 137 deletions(-) create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingMinutesController.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.cshtml create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.js create mode 100644 Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingMinutesApi.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingMinutesMap.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesEntity.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesIBLL.cs create mode 100644 Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesService.cs create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMinutes/list.vue create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMinutes/single.vue create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInScan/list.vue diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingMinutesController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingMinutesController.cs new file mode 100644 index 000000000..a6a5233fd --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/MeetingMinutesController.cs @@ -0,0 +1,124 @@ +using Learun.Util; +using System.Data; +using Learun.Application.TwoDevelopment.PersonnelManagement; +using System.Web.Mvc; +using System.Collections.Generic; + +namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议纪要 + /// + public class MeetingMinutesController : MvcControllerBase + { + private MeetingMinutesIBLL meetingMinutesIBLL = new MeetingMinutesBLL(); + + #region 视图功能 + + /// + /// 主页面 + /// + /// + [HttpGet] + public ActionResult Index() + { + return View(); + } + /// + /// 表单页 + /// + /// + [HttpGet] + public ActionResult Form() + { + return View(); + } + #endregion + + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetPageList(string pagination, string queryJson) + { + Pagination paginationobj = pagination.ToObject(); + var data = meetingMinutesIBLL.GetPageList(paginationobj, queryJson); + var jsonData = new + { + rows = data, + total = paginationobj.total, + page = paginationobj.page, + records = paginationobj.records + }; + return Success(jsonData); + } + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetList(string queryJson) + { + var data = meetingMinutesIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取表单数据 + /// + /// + [HttpGet] + [AjaxOnly] + public ActionResult GetFormData(string keyValue) + { + var MeetingMinutesData = meetingMinutesIBLL.GetMeetingMinutesEntity( keyValue ); + var jsonData = new { + MeetingMinutes = MeetingMinutesData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + [HttpPost] + [AjaxOnly] + public ActionResult DeleteForm(string keyValue) + { + meetingMinutesIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + [HttpPost] + [ValidateAntiForgeryToken] + [AjaxOnly] + public ActionResult SaveForm(string keyValue, string strEntity) + { + UserInfo userInfo = LoginUserInfo.Get(); MeetingMinutesEntity entity = strEntity.ToObject(); + meetingMinutesIBLL.SaveEntity(userInfo,keyValue,entity); + return Success("保存成功！"); + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.cshtml new file mode 100644 index 000000000..f08ac1bce --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.cshtml @@ -0,0 +1,23 @@ +@{ + ViewBag.Title = "会议纪要"; + Layout = "~/Views/Shared/_Form.cshtml"; +} +
+
+
会议名称
+ +
+
+
纪要标题
+ +
+
+
内容
+
+
+
+
附件上传
+
+
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingMinutes/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.js new file mode 100644 index 000000000..470cf2c58 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Form.js @@ -0,0 +1,52 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-08 10:36 + * 描 述：会议纪要 + */ +var acceptClick; +var keyValue = request('keyValue'); +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + $('.lr-form-wrap').lrscroll(); + page.bind(); + page.initData(); + }, + bind: function () { + var ContentUE = UE.getEditor('Content'); + $('#Content')[0].ue = ContentUE; $('#Files').lrUploader(); + }, + initData: function () { + if (!!keyValue) { + $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/GetFormData?keyValue=' + keyValue, function (data) { + for (var id in data) { + if (!!data[id].length && data[id].length > 0) { + $('#' + id ).jfGridSet('refreshdata', data[id]); + } + else { + $('[data-table="' + id + '"]').lrSetFormData(data[id]); + } + } + }); + } + } + }; + // 保存数据 + acceptClick = function (callBack) { + if (!$('body').lrValidform()) { + return false; + } + var postData = { + strEntity: JSON.stringify($('body').lrGetFormData()) + }; + $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/SaveForm?keyValue=' + keyValue, postData, function (res) { + // 保存成功后才回调 + if (!!callBack) { + callBack(); + } + }); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.cshtml new file mode 100644 index 000000000..09c897e92 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.cshtml @@ -0,0 +1,41 @@ +@{ + ViewBag.Title = "会议纪要"; + Layout = "~/Views/Shared/_Index.cshtml"; +} +
+
+
+
+
+
+
+
+
+
会议名称
+ +
+
+
纪要标题
+ +
+
+
+
+
+
+
+ +
+
+  新增 +  编辑 +  删除 +  打印 +
+
+
+
+
+
+
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/MeetingMinutes/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.js new file mode 100644 index 000000000..fdc1ed0c6 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/MeetingMinutes/Index.js @@ -0,0 +1,94 @@ +/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn) + * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + * 创建人：超级管理员 + * 日 期：2021-03-08 10:36 + * 描 述：会议纪要 + */ +var refreshGirdData; +var bootstrap = function ($, learun) { + "use strict"; + var page = { + init: function () { + page.initGird(); + page.bind(); + }, + bind: function () { + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + // 刷新 + $('#lr_refresh').on('click', function () { + location.reload(); + }); + // 新增 + $('#lr_add').on('click', function () { + learun.layerForm({ + id: 'form', + title: '新增', + url: top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/Form', + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + }); + // 编辑 + $('#lr_edit').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerForm({ + id: 'form', + title: '编辑', + url: top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/Form?keyValue=' + keyValue, + width: 600, + height: 400, + callBack: function (id) { + return top[id].acceptClick(refreshGirdData); + } + }); + } + }); + // 删除 + $('#lr_delete').on('click', function () { + var keyValue = $('#gridtable').jfGridValue('ID'); + if (learun.checkrow(keyValue)) { + learun.layerConfirm('是否确认删除该项！', function (res) { + if (res) { + learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/DeleteForm', { keyValue: keyValue}, function () { + refreshGirdData(); + }); + } + }); + } + }); + // 打印 + $('#lr_print').on('click', function () { + $('#gridtable').jqprintTable(); + }); + }, + // 初始化列表 + initGird: function () { + $('#gridtable').lrAuthorizeJfGrid({ + url: top.$.rootUrl + '/PersonnelManagement/MeetingMinutes/GetPageList', + headData: [ + { label: "会议名称", name: "MeetID", width: 100, align: "left"}, + { label: "纪要标题", name: "Title", width: 100, align: "left"}, + { label: "内容", name: "Content", width: 100, align: "left"}, + { label: "附件上传", name: "Files", width: 100, align: "left"}, + ], + mainId:'ID', + isPage: true + }); + page.search(); + }, + search: function (param) { + param = param || {}; + $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) }); + } + }; + refreshGirdData = function () { + $('#gridtable').jfGridSet('reload'); + }; + page.init(); +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj index c99e45986..278c7b6ee 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj @@ -794,6 +794,7 @@ + @@ -6136,6 +6137,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj index de753a218..a84b93e4f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Learun.Application.WebApi.csproj @@ -274,6 +274,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingMinutesApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingMinutesApi.cs new file mode 100644 index 000000000..38893dd70 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingMinutesApi.cs @@ -0,0 +1,116 @@ +using Nancy; +using Learun.Util; +using System.Collections.Generic; +using Learun.Application.TwoDevelopment.PersonnelManagement; +namespace Learun.Application.WebApi +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议纪要 + /// + public class MeetingMinutesApi : BaseApi + { + private MeetingMinutesIBLL meetingMinutesIBLL = new MeetingMinutesBLL(); + + /// + /// 注册接口 + /// + public MeetingMinutesApi() + : base("/Learun/adms/PersonnelManagement/MeetingMinutes") + { + Get["/pagelist"] = GetPageList; + Get["/list"] = GetList; + Get["/form"] = GetForm; + Post["/delete"] = DeleteForm; + Post["/save"] = SaveForm; + } + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// + /// + public Response GetPageList(dynamic _) + { + ReqPageParam parameter = this.GetReqData(); + var data = meetingMinutesIBLL.GetPageList(parameter.pagination, parameter.queryJson); + var jsonData = new + { + rows = data, + total = parameter.pagination.total, + page = parameter.pagination.page, + records = parameter.pagination.records + }; + return Success(jsonData); + } + /// + /// 获取页面显示列表数据 + /// + /// + /// + public Response GetList(dynamic _) + { + string queryJson = this.GetReqData(); + var data = meetingMinutesIBLL.GetList(queryJson); + return Success(data); + } + /// + /// 获取表单数据 + /// + /// + /// + public Response GetForm(dynamic _) + { + string keyValue = this.GetReqData(); + var MeetingMinutesData = meetingMinutesIBLL.GetMeetingMinutesEntity( keyValue ); + var jsonData = new { + MeetingMinutes = MeetingMinutesData, + }; + return Success(jsonData); + } + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// + /// + /// + public Response DeleteForm(dynamic _) + { + string keyValue = this.GetReqData(); + meetingMinutesIBLL.DeleteEntity(keyValue); + return Success("删除成功！"); + } + /// + /// 保存实体数据（新增、修改） + /// + /// + /// + public Response SaveForm(dynamic _) + { + ReqFormEntity parameter = this.GetReqData(); + MeetingMinutesEntity entity = parameter.strEntity.ToObject(); + meetingMinutesIBLL.SaveEntity(this.userInfo,parameter.keyValue,entity); + return Success("保存成功！"); + } + #endregion + + #region 私有类 + + /// + /// 表单实体类 + /// + private class ReqFormEntity { + public string keyValue { get; set; } + public string strEntity{ get; set; } + } + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingSignInRecordApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingSignInRecordApi.cs index e2fb06404..6d37ff6b2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingSignInRecordApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/MeetingSignInRecordApi.cs @@ -26,6 +26,7 @@ namespace Learun.Application.WebApi Get["/form"] = GetForm; Post["/delete"] = DeleteForm; Post["/save"] = SaveForm; + Get["/scan"] = Scan; } #region 获取数据 @@ -86,6 +87,18 @@ namespace Learun.Application.WebApi string keyValue = this.GetReqData(); meetingSignInRecordIBLL.DeleteEntity(keyValue); return Success("删除成功！"); + } + + /// + /// 会议扫码签到 + /// + /// + /// + public Response Scan(dynamic _) + { + ScanParam scanParam = this.GetReqData(); + var result= meetingSignInRecordIBLL.Scan(scanParam.userid,scanParam.meetid)?"签到成功":"签到失败"; + return Success(new {result}); } /// /// 保存实体数据（新增、修改） @@ -110,6 +123,12 @@ namespace Learun.Application.WebApi public string keyValue { get; set; } public string strEntity{ get; set; } } + + private class ScanParam + { + public string userid { get; set; } + public string meetid { get; set; } + } #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/CodeGeneratorModule/CodeGeneratorWx.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/CodeGeneratorModule/CodeGeneratorWx.cs index 3a6516091..66597914a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/CodeGeneratorModule/CodeGeneratorWx.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Base/CodeGeneratorModule/CodeGeneratorWx.cs @@ -2969,7 +2969,7 @@ namespace Learun.Application.Base.CodeGeneratorModule sb.Append(" /// 注册接口\r\n"); sb.Append(" /// \r\n"); sb.Append(" public " + baseInfo.name + "Api()\r\n"); - sb.Append(" : base(\"/learun/adms/" + baseInfo.outputArea + "/" + baseInfo.name + "\")\r\n"); + sb.Append(" : base(\"/" + baseInfo.outputArea + "/" + baseInfo.name + "\")\r\n"); sb.Append(" {\r\n"); sb.Append(" Get[\"/pagelist\"] = GetPageList;\r\n"); sb.Append(" Get[\"/list\"] = GetList;\r\n"); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj index d73602098..56aeaec69 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/Learun.Application.Mapping.csproj @@ -546,6 +546,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingMinutesMap.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingMinutesMap.cs new file mode 100644 index 000000000..22f03f183 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.Mapping/PersonnelManagement/MeetingMinutesMap.cs @@ -0,0 +1,29 @@ +using Learun.Application.TwoDevelopment.PersonnelManagement; +using System.Data.Entity.ModelConfiguration; + +namespace Learun.Application.Mapping +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议纪要 + /// + public class MeetingMinutesMap : EntityTypeConfiguration + { + public MeetingMinutesMap() + { + #region 表、主键 + //表 + this.ToTable("MEETINGMINUTES"); + //主键 + this.HasKey(t => t.ID); + #endregion + + #region 配置关系 + #endregion + } + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj index 35f226c5d..4f69b0dc1 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/Learun.Application.TwoDevelopment.csproj @@ -1605,6 +1605,10 @@ + + + + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesBLL.cs new file mode 100644 index 000000000..91bbba6ec --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesBLL.cs @@ -0,0 +1,149 @@ +using Learun.Util; +using System; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议纪要 + /// + public class MeetingMinutesBLL : MeetingMinutesIBLL + { + private MeetingMinutesService meetingMinutesService = new MeetingMinutesService(); + + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + return meetingMinutesService.GetPageList(pagination, queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + return meetingMinutesService.GetList(queryJson); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 获取MeetingMinutes表实体数据 + /// 主键 + /// + /// + public MeetingMinutesEntity GetMeetingMinutesEntity(string keyValue) + { + try + { + return meetingMinutesService.GetMeetingMinutesEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + public void DeleteEntity(string keyValue) + { + try + { + meetingMinutesService.DeleteEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + public void SaveEntity(UserInfo userInfo, string keyValue, MeetingMinutesEntity entity) + { + try + { + meetingMinutesService.SaveEntity(userInfo, keyValue, entity); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesEntity.cs new file mode 100644 index 000000000..571c7bbd8 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesEntity.cs @@ -0,0 +1,79 @@ +using Learun.Util; +using System; +using System.ComponentModel.DataAnnotations.Schema; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议纪要 + /// + public class MeetingMinutesEntity + { + #region 实体成员 + /// + /// 编号 + /// + [Column("ID")] + public string ID { get; set; } + /// + /// 会议id + /// + [Column("MEETID")] + public string MeetID { get; set; } + /// + /// 纪要标题 + /// + [Column("TITLE")] + public string Title { get; set; } + /// + /// 纪要内容 + /// + [Column("CONTENT")] + public string Content { get; set; } + /// + /// 附件 + /// + [Column("FILES")] + public string Files { get; set; } + /// + /// 创建时间 + /// + [Column("CREATETIME")] + public DateTime? CreateTime { get; set; } + /// + /// 创建人 + /// + [Column("CREATEUSER")] + public string CreateUser { get; set; } + + #endregion + + #region 扩展操作 + /// + /// 新增调用 + /// + public void Create(UserInfo userInfo) + { + this.ID = Guid.NewGuid().ToString(); + } + /// + /// 编辑调用 + /// + /// + public void Modify(string keyValue, UserInfo userInfo) + { + this.ID = keyValue; + } + #endregion + #region 扩展字段 + [NotMapped] + [Column("MEETINGTITLE")] + public string MeetingTitle { get; set; } + #endregion + } +} + diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesIBLL.cs new file mode 100644 index 000000000..5ddfa91ac --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesIBLL.cs @@ -0,0 +1,56 @@ +using Learun.Util; +using System.Data; +using System.Collections.Generic; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议纪要 + /// + public interface MeetingMinutesIBLL + { + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// 查询参数 + /// 查询参数 + /// + IEnumerable GetPageList(Pagination pagination, string queryJson); + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + IEnumerable GetList(string queryJson); + /// + /// 获取MeetingMinutes表实体数据 + /// 主键 + /// + /// + MeetingMinutesEntity GetMeetingMinutesEntity(string keyValue); + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + void DeleteEntity(string keyValue); + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + void SaveEntity(UserInfo userInfo, string keyValue, MeetingMinutesEntity entity); + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesService.cs new file mode 100644 index 000000000..ac8f075d7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingMinutes/MeetingMinutesService.cs @@ -0,0 +1,212 @@ +using Dapper; +using Learun.DataBase.Repository; +using Learun.Util; +using System; +using System.Collections.Generic; +using System.Data; +using System.Text; + +namespace Learun.Application.TwoDevelopment.PersonnelManagement +{ + /// + /// 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架 + /// Copyright (c) 2013-2020 力软信息技术（苏州）有限公司 + /// 创 建：超级管理员 + /// 日 期：2021-03-08 10:36 + /// 描 述：会议纪要 + /// + public class MeetingMinutesService : RepositoryFactory + { + #region 获取数据 + + /// + /// 获取页面显示列表分页数据 + /// + /// 分页参数 + /// 查询参数 + /// + public IEnumerable GetPageList(Pagination pagination, string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.ID, + t.MeetID, + t.Title, + t.Content, + t.Files,m.MeetingTitle + "); + strSql.Append(" FROM MeetingMinutes t left join MeetingManagement m on t.MeetID=m.Id "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["MeetID"].IsEmpty()) + { + dp.Add("MeetID", queryParam["MeetID"].ToString(), DbType.String); + strSql.Append(" AND t.MeetID = @MeetID "); + } + if (!queryParam["MeetingTitle"].IsEmpty()) + { + dp.Add("MeetingTitle", "%" + queryParam["MeetingTitle"].ToString() + "%", DbType.String); + strSql.Append(" AND m.MeetingTitle Like @MeetingTitle "); + } + if (!queryParam["Title"].IsEmpty()) + { + dp.Add("Title", "%" + queryParam["Title"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Title Like @Title "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取页面显示列表数据 + /// + /// 查询参数 + /// + public IEnumerable GetList(string queryJson) + { + try + { + var strSql = new StringBuilder(); + strSql.Append("SELECT "); + strSql.Append(@" + t.ID, + t.MeetID, + t.Title, + t.Content, + t.Files + "); + strSql.Append(" FROM MeetingMinutes t "); + strSql.Append(" WHERE 1=1 "); + var queryParam = queryJson.ToJObject(); + // 虚拟参数 + var dp = new DynamicParameters(new { }); + if (!queryParam["MeetID"].IsEmpty()) + { + dp.Add("MeetID", "%" + queryParam["MeetID"].ToString() + "%", DbType.String); + strSql.Append(" AND t.MeetID Like @MeetID "); + } + if (!queryParam["Title"].IsEmpty()) + { + dp.Add("Title", "%" + queryParam["Title"].ToString() + "%", DbType.String); + strSql.Append(" AND t.Title Like @Title "); + } + return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 获取MeetingMinutes表实体数据 + /// 主键 + /// + /// + public MeetingMinutesEntity GetMeetingMinutesEntity(string keyValue) + { + try + { + return this.BaseRepository("CollegeMIS").FindEntity(keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + #region 提交数据 + + /// + /// 删除实体数据 + /// 主键 + /// + /// + public void DeleteEntity(string keyValue) + { + try + { + this.BaseRepository("CollegeMIS").Delete(t=>t.ID == keyValue); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + /// + /// 保存实体数据（新增、修改） + /// 主键 + /// + /// + public void SaveEntity( UserInfo userInfo, string keyValue, MeetingMinutesEntity entity) + { + try + { + if (!string.IsNullOrEmpty(keyValue)) + { + entity.Modify(keyValue,userInfo); + this.BaseRepository("CollegeMIS").Update(entity); + } + else + { + entity.Create(userInfo); + this.BaseRepository("CollegeMIS").Insert(entity); + } + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } + + #endregion + + } +} diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordBLL.cs index c7131b397..8f0018280 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordBLL.cs @@ -167,6 +167,25 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement } } + public bool Scan(string scanParamUserid, string scanParamMeetid) + { + try + { + return meetingSignInRecordService.Scan(scanParamUserid, scanParamMeetid); + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowBusinessException(ex); + } + } + } + #endregion } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordIBLL.cs index 7b9eeff05..5f4d427a6 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordIBLL.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordIBLL.cs @@ -59,5 +59,6 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement void DoSignIn(string keyValue, bool isSignIn); #endregion + bool Scan(string scanParamUserid, string scanParamMeetid); } } diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs index 7e2ebb286..f74004cf0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/MeetingSignInRecord/MeetingSignInRecordService.cs @@ -72,8 +72,8 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement try { var strSql = new StringBuilder(); - strSql.Append("SELECT t.* "); - strSql.Append(" FROM MeetingSignInRecord t "); + strSql.Append("SELECT t.*,m.MeetingTitle "); + strSql.Append(" FROM MeetingSignInRecord t left join MeetingManagement m on t.MeetID=m.Id "); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 @@ -211,5 +211,35 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement #endregion + public bool Scan(string scanParamUserid, string scanParamMeetid) + { + try + { + var result = false; + var meetEntity = this.BaseRepository("CollegeMIS") + .FindEntity(a => + a.MeetID == scanParamMeetid && a.ParticipantID == scanParamUserid); + if (meetEntity != null) + { + meetEntity.IsSignIn = true; + this.BaseRepository("CollegeMIS").Update(meetEntity); + result = true; + + } + return result; + + } + catch (Exception ex) + { + if (ex is ExceptionEx) + { + throw; + } + else + { + throw ExceptionEx.ThrowServiceException(ex); + } + } + } } } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js index cd62a9f37..06fcd95a4 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js @@ -6,14 +6,17 @@ export default { // 是否允许用户注册 "enableSignUp": true, //请求数据的接口地址；可以配置多个，开发环境下登录页会出现选择菜单供您选择 - "apiHost": [ - "http://123.57.209.16:31173/" - ], + // "apiHost": [ + // "http://123.57.209.16:31173/" + // ], // "apiHost": [ // "http://123.57.209.16:31174/learun/adms" // ], + // "apiHost": [ + // "http://localhost:8088/" + // ], "apiHost": [ - "http://localhost:8088/" + "http://192.168.2.98:8088/" ], // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示 "devAccount": [ diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json index 09129d5b8..7d231b5e7 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json @@ -954,6 +954,38 @@ "style": { "navigationBarTitleText": "详情" } + }, + //会议纪要 + { + "path": "pages/PersonnelManagement/MeetingMinutes/list", + "style": { + "navigationBarTitleText": "会议纪要" + } + }, + { + "path": "pages/PersonnelManagement/MeetingMinutes/single", + "style": { + "navigationBarTitleText": "详情" + } + }, + //会议签到记录 + { + "path": "pages/PersonnelManagement/MeetingSignInRecord/list", + "style": { + "navigationBarTitleText": "会议签到记录" + } + }, + { + "path": "pages/PersonnelManagement/MeetingSignInRecord/single", + "style": { + "navigationBarTitleText": "详情" + } + }, + { + "path": "pages/PersonnelManagement/MeetingSignInScan/list", + "style": { + "navigationBarTitleText": "会议扫码签到" + } } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue index 546d2e8e1..aae48d1d6 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingManagement/list.vue @@ -1,102 +1,124 @@  @@ -114,38 +136,38 @@ * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： * { "path": "pages/PersonnelManagement/MeetingManagement/list", "style": { "navigationBarTitleText": "表单列表页" } } - * + * * （navigationBarTitleText 字段为本页面的标题文本，可以修改） * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） */ -import moment from 'moment' -import get from 'lodash/get' -import set from 'lodash/set' -import pickBy from 'lodash/pickBy' -import mapValues from 'lodash/mapValues' +import moment from "moment"; +import get from "lodash/get"; +import set from "lodash/set"; +import pickBy from "lodash/pickBy"; +import mapValues from "lodash/mapValues"; export default { data() { return { // 数据项的数据类型、结构 scheme: { - MeetingTitle: { type: 'text' }, - MeetingPlace: { type: 'select', dataSource: '0' }, - BeginTime: { type: 'datetime', dateformat: '0' }, - EndTime: { type: 'datetime', dateformat: '0' }, - RecordPerson: { type: 'organize', dataType: 'user' }, - Content: { type: 'texteditor' }, - Files: { type: 'upload' }, - CreateUser: { type: 'organize', dataType: 'user' }, + MeetingTitle: { type: "text" }, + MeetingPlace: { type: "select", dataSource: "0" }, + BeginTime: { type: "datetime", dateformat: "0" }, + EndTime: { type: "datetime", dateformat: "0" }, + RecordPerson: { type: "organize", dataType: "user" }, + Content: { type: "texteditor" }, + Files: { type: "upload" }, + CreateUser: { type: "organize", dataType: "user" }, }, // 查询条件 searchData: {}, defaultQueryData: {}, queryData: { - MeetingTitle: '', - MeetingPlace: '', - CreateUser: '', + MeetingTitle: "", + MeetingPlace: "", + CreateUser: "", }, // 数据源 @@ -155,166 +177,202 @@ export default { // 页面相关参数 ready: false, - tips: '加载中...', - loadState: '向下翻以加载更多', + tips: "加载中...", + loadState: "向下翻以加载更多", sideOpen: false, // 列表与分页信息 page: 1, total: 2, - list: [] - } + list: [], + }; }, async onLoad() { - await this.init() + await this.init(); }, onUnload() { - this.OFF('PersonnelManagementMeetingManagement-list-change') + this.OFF("PersonnelManagementMeetingManagement-list-change"); }, methods: { // 页面初始化 async init() { - this.ON('PersonnelManagementMeetingManagement-list-change', this.refreshList) + this.ON( + "PersonnelManagementMeetingManagement-list-change", + this.refreshList + ); // 拉取加载列表和数据源 - await Promise.all([ - - - () => {} - ]) - await this.fetchList() + await Promise.all([() => {}]); + await this.fetchList(); // 初始化查询条件 - this.defaultQueryData = this.COPY(this.queryData) - this.ready = true + this.defaultQueryData = this.COPY(this.queryData); + this.ready = true; }, // 拉取列表 async fetchList() { - if (this.page > this.total) { return } + if (this.page > this.total) { + return; + } const result = await this.HTTP_GET( - 'learun/adms/PersonnelManagement/MeetingManagement/pagelist', + "learun/adms/PersonnelManagement/MeetingManagement/pagelist", { // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 - pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, - queryJson: JSON.stringify(this.searchData) + pagination: { rows: 10, page: this.page, sidx: "Id", sord: "DESC" }, + queryJson: JSON.stringify(this.searchData), }, - '加载数据时出错' - ) + "加载数据时出错" + ); - if (!result) { return } + if (!result) { + return; + } - this.total = result.total - this.page = result.page + 1 - this.list = this.list.concat(result.rows) + this.total = result.total; + this.page = result.page + 1; + this.list = this.list.concat(result.rows); - this.tips = `已加载 ${Math.min(result.page, result.total)} / ${result.total} 页，共 ${result.records} 项` - this.loadState = result.page >= result.total ? '已加载所有项目' : '向下翻以加载更多' + this.tips = `已加载 ${Math.min(result.page, result.total)} / ${ + result.total + } 页，共 ${result.records} 项`; + this.loadState = + result.page >= result.total ? "已加载所有项目" : "向下翻以加载更多"; }, // 刷新清空列表 async refreshList() { - this.page = 1 - this.total = 2 - this.list = [] + this.page = 1; + this.total = 2; + this.list = []; - await this.fetchList() + await this.fetchList(); }, // 列表下拉 pullDown() { this.refreshList().then(() => { - this.$refs.list.stopPullDown() - }) + this.$refs.list.stopPullDown(); + }); }, // 设置搜索条件 async searchChange() { - const result = {} + const result = {}; // 将其他查询项添加到查询 JSON 中 - const queryObj = pickBy(this.queryData, t => (Array.isArray(t) ? t.length > 0 : t)) - Object.assign(result, mapValues(queryObj, t => (Array.isArray(t) ? t.join(',') : t))) - - this.searchData = result - await this.refreshList() + const queryObj = pickBy(this.queryData, (t) => + Array.isArray(t) ? t.length > 0 : t + ); + Object.assign( + result, + mapValues(queryObj, (t) => (Array.isArray(t) ? t.join(",") : t)) + ); + + this.searchData = result; + await this.refreshList(); }, // 点击「清空查询条件」按钮 reset() { - this.queryData = this.COPY(this.defaultQueryData) - this.searchChange() + this.queryData = this.COPY(this.defaultQueryData); + this.searchChange(); }, // 点击「编辑」、「查看」、「添加」、「删除」按钮 - async action(type, id = '') { + async action(type, id = "") { switch (type) { - case 'view': - this.NAV_TO(`./single?type=view&id=${id}`) - return - - case 'add': - this.NAV_TO('./single?type=create') - return - - case 'edit': - this.NAV_TO(`./single?type=edit&id=${id}`) - return - - case 'delete': - if (!(await this.CONFIRM('删除项目', '确定要删除该项吗？', true))) { - return + case "view": + this.NAV_TO(`./single?type=view&id=${id}`); + return; + + case "add": + this.NAV_TO("./single?type=create"); + return; + + case "edit": + this.NAV_TO(`./single?type=edit&id=${id}`); + return; + case "join": + console.log(123); + this.NAV_TO(`/pages/PersonnelManagement/MeetingMinutes/list?meetId=${id}`); + return; + + case "delete": + if (!(await this.CONFIRM("删除项目", "确定要删除该项吗？", true))) { + return; } - this.HTTP_POST('learun/adms/PersonnelManagement/MeetingManagement/delete', id, '删除失败').then(success => { - if(!success) { return } - this.TOAST('删除成功', 'success') - this.refreshList() - }) - return + this.HTTP_POST( + "learun/adms/PersonnelManagement/MeetingManagement/delete", + id, + "删除失败" + ).then((success) => { + if (!success) { + return; + } + this.TOAST("删除成功", "success"); + this.refreshList(); + }); + return; default: - return + return; } }, // 显示列表中的标题项 displayListItem(item, field) { - const fieldItem = this.scheme[field] - const value = item[field] + const fieldItem = this.scheme[field]; + const value = item[field]; switch (fieldItem.type) { - case 'currentInfo': - case 'organize': - return fieldItem.dataType === 'time' ? value : get(this.GET_GLOBAL(fieldItem.dataType), `${value}.name`, '') - - case 'radio': - case 'select': - const selectItem = this.dataSource[field].find(t => t.value === String(value)) - return get(selectItem, 'text', '') - - case 'checkbox': - if (!value || value.split(',').length <= 0) { return '' } - const checkboxItems = value.split(',') - return this.dataSource[field].filter(t => checkboxItems.includes(t.value)).map(t => t.text).join('，') - - case 'datetime': - if (!value) { return '' } - return moment(value).format(Number(fieldItem.dateformat) === 0 ? 'YYYY年 M月 D日' : 'YYYY-MM-DD HH:mm') + case "currentInfo": + case "organize": + return fieldItem.dataType === "time" + ? value + : get(this.GET_GLOBAL(fieldItem.dataType), `${value}.name`, ""); + + case "radio": + case "select": + const selectItem = this.dataSource[field].find( + (t) => t.value === String(value) + ); + return get(selectItem, "text", ""); + + case "checkbox": + if (!value || value.split(",").length <= 0) { + return ""; + } + const checkboxItems = value.split(","); + return this.dataSource[field] + .filter((t) => checkboxItems.includes(t.value)) + .map((t) => t.text) + .join("，"); + + case "datetime": + if (!value) { + return ""; + } + return moment(value).format( + Number(fieldItem.dateformat) === 0 + ? "YYYY年 M月 D日" + : "YYYY-MM-DD HH:mm" + ); - default: return value === null || value === undefined ? '' : value + default: + return value === null || value === undefined ? "" : value; } - } - - } -} + }, + }, +}; diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMinutes/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMinutes/list.vue new file mode 100644 index 000000000..d80eb68d3 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMinutes/list.vue @@ -0,0 +1,338 @@ + + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMinutes/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMinutes/single.vue new file mode 100644 index 000000000..a8bdc7417 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingMinutes/single.vue @@ -0,0 +1,259 @@ + + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInRecord/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInRecord/list.vue index 956c9f643..478af1e78 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInRecord/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInRecord/list.vue @@ -155,7 +155,7 @@ export default { if (this.page > this.total) { return } const result = await this.HTTP_GET( - '/PersonnelManagement/MeetingSignInRecord/pagelist', + 'learun/adms/PersonnelManagement/MeetingSignInRecord/pagelist', { // 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) // 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInScan/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInScan/list.vue new file mode 100644 index 000000000..6384251dd --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInScan/list.vue @@ -0,0 +1,45 @@ + + + + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/list.vue index 157b75727..8fdd22950 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/WelcomNewStudents/ConfirmStudentsCheckIn/list.vue @@ -16,7 +16,6 @@ export default { init() { let _this = this; scanCodeFun.scanCodeFun().then(res => { - console.log(res); if(!res) return; this.NAV_TO('./from', { StuNo: res.result }, true); })