diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/VisitManage/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/VisitManage/Form.cshtml index 21d21df5b..e57f7d4eb 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/VisitManage/Form.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_Desktop/Views/VisitManage/Form.cshtml @@ -27,6 +27,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 1d8fe3921..0f8437269 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 @@ -220,6 +220,7 @@ + diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs index db158f172..b4a8cb922 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/BaseApi.cs @@ -191,7 +191,7 @@ namespace Learun.Application.WebApi ReqParameter req = this.Bind(); loginMark = req.loginMark; token = req.token; - if (path == "/learun/adms/user/login"|| path == "/learun/adms/user/loginbyIdCard" || path == "/" || path == "/bgimg" || path == "/learun/adms/user/img" || path == "/learun/adms/desktop/img"||path== "/learun/adms/user/imgfordc"||path== "/learun/adms/timetable/timeTableData"||path== "/quanjiang/sso/authorize") + if (path == "/learun/adms/user/login"|| path == "/learun/adms/user/loginbyIdCard" || path == "/" || path == "/bgimg" || path == "/learun/adms/user/img" || path == "/learun/adms/desktop/img"||path== "/learun/adms/user/imgfordc"||path== "/learun/adms/timetable/timeTableData"||path== "/quanjiang/sso/authorize"||path== "/learun/nologin/adms/annexes/upload"||path== "/learun/adms/annexes/wxlist" || path == "/learun/visitmanage/save") {// 登录接口,默认页面接口不做权限验证处理 return null; } diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/VisitmanageApi.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/VisitmanageApi.cs new file mode 100644 index 000000000..f91d6e751 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/VisitmanageApi.cs @@ -0,0 +1,46 @@ +using Learun.Application.Base.SystemModule; +using Learun.Application.TwoDevelopment.LR_Desktop; +using Learun.Util; +using Nancy; +using System; +using System.Collections.Generic; +using System.IO; + +namespace Learun.Application.WebApi.Modules +{ + public class VisitmanageApi : BaseApi + { + public VisitmanageApi() + : base("/learun/visitmanage") + { + + Post["/save"] = SaveForm; + } + private VisitManageBLL visitIBLL = new VisitManageBLL(); + + /// + /// 保存实体数据(新增、修改) + /// + /// + /// + public Response SaveForm(dynamic _) + { + ReqFormEntity parameter = this.GetReqData(); + VisitManageEntity entity = parameter.strEntity.ToObject(); + visitIBLL.SaveEntity(parameter.keyValue, entity); + return Success("保存成功!"); + } + + #region 私有类 + + /// + /// 表单实体类 + /// + private class ReqFormEntity + { + public string keyValue { get; set; } + public string strEntity { get; set; } + } + #endregion + } +} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config index 316299bb4..55c00eac0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/system.config @@ -65,7 +65,7 @@ - + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue index 253d333a7..8db683d9f 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/App.vue @@ -12,7 +12,7 @@ // H5 刷新时获取当前页面路径 const pagePath = "/" + param.path; // 如果 H5 刷新后访问的不是首页/登录页/注册页,直接跳转回首页 - if (!["/pages/login","/pages/weixinLogin","/pages/wxLogin", "/pages/home", "/pages/signup","/pages/my/newpassword"].includes(pagePath)) { + if (!["/pages/login","/pages/weixinLogin","/pages/wxLogin", "/pages/home", "/pages/signup","/pages/my/newpassword","/pages/visitmanage/index"].includes(pagePath)) { this.$nextTick(() => { this.TAB_TO("/pages/home"); return; diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/upload-file3.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/upload-file3.vue new file mode 100644 index 000000000..c15fd090e --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/upload-file3.vue @@ -0,0 +1,216 @@ + + + + + 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 9bf7fd002..96ce2789e 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json @@ -1251,6 +1251,13 @@ "style": { "navigationBarTitleText": "学生报修处理详情" } + }, + //到访预约 + { + "path": "pages/visitmanage/index", + "style": { + "navigationBarTitleText": "到访预约" + } } diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/visitmanage/index.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/visitmanage/index.vue new file mode 100644 index 000000000..a3ef182b6 --- /dev/null +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/visitmanage/index.vue @@ -0,0 +1,279 @@ + + + + +