diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_Main/_sgbak/Index.cshtml.45677.2.2019-11-19.15-27-53.3210 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_Main/_sgbak/Index.cshtml.45677.2.2019-11-19.15-27-53.3210 deleted file mode 100644 index 0b2354503..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Ask/Views/Ask_Main/_sgbak/Index.cshtml.45677.2.2019-11-19.15-27-53.3210 +++ /dev/null @@ -1,57 +0,0 @@ -@{ - ViewBag.Title = "问卷管理"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
-
-
-
分类
-
-
-
-
-
-
- 未选择分类 - 分类信息 -
-
-
-
-
-
-
-
标题
- -
-
-
问卷编号
- -
-
-
-
-
-
-
- -
-
-  新增 -  编辑 -  删除 -  管理问题 -  答题情况 -  结果分析 -  查看问卷 -
-
-   审核 -   去审核 -
-
-
-
-
-
-
-@Html.AppendJsFile("/Areas/Ask/Views/Ask_Main/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/_sgbak/StuInfoFreshController.cs.97030.5.2020-07-22.15-00-54.4936 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/_sgbak/StuInfoFreshController.cs.97030.5.2020-07-22.15-00-54.4936 deleted file mode 100644 index a7da809b4..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/_sgbak/StuInfoFreshController.cs.97030.5.2020-07-22.15-00-54.4936 +++ /dev/null @@ -1,1055 +0,0 @@ -using Learun.Application.Base.SystemModule; -using Learun.Application.TwoDevelopment.EducationalAdministration; -using Learun.Application.TwoDevelopment.LogisticsManagement; -using Learun.Application.TwoDevelopment.ReceiveSendFeeManagement; -using Learun.Util; -using Newtonsoft.Json; -using NPOI.HSSF.UserModel; -using NPOI.SS.UserModel; -using NPOI.XSSF.UserModel; -using System; -using System.Collections.Generic; -using System.Data; -using System.IO; -using System.Linq; -using System.Text; -using System.Web; -using System.Web.Mvc; - -namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers -{ - /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 - /// 创 建：超级管理员 - /// 日 期：2019-08-08 17:21 - /// 描 述：新生信息管理 - /// - public class StuInfoFreshController : MvcControllerBase - { - private StuInfoFreshIBLL stuInfoFreshIBLL = new StuInfoFreshBLL(); - private AnnexesFileIBLL annexesFileIBLL = new AnnexesFileBLL(); - private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL(); - private FinaChargesStandardIBLL finaChargesStandardIBLL = new FinaChargesStandardBLL(); - private AccommodationIBLL accommodationIBLL = new AccommodationBLL(); - private CdMajorIBLL cdMajorIBLL = new CdMajorBLL(); - private CdDeptIBLL cdDeptIBLL = new CdDeptBLL(); - - #region 视图功能 - - /// - /// 主页面 - /// - /// - [HttpGet] - public ActionResult Index() - { - return View(); - } - [HttpGet] - public ActionResult IndexDC() - { - return View(); - } - [HttpGet] - public ActionResult PrintSignFlow(string Id) - { - if (!string.IsNullOrEmpty(Id)) - { - var vwinfo = stuInfoFreshIBLL.GetStuInfoFreshEntity(Id); - vwinfo.MajorName = cdMajorIBLL.GetCdMajorEntityByMajorNo(vwinfo.MajorNo).MajorName; - return View(vwinfo); - } - else - { - return View(); - } - } - - /// - /// 根据区域统计 - /// - /// - [HttpGet] - public ActionResult StatisticsArea() - { - return View(); - } - - - /// - /// 表单页 - /// - /// - [HttpGet] - public ActionResult Form() - { - var url = Config.GetValue("defaultheadimg"); - ViewBag.Url = url; - return View(); - } - [HttpGet] - public ActionResult FormDC() - { - var url = Config.GetValue("defaultheadimg"); - ViewBag.Url = url; - return View(); - } - /// - /// 表单查看页 - /// - /// - [HttpGet] - public ActionResult FormView() - { - var url = Config.GetValue("defaultheadimg"); - ViewBag.Url = url; - return View(); - } - /// - /// 表单【学子在线】 - /// - /// - [HttpGet] - public ActionResult FormOfStudent() - { - var url = Config.GetValue("defaultheadimg"); - ViewBag.Url = url; - return View(); - } - /// - /// 新生报到管理页面 - /// - /// - [HttpGet] - public ActionResult RegisterIndex() - { - return View(); - } - /// - /// 新生档案管理页面 - /// - /// - [HttpGet] - public ActionResult CollectFileIndex() - { - return View(); - } - /// - /// 新生领取用品页面 - /// - /// - [HttpGet] - public ActionResult GetKeyIndex() - { - return View(); - } - /// - /// 新生缴费管理页面 - /// - /// - [HttpGet] - public ActionResult PayFeeIndex() - { - return View(); - } - /// - /// 新生缴费管理表单页 - /// - /// - [HttpGet] - public ActionResult PayFeeForm() - { - return View(); - } - - /// - /// 主页面【学子在线-新生信息完善】 - /// - /// - [HttpGet] - public ActionResult IndexOfStudent() - { - return View(); - } - /// - /// 分配班级 - /// - /// - [HttpGet] - public ActionResult AllocationClass() - { - return View(); - } - [HttpGet] - public ActionResult AllocationClassDC() - { - return View(); - } - /// - /// 分配宿舍 - /// - /// - [HttpGet] - public ActionResult AllocationDormitory() - { - return View(); - } - /// - /// 分配床位 - /// - /// - [HttpGet] - public ActionResult AllocationBed() - { - return View(); - } - /// - /// 导入床位页 - /// - /// - [HttpGet] - public ActionResult ImportBedForm() - { - return View(); - } - /// - /// 导出学生宿页舍 - /// - /// - [HttpGet] - public ActionResult ExportBedForm() - { - return View(); - } - /// - /// 新生信息统计 - /// - /// - [HttpGet] - public ActionResult StatisticIndex() - { - var academic = Common.GetSemesterAndYear(); - ViewBag.Grade = academic.AcademicYearShort.Substring(0, 2); - return View(); - } - #endregion - - #region 获取数据 - - /// - /// 获取列表数据 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetList(string queryJson) - { - var data = stuInfoFreshIBLL.GetList(queryJson); - return Success(data); - } - /// - /// 获取列表分页数据 - /// 分页参数 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetPageList(string pagination, string queryJson) - { - Pagination paginationobj = pagination.ToObject(); - var data = stuInfoFreshIBLL.GetPageList(paginationobj, queryJson); - foreach (var item in data) - { - if (item.SignUpTime.HasValue) - item.SignUpTime = item.SignUpTime.Value.ToShortDateString(); - } - var jsonData = new - { - rows = data, - total = paginationobj.total, - page = paginationobj.page, - records = paginationobj.records - }; - return Success(jsonData); - } - /// - /// 获取表单数据 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetFormData(string keyValue) - { - var StuInfoFreshData = stuInfoFreshIBLL.GetStuInfoFreshEntity(keyValue); - //获取头像地址 - var url = Config.GetValue("defaultheadimg"); - if (StuInfoFreshData.IsPhoto == true && !string.IsNullOrEmpty(StuInfoFreshData.Photo)) - { - var annexesFileEntity = annexesFileIBLL.GetEntity(StuInfoFreshData.Photo); - if (annexesFileEntity != null) - { - url = "/" + annexesFileEntity.F_FilePath.Substring(annexesFileEntity.F_FilePath.IndexOf("Resource")); - } - } - var StuInfoFreshEmergePeopleData = stuInfoFreshIBLL.GetStuInfoFreshEmergePeopleList(StuInfoFreshData.ID); - var StuInfoFreshFamilyData = stuInfoFreshIBLL.GetStuInfoFreshFamilyList(StuInfoFreshData.ID); - var jsonData = new - { - StuInfoFresh = StuInfoFreshData, - StuInfoFreshEmergePeople = StuInfoFreshEmergePeopleData, - StuInfoFreshFamily = StuInfoFreshFamilyData, - Url = url - }; - return Success(jsonData); - } - /// - /// 获取分配宿舍列表 - /// - /// - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetDormitorys(string pagination, string queryJson) - { - Pagination paginationobj = pagination.ToObject(); - var data = stuInfoFreshIBLL.GetDormitorys(paginationobj, queryJson); - var jsonData = new - { - rows = data, - total = paginationobj.total, - page = paginationobj.page, - records = paginationobj.records - }; - return Success(jsonData); - } - /// - /// 获取分配宿舍列表 - /// - /// - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetDormitorys2(string pagination, string queryJson) - { - Pagination paginationobj = pagination.ToObject(); - var data = stuInfoFreshIBLL.GetDormitorys2(paginationobj, queryJson); - var jsonData = new - { - rows = data, - total = paginationobj.total, - page = paginationobj.page, - records = paginationobj.records - }; - return Success(jsonData); - } - - /// - /// 获取分配宿舍左侧树形数据 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetDormitoryTree() - { - var data = stuInfoFreshIBLL.GetTree().OrderBy(x => x.value); - return Success(data); - } - - /// - /// 获取分配床位左侧树形数据 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetBedTree(string classNo, string gender) - { - var data = stuInfoFreshIBLL.GetBedTree(classNo, gender).OrderBy(x => x.text); - return Success(data); - } - #endregion - - #region 提交数据 - /// - /// 删除实体数据 - /// 主键 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult DeleteForm(string keyValue) - { - stuInfoFreshIBLL.DeleteEntity(keyValue); - return Success("删除成功！"); - } - /// - /// 保存实体数据（新增、修改） - /// 主键 - /// - /// - [HttpPost] - [ValidateAntiForgeryToken] - [AjaxOnly] - public ActionResult SaveForm(string keyValue, string strEntity, string strstuInfoFreshEmergePeopleList, string strstuInfoFreshFamilyList) - { - StuInfoFreshEntity entity = strEntity.ToObject(); - if (!string.IsNullOrEmpty(entity.Photo)) - { - entity.IsPhoto = true; - } - else - { - entity.IsPhoto = false; - } - List stuInfoFreshEmergePeopleList = strstuInfoFreshEmergePeopleList.ToObject>(); - List stuInfoFreshFamilyList = strstuInfoFreshFamilyList.ToObject>(); - stuInfoFreshIBLL.SaveEntity(keyValue, entity, stuInfoFreshEmergePeopleList, stuInfoFreshFamilyList); - return Success("保存成功！"); - } - - #endregion - - #region 扩展数据 - - /// - /// 拍照 - /// - /// - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult DoPhoto(string base64url) - { - var loginuser = LoginUserInfo.Get(); - //头像处理 - var folderId = Guid.NewGuid().ToString(); - - string filePath = Config.GetValue("AnnexesFile"); - string uploadDate = DateTime.Now.ToString("yyyyMMdd"); - string FileEextension = ".png"; - string fileGuid = Guid.NewGuid().ToString(); - - string virtualPath = string.Format("{0}/{1}/{2}/{3}{4}", filePath, loginuser.account, uploadDate, fileGuid, FileEextension); - - //创建文件夹 - string path = Path.GetDirectoryName(virtualPath); - Directory.CreateDirectory(path); - AnnexesFileEntity fileAnnexesEntity = new AnnexesFileEntity(); - if (!System.IO.File.Exists(virtualPath)) - { - byte[] bytes = Convert.FromBase64String(base64url.Replace("data:image/png;base64,", "")); - FileInfo file = new FileInfo(virtualPath); - FileStream fs = file.Create(); - fs.Write(bytes, 0, bytes.Length); - fs.Close(); - - //文件信息写入数据库 - fileAnnexesEntity.F_Id = fileGuid; - fileAnnexesEntity.F_FileName = "userphoto.png"; - fileAnnexesEntity.F_FilePath = virtualPath; - fileAnnexesEntity.F_FileSize = bytes.Length.ToString(); - fileAnnexesEntity.F_FileExtensions = FileEextension; - fileAnnexesEntity.F_FileType = FileEextension.Replace(".", ""); - fileAnnexesEntity.F_CreateUserId = loginuser.userId; - fileAnnexesEntity.F_CreateUserName = loginuser.realName; - annexesFileIBLL.SaveEntity(folderId, fileAnnexesEntity); - } - - var data = new - { - Url = virtualPath, - AnnexesFileId = fileGuid - }; - return Success(data); - } - - /// - ///确认报到、取消报到 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult IsRegister(string keyValue, string status) - { - stuInfoFreshIBLL.IsRegister(keyValue, status); - return Success("操作成功"); - } - /// - ///收取学生档案 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult IsCollectFile(string keyValue, string status) - { - stuInfoFreshIBLL.IsCollectFile(keyValue, status); - return Success("操作成功"); - } - /// - ///领取用品 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult IsGetKey(string keyValue, string status) - { - stuInfoFreshIBLL.IsGetKey(keyValue, status); - return Success("操作成功"); - } - /// - ///缴费 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult IsPayFee(string keyValue, string status) - { - stuInfoFreshIBLL.IsPayFee(keyValue, status); - return Success("操作成功"); - } - /// - /// 获取新生缴费明细 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetPayFeeDetail(string keyValue) - { - var StuInfoFreshData = stuInfoFreshIBLL.GetStuInfoFreshEntity(keyValue); - var FinaChargesStandardList = new List(); - if (!string.IsNullOrEmpty(StuInfoFreshData.ClassNo) && !string.IsNullOrEmpty(StuInfoFreshData.MajorNo)) - { - var ClassInfoEntity = classInfoIBLL.GetClassInfoEntityByClassNo(StuInfoFreshData.ClassNo); - if (ClassInfoEntity != null) - { - var academicAndYear = Common.GetSemesterAndYear(); - FinaChargesStandardList = finaChargesStandardIBLL.GetFinaChargesStandardListByMajorNoOfNotAll(StuInfoFreshData.MajorNo, academicAndYear.AcademicYearShort, academicAndYear.Semester, ClassInfoEntity.Grade).ToList(); - } - } - var PayFeeTotal = FinaChargesStandardList.Select(x => x.Standard).Sum(); - var jsonData = new - { - FinaChargesStandardList = FinaChargesStandardList, - PayFeeTotal = PayFeeTotal - }; - return Success(jsonData); - } - - /// - /// 分配班级 - /// - /// - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult DoAllocationClass(string classNo, string dataJson) - { - var StuInfoFreshList = JsonConvert.DeserializeObject>(dataJson); - var ClassInfoEntity = classInfoIBLL.GetClassInfoEntityByClassNo(classNo); - if (ClassInfoEntity == null) - { - return Fail("分配的班级不存在！"); - } - //获取当前班级已有人数 - var hasList = stuInfoFreshIBLL.GetStuInfoFreshListByClassNo(classNo); - var hasLength = hasList.Count(); - var tempLength = hasLength; - if (StuInfoFreshList.Any()) - { - foreach (var item in StuInfoFreshList) - { - tempLength++; - item.ClassNo = classNo; - item.DeptNo = ClassInfoEntity.DeptNo; - item.MajorNo = ClassInfoEntity.MajorNo; - item.Grade = ClassInfoEntity.Grade; - item.StuNo = string.Format("{0}{1}", classNo, tempLength < 10 ? "0" + tempLength : tempLength.ToString()); - } - } - stuInfoFreshIBLL.DoAllocationClass(StuInfoFreshList); - - return Success("分配成功！"); - } - - /// - /// 分配宿舍 - /// - /// - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult DoAllocationDormitory(string classNo, string dataJson) - { - var acc_DormitoryBuildEntities = JsonConvert.DeserializeObject>(dataJson); - foreach (var entity in acc_DormitoryBuildEntities) - { - //预分床位数量是否合理 - if (entity.PlanBedNum < 1) - { - return Fail("预分床位数量至少为1位！"); - } - if (entity.PlanBedNum > entity.RemainBedNum) - { - return Fail("预分床位数量不能超出可分配床位数量！"); - } - - entity.PlanClassNo = classNo; - } - stuInfoFreshIBLL.DoAllocationDormitory(acc_DormitoryBuildEntities); - return Success("分配成功！"); - } - - /// - /// 取消分配宿舍 - /// - /// - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult CancelAllocationDormitory(string classNo, string dataJson) - { - var acc_DormitoryBuildEntities = JsonConvert.DeserializeObject>(dataJson); - foreach (var entity in acc_DormitoryBuildEntities) - { - //取消已分配床位数量是否合理 - if (entity.CancelUseBedNum < 1) - { - return Fail("取消已分配床位数量至少为1位！"); - } - if (entity.CancelUseBedNum > entity.UseBedNum) - { - return Fail("取消已分配床位数量不能超出已分配床位数量！"); - } - - entity.PlanClassNo = classNo; - } - stuInfoFreshIBLL.CancelAllocationDormitory(acc_DormitoryBuildEntities); - return Success("取消分配成功！"); - } - - /// - /// 分配床位 - /// - /// - /// - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult DoAllocationBed(string dormitoryNo, string keyValue) - { - stuInfoFreshIBLL.DoAllocationBed(dormitoryNo, keyValue); - return Success("分配成功！"); - - } - - /// - /// 自动分配床位 - /// - /// - /// - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult DoAllocationBedOfAuto(string classNo) - { - stuInfoFreshIBLL.DoAllocationBedOfAuto(classNo); - return Success("分配成功！"); - - } - [HttpGet] - [AjaxOnly] - public ActionResult ConfirmDormitory() - { - stuInfoFreshIBLL.ConfirmDormitory(); - return Success("操作成功！"); - - } - [HttpGet] - [AjaxOnly] - public ActionResult ConfirmDormitoryTwo() - { - stuInfoFreshIBLL.ConfirmDormitoryTwo(); - return Success("操作成功！"); - - } - - /// - /// 导入学籍信息 - /// - /// - /// - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult ImportStuInfoBasic() - { - stuInfoFreshIBLL.ImportStuInfoBasic(); - return Success("导入学籍信息成功！"); - - } - - - /// - /// 导入床位 - /// - /// - public ActionResult ImportBed(HttpPostedFileBase filedata) - { - - if (filedata == null || filedata.FileName == null || filedata.ContentLength == 0) - { - if (Request.Files.Count > 0) - { - filedata = Request.Files[0]; - } - } - if (filedata == null) - { - return Fail("未获取到文件"); - } - - var pathoffirst = Config.GetValue("AnnexesFile"); - var pathofsecond = "/DormitoryBuildImportFile"; - var pathofthird = DateTime.Now.ToString("yyyyMMdd"); - var filename = filedata.FileName; - var exten = Path.GetExtension(filename); - var fileguid = Guid.NewGuid().ToString(); - var pathoffull = string.Format("{0}/{1}/{2}/{3}{4}", pathoffirst, pathofsecond, pathofthird, fileguid, exten); - var pathofdown = string.Format("{0}/{1}/{2}{3}", pathofsecond, pathofthird, fileguid, exten); - var directory = Path.GetDirectoryName(pathoffull); - if (!Directory.Exists(directory)) - { - Directory.CreateDirectory(directory); - } - //保存文件 - filedata.SaveAs(pathoffull); - //读取文件 - var filePath = pathoffull; - var strMsg = string.Empty; - IWorkbook wk = null; - string extension = System.IO.Path.GetExtension(filePath); - try - { - FileStream fs = System.IO.File.OpenRead(filePath); - if (extension.Equals(".xls")) - { - wk = new HSSFWorkbook(fs); - } - else - { - wk = new XSSFWorkbook(fs); - } - - fs.Close(); - //读取当前表数据 - ISheet sheet = wk.GetSheetAt(0); - - IRow row = sheet.GetRow(0); - int offset = 0; - //导入床位成功数量 - int bedSuccNum = 0; - var stuinfofreshlist = stuInfoFreshIBLL.GetList("{}"); - var accommodationList = accommodationIBLL.GetList(); - for (int i = 1; i <= sheet.LastRowNum; i++) - { - row = sheet.GetRow(i); - if (row != null) - { - //姓名0、学号1、班级2、宿舍楼3、单元4、楼层5、房间6、床位7 - var stuInfoFreshEntity = stuinfofreshlist.FirstOrDefault(m => m.StuNo == row.GetCell(1).ToString()); - if (stuInfoFreshEntity == null) - { - continue; - } - var classInfoEntity = classInfoIBLL.GetClassInfoEntityByClassName(row.GetCell(2).ToString()); - if (classInfoEntity == null) - { - continue; - } - if (accommodationList.Any()) - { - var build = accommodationList.FirstOrDefault(x => x.BuildType == "1" && x.Name == row.GetCell(3).ToString()); - if (build != null) - { - var unit = accommodationList.FirstOrDefault(x => x.BuildType == "2" && x.ParentID == build.ID && x.Name == row.GetCell(4).ToString()); - if (unit != null) - { - var floor = accommodationList.FirstOrDefault(x => x.BuildType == "3" && x.ParentID == unit.ID && x.Name == row.GetCell(5).ToString()); - if (floor != null) - { - var room = accommodationList.FirstOrDefault(x => x.BuildType == "4" && x.ParentID == floor.ID && x.Name == row.GetCell(6).ToString()); - if (room != null) - { - var bed = accommodationList.FirstOrDefault(x => x.BuildType == "5" && x.ParentID == room.ID && x.Name == row.GetCell(7).ToString()); - if (bed != null) - { - //分配床位 - stuInfoFreshIBLL.DoAllocationBed(bed.ID, stuInfoFreshEntity.ID); - bedSuccNum++; - //分配宿舍 - var alist = new List(); - var accommodationEntity = new Acc_DormitoryBuildEntity(); - accommodationEntity.ID = room.ID; - accommodationEntity.PlanBedNum = 1; - accommodationEntity.PlanClassNo = classInfoEntity.ClassNo; - accommodationEntity.bedId = bed.ID; - alist.Add(accommodationEntity); - stuInfoFreshIBLL.ImportDormitory(alist); - } - } - } - } - } - } - - } - } - strMsg = "导入床位成功" + bedSuccNum + "个！"; - } - - catch (Exception e) - { - return Fail("导入床位失败！" + strMsg); - } - - return Success("导入床位成功！" + strMsg); - - } - - /// - /// 导出学生宿舍信息 - /// - /// - public FileResult ExportBed(string queryJson) - { - var fileHead = "学生宿舍信息"; - var postData = JsonConvert.DeserializeObject(queryJson); - if (!string.IsNullOrEmpty(postData.ClassNo)) - { - var classInfoEntity = classInfoIBLL.GetClassInfoEntityByClassNo(postData.ClassNo); - fileHead = classInfoEntity?.ClassName + fileHead; - } - else if (!string.IsNullOrEmpty(postData.MajorNo)) - { - var majorEntity = cdMajorIBLL.GetCdMajorEntityByMajorNo(postData.MajorNo); - fileHead = majorEntity?.MajorName + fileHead; - } - else if (!string.IsNullOrEmpty(postData.DeptNo)) - { - var deptEntity = cdDeptIBLL.GetCdDeptEntityByNo(postData.DeptNo); - fileHead = deptEntity?.DeptName + fileHead; - } - - FileStreamResult result = null; - - HSSFWorkbook book = new HSSFWorkbook(); - ISheet sheet = book.CreateSheet("Sheet0"); - for (int i = 0; i <= 9; i++) - { - sheet.SetColumnWidth(i, 256 * 15); - } - IRow headrow = sheet.CreateRow(0); - headrow.CreateCell(0).SetCellValue(fileHead); - sheet.AddMergedRegion(new NPOI.SS.Util.CellRangeAddress(0, 0, 0, 9)); - IRow cellrow = sheet.CreateRow(1); - cellrow.CreateCell(0).SetCellValue("姓名"); - cellrow.CreateCell(1).SetCellValue("学号"); - cellrow.CreateCell(2).SetCellValue("系"); - cellrow.CreateCell(3).SetCellValue("专业"); - cellrow.CreateCell(4).SetCellValue("班级"); - cellrow.CreateCell(5).SetCellValue("宿舍楼"); - cellrow.CreateCell(6).SetCellValue("单元"); - cellrow.CreateCell(7).SetCellValue("楼层"); - cellrow.CreateCell(8).SetCellValue("房间"); - cellrow.CreateCell(9).SetCellValue("床位"); - - //获取数据源 - var data = stuInfoFreshIBLL.GetList(queryJson).ToList(); - foreach (var item in data) - { - var i = data.IndexOf(item); - IRow row = sheet.CreateRow(2 + i); - row.CreateCell(0).SetCellValue(item.StuName); - row.CreateCell(1).SetCellValue(item.StuNo); - row.CreateCell(2).SetCellValue(item.DeptName); - row.CreateCell(3).SetCellValue(item.MajorName); - row.CreateCell(4).SetCellValue(item.ClassName); - row.CreateCell(5).SetCellValue(item.Build); - row.CreateCell(6).SetCellValue(item.Unit); - row.CreateCell(7).SetCellValue(item.floor); - row.CreateCell(8).SetCellValue(item.Room); - row.CreateCell(9).SetCellValue(item.Bed); - } - - var fileguid = Guid.NewGuid().ToString(); - var path = Server.MapPath("~/Resource/DormitoryBuildExportFile/" + DateTime.Now.ToString("yyyyMMdd") + "/"); - var pathoffull = path + fileguid + ".xls"; - if (!Directory.Exists(path)) - { - Directory.CreateDirectory(path); - } - - FileStream fswrite = new FileStream(pathoffull, FileMode.OpenOrCreate, FileAccess.Write); - book.Write(fswrite); - fswrite.Close(); - FileStream fsread = new FileStream(pathoffull, FileMode.OpenOrCreate, FileAccess.Read); - result = File(fsread, "application/ms-excel", fileHead + ".xls"); - - return result; - } - - /// - /// 删除宿舍信息 - /// - /// - /// - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult DeleteBed(string keyValue) - { - stuInfoFreshIBLL.DeleteBed(keyValue); - return Success("删除成功！"); - - } - - - /// - /// 年级下拉框信息【新生信息统计】 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetGradeData() - { - var data = WebHelper.GenerateNearByYear2(); - - return Success(data); - } - /// - /// 获取列表数据 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetStatisticList(string queryJson) - { - var data = stuInfoFreshIBLL.GetList(queryJson); - var list = data.Where(x => !string.IsNullOrEmpty(x.MajorNo)).GroupBy(x => x.MajorNo).Select(x => new StatisticModel - { - MajorNo = x.Key, - MajorName = x.FirstOrDefault()?.MajorName, - Grade = x.FirstOrDefault()?.Grade, - TotalNum = x.Count(), - InfoNum = x.Count(y => y.IsStudentEdit == true), - RegisterNum = x.Count(y => y.RegisterStatus == "1"), - PayFeeNum = x.Count(y => y.PayFeeStatus == "1"), - GetKeyNum = x.Count(y => y.GetKeyStatus == "1"), - }).OrderBy(x => x.MajorNo); - - //var aa = new StatisticModel - //{ - // MajorNo = "全校", - // MajorName = "全校", - // Grade = list.FirstOrDefault()?.Grade, - // TotalNum = list.Select(x => x.TotalNum).Sum(), - // InfoNum = list.Select(x => x.InfoNum).Sum(), - // RegisterNum = list.Select(x => x.RegisterNum).Sum(), - // PayFeeNum = list.Select(x => x.PayFeeNum).Sum(), - // GetKeyNum = list.Select(x => x.GetKeyNum).Sum(), - //}; - - //var allList = new List(); - //allList.Add(aa); - //allList.AddRange(list); - - return Success(list); - - - } - public class StatisticModel - { - public string MajorNo { get; set; } - public string MajorName { get; set; } - public string Grade { get; set; } - public int TotalNum { get; set; } - public int InfoNum { get; set; } - public int RegisterNum { get; set; } - public int PayFeeNum { get; set; } - public int GetKeyNum { get; set; } - } - /// - /// 获取列表数据 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetStatisticArea(string queryJson) - { - var data = stuInfoFreshIBLL.GetList(queryJson); - var list = data.GroupBy(x => x.ProvinceNo).Select(x => new - { - ProvinceNo = x.Key, - TotalNum = x.Count(), - RegisterNum = x.Count(y => y.RegisterStatus == "1"), - BoyNum = x.Count(y => y.GenderNo == "1"), - GirlNum = x.Count(y => y.GenderNo == "0"), - }).OrderByDescending(a => a.TotalNum).ToList(); - var item = new - { - ProvinceNo = "总计", - TotalNum = data.Count(), - RegisterNum = data.Count(y => y.RegisterStatus == "1"), - BoyNum = data.Count(y => y.GenderNo == "1"), - GirlNum = data.Count(y => y.GenderNo == "0"), - }; - var zhounei = data.Where(a => a.ProvinceNo.Contains("5121")); - var item1 = new - { - ProvinceNo = "州内", - TotalNum = zhounei.Count(), - RegisterNum = zhounei.Count(y => y.RegisterStatus == "1"), - BoyNum = zhounei.Count(y => y.GenderNo == "1"), - GirlNum = zhounei.Count(y => y.GenderNo == "0"), - - }; - var zhouwai = data.Where(a => !a.ProvinceNo.Contains("5121")); - var item2 = new - { - - ProvinceNo = "州外", - TotalNum = zhouwai.Count(), - RegisterNum = zhouwai.Count(y => y.RegisterStatus == "1"), - BoyNum = zhouwai.Count(y => y.GenderNo == "1"), - GirlNum = zhouwai.Count(y => y.GenderNo == "0"), - }; - list.Add(item); - list.Add(item1); - list.Add(item2); - - // var jsonData = new - // { - // rows = list, - // total = list.Count(), - // page = 1, - // records = list.Count(); - //}; - return Success(list); - - - } - - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/_sgbak/StuScoreController.cs.49455.6.2020-01-07.16-34-05.7536 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/_sgbak/StuScoreController.cs.49455.6.2020-01-07.16-34-05.7536 deleted file mode 100644 index af3335705..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/_sgbak/StuScoreController.cs.49455.6.2020-01-07.16-34-05.7536 +++ /dev/null @@ -1,807 +0,0 @@ -using Hangfire; -using Learun.Application.Organization; -using Learun.Application.TwoDevelopment.EducationalAdministration; -using Learun.Util; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Web.Mvc; - -namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers -{ - /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 - /// 创 建：超级管理员 - /// 日 期：2019-06-14 11:02 - /// 描 述：考试成绩同步 - /// - public class StuScoreController : MvcControllerBase - { - private StuScoreIBLL stuScoreIBLL = new StuScoreBLL(); - private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL(); - private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL(); - private CdMajorIBLL cdMajorIBLL = new CdMajorBLL(); - private UserIBLL userIBLL = new UserBLL(); - - #region 视图功能 - - /// - /// 主页面 - /// - /// - [HttpGet] - public ActionResult Index() - { - return View(); - } - [HttpGet] - public ActionResult Monitor() - { - return View(); - } - /// - /// 表单页 - /// - /// - [HttpGet] - public ActionResult Form() - { - return View(); - } - /// - /// 主页面【班级学生成绩初始化】 - /// - /// - [HttpGet] - public ActionResult ClassIndex() - { - return View(); - } - /// - /// 班级成绩查看页面 - /// - /// - [HttpGet] - public ActionResult ScoreQueryIndex() - { - return View(); - } - /// - /// 全院班级成绩查看页面 - /// - /// - [HttpGet] - public ActionResult AllScoreQueryIndex() - { - return View(); - } - /// - /// 新版成绩录入 - /// - /// - [HttpGet] - public ActionResult InputScoreIndex() - { - return View(); - } - /// - /// 新版成绩录入 - /// - /// - [HttpGet] - public ActionResult InputScoreIndexInTeacher() - { - return View(); - } - /// - /// 成绩统计分析 - /// - /// - [HttpGet] - public ActionResult ScoreStatisticAnalysis() - { - return View(); - } - - /// - /// 学生成绩录入可去审核页面 - /// - /// - [HttpGet] - public ActionResult ScoreInputCancelIndex() - { - return View(); - } - /// - /// 学生成绩录入可去审核页面 - /// - /// - [HttpGet] - public ActionResult ScoreInputCancelForm() - { - return View(); - } - #endregion - - #region 获取数据 - - /// - /// 获取列表数据 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetList(string queryJson) - { - var data = stuScoreIBLL.GetList(queryJson); - return Success(data); - } - [HttpGet] - [AjaxOnly] - public ActionResult GetMonitorList(string queryJson) - { - var data = stuScoreIBLL.GetMonitorList(queryJson); - return Success(data); - } - /// - /// 获取列表分页数据 - /// 分页参数 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetPageList(string pagination, string queryJson) - { - Pagination paginationobj = pagination.ToObject(); - var data = stuScoreIBLL.GetPageList(paginationobj, queryJson); - var jsonData = new - { - rows = data, - total = paginationobj.total, - page = paginationobj.page, - records = paginationobj.records - }; - return Success(jsonData); - } - /// - /// 获取表单数据 - /// 主键 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetFormData(string keyValue) - { - var data = stuScoreIBLL.GetEntity(keyValue); - return Success(data); - } - /// - /// 获取列表分页数据 - /// 分页参数 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetScoreInputCancelPageList(string pagination, string queryJson) - { - Pagination paginationobj = pagination.ToObject(); - - var aa = JsonConvert.DeserializeObject(queryJson); - - var data = new List(); - if (!string.IsNullOrEmpty(aa.AcademicYearNo) || !string.IsNullOrEmpty(aa.Semester) || !string.IsNullOrEmpty(aa.EmpNo) || !string.IsNullOrEmpty(aa.LessonNo) || !string.IsNullOrEmpty(aa.ClassNo) || !string.IsNullOrEmpty(aa.StuNo)) - { - data = stuScoreIBLL.GetScoreInputCancelPageList(paginationobj, queryJson).ToList(); - } - var jsonData = new - { - rows = data, - total = paginationobj.total, - page = paginationobj.page, - records = paginationobj.records - }; - return Success(jsonData); - } - /// - /// 获取表单数据 - /// 主键 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetScoreInputCancelFormData(string keyValue) - { - var data = stuScoreIBLL.GetEntity(keyValue); - var StuSelectLessonListData = stuScoreIBLL.GetStuSelectLessonListEntity(data); - var jsonData = new - { - StuScore = data, - StuSelectLessonList = StuSelectLessonListData - }; - return Success(jsonData); - } - - /// - /// 获取列表数据 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetEntityByJson(string queryJson) - { - var data = stuScoreIBLL.GetEntityByJson(queryJson); - return Success(data); - } - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// 主键 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult DeleteForm(string keyValue) - { - stuScoreIBLL.DeleteEntity(keyValue); - return Success("删除成功！"); - } - [HttpPost] - [AjaxOnly] - public ActionResult Submit(string AcademicYearNo, string Semester, string LessonNo, string TeachClassNo, string EmpNo, string EditUserId) - { - stuScoreIBLL.SubmitStuScore(AcademicYearNo, Semester, LessonNo, TeachClassNo, EmpNo); - - var userEntity = userIBLL.GetEntityByAccount(EditUserId); - var name = EditUserId + "_" + userEntity?.F_RealName + "_成绩录入"; - //删除任务 - RecurringJob.RemoveIfExists(name); - - return Success("操作成功！"); - } - - [HttpPost] - [AjaxOnly] - public ActionResult SyncList() - { - stuScoreIBLL.SyncList(); - return Success("同步成功！"); - } - - [HttpPost] - [AjaxOnly] - public ActionResult DeleteList() - { - stuScoreIBLL.DeleteList(); - return Success("清空成功！"); - } - /// - /// 保存实体数据（新增、修改） - /// 主键 - /// - /// - [HttpPost] - [ValidateAntiForgeryToken] - [AjaxOnly] - public ActionResult SaveForm(string keyValue, StuScoreEntity entity) - { - stuScoreIBLL.SaveEntity(keyValue, entity); - return Success("保存成功！"); - } - #endregion - - #region 扩展数据 - - /// - /// 获取班级成绩初始化分页数据 - /// 分页参数 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetPageListAboutClass(string pagination, string queryJson) - { - Pagination paginationobj = pagination.ToObject(); - var data = stuScoreIBLL.GetPageListAboutClass(paginationobj, queryJson); - var jsonData = new - { - rows = data, - total = paginationobj.total, - page = paginationobj.page, - records = paginationobj.records - }; - return Success(jsonData); - } - - /// - /// 班级学生成绩录入初始化 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult DoInitAboutClass(string academicYearNo, string semester, string classNo) - { - stuScoreIBLL.DoInitAboutClass(academicYearNo, semester, classNo); - return Success("初始化成功！"); - } - - /// - /// 学年下拉框信息【班级成绩查看】 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetAcademicYearNoData() - { - var data = stuScoreIBLL.GetAcademicYearNoData(); - - return Success(data); - } - /// - /// 学期下拉框信息【班级成绩查看】 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetSemesterData() - { - var data = WebHelper.GenerateNearBySemeter(); - - return Success(data); - } - /// - /// 班级下拉框信息【成绩录入新页面】 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetClassNoDataOfAll(string lessonNo) - { - var data = stuScoreIBLL.GetClassNoData("", "", lessonNo); - - return Success(data); - } - /// - /// 班级下拉框信息【班级成绩查看】 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetClassNoData(string lessonNo) - { - var loginInfo = LoginUserInfo.Get(); - var data = stuScoreIBLL.GetClassNoData(loginInfo.account, loginInfo.Description, lessonNo); - - return Success(data); - } - /// - /// 班级下拉框信息【全院班级成绩查看】 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetAllClassNoData() - { - var data = stuScoreIBLL.GetClassNoData("", "", ""); - - return Success(data); - } - /// - /// 教师下拉框信息【学生成绩录入可去审核】 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetEmpNoData() - { - var loginInfo = LoginUserInfo.Get(); - var data = stuScoreIBLL.GetEmpNoData(loginInfo.account, loginInfo.Description); - - return Success(data); - } - /// - /// 课程下拉框信息【学生成绩录入可去审核】 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetLessonNoDataOfAll() - { - var loginInfo = LoginUserInfo.Get(); - var data = stuScoreIBLL.GetLessonNoDataOfAll(loginInfo.account, loginInfo.Description); - - return Success(data); - } - /// - /// 课程下拉框 带编号 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetLessonNoDataOfAllWithNo() - { - var data = stuScoreIBLL.GetLessonNoDataOfAll("", ""); - foreach (var item in data) - { - item.text = string.Format("{0}({1})", item.text, item.value); - } - - return Success(data); - } - /// - /// 课程下拉框 带编号 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetLessonNoDataWithNo() - { - var loginInfo = LoginUserInfo.Get(); - var data = stuScoreIBLL.GetLessonNoDataOfAll(loginInfo.account, loginInfo.Description); - foreach (var item in data) - { - item.text = string.Format("{0}({1})", item.text, item.value); - } - - return Success(data); - } - /// - /// 课程信息【班级成绩查看】 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetLessonNoData(string academicYearNo, string semester, string classNo) - { - var data = stuScoreIBLL.GetLessonNoData(academicYearNo, semester, classNo).OrderBy(x => x.value); - - return Success(data); - } - - /// - /// 获取班级成绩列表 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetScoreListByClassNo(string queryJson) - { - var data = stuScoreIBLL.GetScoreListByClassNo(queryJson); - - var aa = data.GroupBy(x => new { x.StuNo, x.StuName, x.StuId }).Select(x => new - { - StuId = x.Key.StuId, - StuNo = x.Key.StuNo, - StuName = x.Key.StuName, - TotalScore = x.Select(y => y.Score).Sum(), - LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score }).OrderBy(y => y.LessonNo) - }).OrderByDescending(x => x.TotalScore); - - var result = new List>(); - foreach (var item in aa) - { - var aaa = new Dictionary(); - aaa.Add("StuId", item.StuId); - aaa.Add("StuNo", item.StuNo); - aaa.Add("StuName", item.StuName); - aaa.Add("TotalScore", item.TotalScore.ToString()); - foreach (var lessonInfoItem in item.LessonInfo) - { - aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.Score.ToString()); - } - - result.Add(aaa); - } - - return Success(result); - } - - public ActionResult GetScoreCharts(string AcademicYearNo, string Semester, string ClassNo, string LessonNo) - { - var data = stuScoreIBLL.GetScoreCharts(AcademicYearNo, Semester, ClassNo, LessonNo); - return Success(data); - } - - [HttpGet] - [AjaxOnly] - public ActionResult GetScoreInfo(string queryJson) - { - var data = stuScoreIBLL.GetScoreInfo(queryJson); - return JsonResult(data); - } - - /// - /// 导出班级成绩列表 - /// - /// - //[HttpGet] - //[AjaxOnly] - [HttpPost, ValidateInput(false)] - public ActionResult ExportScoreListByClassNo(string queryJson) - { - var queryModel = JsonConvert.DeserializeObject(queryJson); - var className = string.Empty; - if (!string.IsNullOrEmpty(queryModel.ClassNo)) - { - var classInfoEntity = classInfoIBLL.GetClassInfoEntityByClassNo(queryModel.ClassNo); - className = classInfoEntity != null ? classInfoEntity.ClassName : string.Empty; - } - - var data = stuScoreIBLL.GetScoreListByClassNo(queryJson); - var aa = data.GroupBy(x => new { x.StuNo, x.StuName }).Select(x => new - { - StuNo = x.Key.StuNo, - StuName = x.Key.StuName, - TotalScore = x.Select(y => y.Score).Sum(), - LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score }).OrderBy(y => y.LessonNo) - }).OrderByDescending(x => x.TotalScore); - var result = new List>(); - foreach (var item in aa) - { - var aaa = new Dictionary(); - aaa.Add("StuNo", item.StuNo); - aaa.Add("StuName", item.StuName); - aaa.Add("TotalScore", item.TotalScore.ToString()); - foreach (var lessonInfoItem in item.LessonInfo) - { - aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.Score.ToString()); - } - - result.Add(aaa); - } - var resultStr = JsonConvert.SerializeObject(result); - - //班级成绩源 - var exportTable = resultStr.ToTable(); - //设置导出格式 - ExcelConfig excelconfig = new ExcelConfig(); - excelconfig.Title = className + " 班级成绩列表"; - excelconfig.TitleFont = "微软雅黑"; - excelconfig.TitlePoint = 20; - excelconfig.FileName = className + " 班级成绩导出.xls"; - excelconfig.IsAllSizeColumn = true; - //每一列的设置,没有设置的列信息，系统将按datatable中的列名导出 - excelconfig.ColumnEntity = new List(); - excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "StuNo", ExcelColumn = "学号" }); - excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "StuName", ExcelColumn = "姓名" }); - excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "TotalScore", ExcelColumn = "总分" }); - - //课程动态列 - var lessonTemp = stuScoreIBLL.GetLessonNoData(queryModel.AcademicYearNo, queryModel.Semester, queryModel.ClassNo).OrderBy(x => x.value); - foreach (var lessonTempItem in lessonTemp) - { - excelconfig.ColumnEntity.Add(new ColumnModel() { Column = lessonTempItem.value, ExcelColumn = lessonTempItem.text }); - } - - //调用导出方法 - ExcelHelper.ExcelDownload(exportTable, excelconfig); - - return Success("导出成功！"); - } - /// - /// 查询条件模型【班级成绩查看】 - /// - public class QueryModel - { - public string AcademicYearNo { get; set; } - public string Semester { get; set; } - public string ClassNo { get; set; } - } - - /// - /// 获取打印成绩单数据 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetScoreListByStuNoList(string stuNoList) - { - var dataList = new List(); - var stuNoArr = stuNoList.Split(','); - foreach (var stuNo in stuNoArr) - { - var stuInfoBasicEntity = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(stuNo); - if (stuInfoBasicEntity != null) - { - var classInfoEntity = classInfoIBLL.GetClassInfoEntityByClassNo(stuInfoBasicEntity.ClassNo); - var cdMajorEntity = cdMajorIBLL.GetCdMajorEntityByMajorNo(stuInfoBasicEntity.MajorNo); - var scoreList = stuScoreIBLL.GetAllScoreListByStuNo(stuNo); - var scoreListOfSortNo1 = scoreList.Where(x => x.LessonSortNo == "1"); //必修课 - if (scoreListOfSortNo1.Any()) - { - foreach (var item in scoreListOfSortNo1) - { - if ((item.Score >= 0 && item.Score < 60) || item.Score == (-5) || item.Score == (-10)) - { - item.StuNo = stuNo; - var scoreNotPassEntity = stuScoreIBLL.GetScoreNotPassByEntity(item); - if (scoreNotPassEntity != null) - { - item.Score = scoreNotPassEntity.Score; - if ((scoreNotPassEntity.Score >= 0 && scoreNotPassEntity.Score < 60) || scoreNotPassEntity.Score == (-5) || scoreNotPassEntity.Score == (-10)) - { - scoreNotPassEntity.StuNo = stuNo; - var scoreNotPassTwoEntity = stuScoreIBLL.GetScoreNotPassTwoByEntity(scoreNotPassEntity); - if (scoreNotPassTwoEntity != null) - { - item.Score = scoreNotPassTwoEntity.Score; - } - } - } - } - } - } - - var list = scoreList.GroupBy(x => new { x.AcademicYearNo, x.Semester }).Select(x => new - { - academicYearNo = x.Key.AcademicYearNo, - semester = x.Key.Semester, - title = string.Format("{0}学年度第{1}学期", x.Key.AcademicYearNo, x.Key.Semester), - list = x.Select(y => new - { - type = y.LessonSortNo == "1" ? "专业课" : y.LessonSortNo == "2" ? "选修课" : "公共课", - className = y.LessonName, - achievement = y.Score.HasValue ? y.Score.Value.ToString() : string.Empty, - lessonNo = y.LessonNo - }).OrderBy(y => y.lessonNo) - }).OrderByDescending(x => x.academicYearNo).OrderByDescending(x => x.semester); - - var data = new - { - schoolId = stuInfoBasicEntity.F_SchoolId, - school = string.Empty, - major = cdMajorEntity != null ? cdMajorEntity.MajorName : string.Empty, - className = classInfoEntity != null ? classInfoEntity.ClassName : string.Empty, - student = stuInfoBasicEntity.StuName, - number = stuInfoBasicEntity.StuNo, - arrangementId = stuInfoBasicEntity.EduSystem, - arrangement = string.Empty, - list = list.Select(x => new { x.title, list = x.list.Select(y => new { y.type, y.className, y.achievement }) }) - }; - - dataList.Add(data); - } - } - - return Success(dataList); - } - - /// - /// 审核学生成绩 - /// - /// 成绩主键 - /// - [HttpPost] - [AjaxOnly] - public ActionResult CheckStuScore(string keyValue) - { - stuScoreIBLL.CheckStuScore(keyValue); - return Success("操作成功！"); - } - /// - /// 去审核学生成绩 - /// - /// 成绩主键 - /// - [HttpPost] - [AjaxOnly] - public ActionResult UnCheckStuScore(string keyValue) - { - stuScoreIBLL.UnCheckStuScore(keyValue); - return Success("操作成功！"); - } - - /// - /// 开始录入：占用成绩 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult StartInputScore(string queryJson) - { - var loginInfo = LoginUserInfo.Get(); - var name = loginInfo.account + "_" + loginInfo.realName + "_成绩录入"; - stuScoreIBLL.StartInputScore(queryJson); - //添加任务 - //RecurringJob.AddOrUpdate(name, - // () => SaveInputScoreStatus2(queryJson, name), - // Cron.MinuteInterval(3), TimeZoneInfo.Local); - var m = DateTime.Now.Minute + 30; - if (m >= 60) - { - m = m - 60; - } - RecurringJob.AddOrUpdate(name, - () => SaveInputScoreStatus2(queryJson, name), - m + " * * * * ", TimeZoneInfo.Local); - return Success("操作成功"); - } - /// - /// 续时 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult AddMinutes(string queryJson, int minutes) - { - var loginInfo = LoginUserInfo.Get(); - var name = loginInfo.account + "_" + loginInfo.realName + "_成绩录入"; - //更新任务 - var m = DateTime.Now.Minute + minutes; - if (m >= 60) - { - m = m - 60; - } - RecurringJob.AddOrUpdate(name, - () => SaveInputScoreStatus2(queryJson, name), - m + " * * * * ", TimeZoneInfo.Local); - return Success("操作成功"); - } - - /// - /// 提交成绩 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult SaveInputScore(string data) - { - var list = JsonConvert.DeserializeObject>(data); - if (list.Any()) - { - stuScoreIBLL.SaveInputScore(list); - } - return Success("操作成功"); - } - /// - /// 提交成绩：取消占用 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult SaveInputScoreStatus(string queryJson) - { - var loginInfo = LoginUserInfo.Get(); - var name = loginInfo.account + "_" + loginInfo.realName + "_成绩录入"; - - stuScoreIBLL.SaveInputScoreStatus(queryJson); - //删除任务 - RecurringJob.RemoveIfExists(name); - - return Success("操作成功"); - } - /// - /// 提交成绩：取消占用【服务】 - /// - /// - public ActionResult SaveInputScoreStatus2(string queryJson, string name) - { - stuScoreIBLL.SaveInputScoreStatus2(queryJson, name); - //删除任务 - RecurringJob.RemoveIfExists(name); - - return Success("操作成功"); - } - - /// - /// 审核成绩 - /// - /// - /// 已审核：1；未审核：0； - /// - [HttpPost] - [AjaxOnly] - public ActionResult DoCheckScore(string queryJson, int checkMark) - { - stuScoreIBLL.DoCheckScore(queryJson, checkMark); - return Success("操作成功"); - } - - #endregion - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/_sgbak/StuScoreController.cs.49455.6.2020-01-07.16-53-43.9256 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/_sgbak/StuScoreController.cs.49455.6.2020-01-07.16-53-43.9256 deleted file mode 100644 index e1474a821..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/_sgbak/StuScoreController.cs.49455.6.2020-01-07.16-53-43.9256 +++ /dev/null @@ -1,807 +0,0 @@ -using Hangfire; -using Learun.Application.Organization; -using Learun.Application.TwoDevelopment.EducationalAdministration; -using Learun.Util; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Web.Mvc; - -namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers -{ - /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 - /// 创 建：超级管理员 - /// 日 期：2019-06-14 11:02 - /// 描 述：考试成绩同步 - /// - public class StuScoreController : MvcControllerBase - { - private StuScoreIBLL stuScoreIBLL = new StuScoreBLL(); - private ClassInfoIBLL classInfoIBLL = new ClassInfoBLL(); - private StuInfoBasicIBLL stuInfoBasicIBLL = new StuInfoBasicBLL(); - private CdMajorIBLL cdMajorIBLL = new CdMajorBLL(); - private UserIBLL userIBLL = new UserBLL(); - - #region 视图功能 - - /// - /// 主页面 - /// - /// - [HttpGet] - public ActionResult Index() - { - return View(); - } - [HttpGet] - public ActionResult Monitor() - { - return View(); - } - /// - /// 表单页 - /// - /// - [HttpGet] - public ActionResult Form() - { - return View(); - } - /// - /// 主页面【班级学生成绩初始化】 - /// - /// - [HttpGet] - public ActionResult ClassIndex() - { - return View(); - } - /// - /// 班级成绩查看页面 - /// - /// - [HttpGet] - public ActionResult ScoreQueryIndex() - { - return View(); - } - /// - /// 全院班级成绩查看页面 - /// - /// - [HttpGet] - public ActionResult AllScoreQueryIndex() - { - return View(); - } - /// - /// 新版成绩录入 - /// - /// - [HttpGet] - public ActionResult InputScoreIndex() - { - return View(); - } - /// - /// 新版成绩录入 - /// - /// - [HttpGet] - public ActionResult InputScoreIndexInTeacher() - { - return View(); - } - /// - /// 成绩统计分析 - /// - /// - [HttpGet] - public ActionResult ScoreStatisticAnalysis() - { - return View(); - } - - /// - /// 学生成绩录入可去审核页面 - /// - /// - [HttpGet] - public ActionResult ScoreInputCancelIndex() - { - return View(); - } - /// - /// 学生成绩录入可去审核页面 - /// - /// - [HttpGet] - public ActionResult ScoreInputCancelForm() - { - return View(); - } - #endregion - - #region 获取数据 - - /// - /// 获取列表数据 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetList(string queryJson) - { - var data = stuScoreIBLL.GetList(queryJson); - return Success(data); - } - [HttpGet] - [AjaxOnly] - public ActionResult GetMonitorList(string queryJson) - { - var data = stuScoreIBLL.GetMonitorList(queryJson); - return Success(data); - } - /// - /// 获取列表分页数据 - /// 分页参数 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetPageList(string pagination, string queryJson) - { - Pagination paginationobj = pagination.ToObject(); - var data = stuScoreIBLL.GetPageList(paginationobj, queryJson); - var jsonData = new - { - rows = data, - total = paginationobj.total, - page = paginationobj.page, - records = paginationobj.records - }; - return Success(jsonData); - } - /// - /// 获取表单数据 - /// 主键 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetFormData(string keyValue) - { - var data = stuScoreIBLL.GetEntity(keyValue); - return Success(data); - } - /// - /// 获取列表分页数据 - /// 分页参数 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetScoreInputCancelPageList(string pagination, string queryJson) - { - Pagination paginationobj = pagination.ToObject(); - - var aa = JsonConvert.DeserializeObject(queryJson); - - var data = new List(); - if (!string.IsNullOrEmpty(aa.AcademicYearNo) || !string.IsNullOrEmpty(aa.Semester) || !string.IsNullOrEmpty(aa.EmpNo) || !string.IsNullOrEmpty(aa.LessonNo) || !string.IsNullOrEmpty(aa.ClassNo) || !string.IsNullOrEmpty(aa.StuNo)) - { - data = stuScoreIBLL.GetScoreInputCancelPageList(paginationobj, queryJson).ToList(); - } - var jsonData = new - { - rows = data, - total = paginationobj.total, - page = paginationobj.page, - records = paginationobj.records - }; - return Success(jsonData); - } - /// - /// 获取表单数据 - /// 主键 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetScoreInputCancelFormData(string keyValue) - { - var data = stuScoreIBLL.GetEntity(keyValue); - var StuSelectLessonListData = stuScoreIBLL.GetStuSelectLessonListEntity(data); - var jsonData = new - { - StuScore = data, - StuSelectLessonList = StuSelectLessonListData - }; - return Success(jsonData); - } - - /// - /// 获取列表数据 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetEntityByJson(string queryJson) - { - var data = stuScoreIBLL.GetEntityByJson(queryJson); - return Success(data); - } - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// 主键 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult DeleteForm(string keyValue) - { - stuScoreIBLL.DeleteEntity(keyValue); - return Success("删除成功！"); - } - [HttpPost] - [AjaxOnly] - public ActionResult Submit(string AcademicYearNo, string Semester, string LessonNo, string TeachClassNo, string EmpNo, string EditUserId) - { - stuScoreIBLL.SubmitStuScore(AcademicYearNo, Semester, LessonNo, TeachClassNo, EmpNo); - - var userEntity = userIBLL.GetEntityByAccount(EditUserId); - var name = EditUserId + "_" + userEntity?.F_RealName + "_成绩录入"; - //删除任务 - RecurringJob.RemoveIfExists(name); - - return Success("操作成功！"); - } - - [HttpPost] - [AjaxOnly] - public ActionResult SyncList() - { - stuScoreIBLL.SyncList(); - return Success("同步成功！"); - } - - [HttpPost] - [AjaxOnly] - public ActionResult DeleteList() - { - stuScoreIBLL.DeleteList(); - return Success("清空成功！"); - } - /// - /// 保存实体数据（新增、修改） - /// 主键 - /// - /// - [HttpPost] - [ValidateAntiForgeryToken] - [AjaxOnly] - public ActionResult SaveForm(string keyValue, StuScoreEntity entity) - { - stuScoreIBLL.SaveEntity(keyValue, entity); - return Success("保存成功！"); - } - #endregion - - #region 扩展数据 - - /// - /// 获取班级成绩初始化分页数据 - /// 分页参数 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetPageListAboutClass(string pagination, string queryJson) - { - Pagination paginationobj = pagination.ToObject(); - var data = stuScoreIBLL.GetPageListAboutClass(paginationobj, queryJson); - var jsonData = new - { - rows = data, - total = paginationobj.total, - page = paginationobj.page, - records = paginationobj.records - }; - return Success(jsonData); - } - - /// - /// 班级学生成绩录入初始化 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult DoInitAboutClass(string academicYearNo, string semester, string classNo) - { - stuScoreIBLL.DoInitAboutClass(academicYearNo, semester, classNo); - return Success("初始化成功！"); - } - - /// - /// 学年下拉框信息【班级成绩查看】 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetAcademicYearNoData() - { - var data = stuScoreIBLL.GetAcademicYearNoData(); - - return Success(data); - } - /// - /// 学期下拉框信息【班级成绩查看】 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetSemesterData() - { - var data = WebHelper.GenerateNearBySemeter(); - - return Success(data); - } - /// - /// 班级下拉框信息【成绩录入新页面】 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetClassNoDataOfAll(string lessonNo) - { - var data = stuScoreIBLL.GetClassNoData("", "", lessonNo); - - return Success(data); - } - /// - /// 班级下拉框信息【班级成绩查看】 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetClassNoData(string lessonNo) - { - var loginInfo = LoginUserInfo.Get(); - var data = stuScoreIBLL.GetClassNoData(loginInfo.account, loginInfo.Description, lessonNo); - - return Success(data); - } - /// - /// 班级下拉框信息【全院班级成绩查看】 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetAllClassNoData() - { - var data = stuScoreIBLL.GetClassNoData("", "", ""); - - return Success(data); - } - /// - /// 教师下拉框信息【学生成绩录入可去审核】 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetEmpNoData() - { - var loginInfo = LoginUserInfo.Get(); - var data = stuScoreIBLL.GetEmpNoData(loginInfo.account, loginInfo.Description); - - return Success(data); - } - /// - /// 课程下拉框信息【学生成绩录入可去审核】 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetLessonNoDataOfAll() - { - var loginInfo = LoginUserInfo.Get(); - var data = stuScoreIBLL.GetLessonNoDataOfAll(loginInfo.account, loginInfo.Description); - - return Success(data); - } - /// - /// 课程下拉框 带编号 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetLessonNoDataOfAllWithNo() - { - var data = stuScoreIBLL.GetLessonNoDataOfAll("", ""); - foreach (var item in data) - { - item.text = string.Format("{0}({1})", item.text, item.value); - } - - return Success(data); - } - /// - /// 课程下拉框 带编号 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetLessonNoDataWithNo() - { - var loginInfo = LoginUserInfo.Get(); - var data = stuScoreIBLL.GetLessonNoDataOfAll(loginInfo.account, loginInfo.Description); - foreach (var item in data) - { - item.text = string.Format("{0}({1})", item.text, item.value); - } - - return Success(data); - } - /// - /// 课程信息【班级成绩查看】 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetLessonNoData(string academicYearNo, string semester, string classNo) - { - var data = stuScoreIBLL.GetLessonNoData(academicYearNo, semester, classNo).OrderBy(x => x.value); - - return Success(data); - } - - /// - /// 获取班级成绩列表 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetScoreListByClassNo(string queryJson) - { - var data = stuScoreIBLL.GetScoreListByClassNo(queryJson); - - var aa = data.GroupBy(x => new { x.StuNo, x.StuName, x.StuId }).Select(x => new - { - StuId = x.Key.StuId, - StuNo = x.Key.StuNo, - StuName = x.Key.StuName, - TotalScore = x.Select(y => y.Score).Sum(), - LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score }).OrderBy(y => y.LessonNo) - }).OrderByDescending(x => x.TotalScore); - - var result = new List>(); - foreach (var item in aa) - { - var aaa = new Dictionary(); - aaa.Add("StuId", item.StuId); - aaa.Add("StuNo", item.StuNo); - aaa.Add("StuName", item.StuName); - aaa.Add("TotalScore", item.TotalScore.ToString()); - foreach (var lessonInfoItem in item.LessonInfo) - { - aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.Score.ToString()); - } - - result.Add(aaa); - } - - return Success(result); - } - - public ActionResult GetScoreCharts(string AcademicYearNo, string Semester, string ClassNo, string LessonNo) - { - var data = stuScoreIBLL.GetScoreCharts(AcademicYearNo, Semester, ClassNo, LessonNo); - return Success(data); - } - - [HttpGet] - [AjaxOnly] - public ActionResult GetScoreInfo(string queryJson) - { - var data = stuScoreIBLL.GetScoreInfo(queryJson); - return JsonResult(data); - } - - /// - /// 导出班级成绩列表 - /// - /// - //[HttpGet] - //[AjaxOnly] - [HttpPost, ValidateInput(false)] - public ActionResult ExportScoreListByClassNo(string queryJson) - { - var queryModel = JsonConvert.DeserializeObject(queryJson); - var className = string.Empty; - if (!string.IsNullOrEmpty(queryModel.ClassNo)) - { - var classInfoEntity = classInfoIBLL.GetClassInfoEntityByClassNo(queryModel.ClassNo); - className = classInfoEntity != null ? classInfoEntity.ClassName : string.Empty; - } - - var data = stuScoreIBLL.GetScoreListByClassNo(queryJson); - var aa = data.GroupBy(x => new { x.StuNo, x.StuName }).Select(x => new - { - StuNo = x.Key.StuNo, - StuName = x.Key.StuName, - TotalScore = x.Select(y => y.Score).Sum(), - LessonInfo = x.Select(y => new { y.LessonNo, y.LessonName, y.Score }).OrderBy(y => y.LessonNo) - }).OrderByDescending(x => x.TotalScore); - var result = new List>(); - foreach (var item in aa) - { - var aaa = new Dictionary(); - aaa.Add("StuNo", item.StuNo); - aaa.Add("StuName", item.StuName); - aaa.Add("TotalScore", item.TotalScore.ToString()); - foreach (var lessonInfoItem in item.LessonInfo) - { - aaa.Add(lessonInfoItem.LessonNo, lessonInfoItem.Score.ToString()); - } - - result.Add(aaa); - } - var resultStr = JsonConvert.SerializeObject(result); - - //班级成绩源 - var exportTable = resultStr.ToTable(); - //设置导出格式 - ExcelConfig excelconfig = new ExcelConfig(); - excelconfig.Title = className + " 班级成绩列表"; - excelconfig.TitleFont = "微软雅黑"; - excelconfig.TitlePoint = 20; - excelconfig.FileName = className + " 班级成绩导出.xls"; - excelconfig.IsAllSizeColumn = true; - //每一列的设置,没有设置的列信息，系统将按datatable中的列名导出 - excelconfig.ColumnEntity = new List(); - excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "StuNo", ExcelColumn = "学号" }); - excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "StuName", ExcelColumn = "姓名" }); - excelconfig.ColumnEntity.Add(new ColumnModel() { Column = "TotalScore", ExcelColumn = "总分" }); - - //课程动态列 - var lessonTemp = stuScoreIBLL.GetLessonNoData(queryModel.AcademicYearNo, queryModel.Semester, queryModel.ClassNo).OrderBy(x => x.value); - foreach (var lessonTempItem in lessonTemp) - { - excelconfig.ColumnEntity.Add(new ColumnModel() { Column = lessonTempItem.value, ExcelColumn = lessonTempItem.text }); - } - - //调用导出方法 - ExcelHelper.ExcelDownload(exportTable, excelconfig); - - return Success("导出成功！"); - } - /// - /// 查询条件模型【班级成绩查看】 - /// - public class QueryModel - { - public string AcademicYearNo { get; set; } - public string Semester { get; set; } - public string ClassNo { get; set; } - } - - /// - /// 获取打印成绩单数据 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetScoreListByStuNoList(string stuNoList) - { - var dataList = new List(); - var stuNoArr = stuNoList.Split(','); - foreach (var stuNo in stuNoArr) - { - var stuInfoBasicEntity = stuInfoBasicIBLL.GetStuInfoBasicEntityByStuNo(stuNo); - if (stuInfoBasicEntity != null) - { - var classInfoEntity = classInfoIBLL.GetClassInfoEntityByClassNo(stuInfoBasicEntity.ClassNo); - var cdMajorEntity = cdMajorIBLL.GetCdMajorEntityByMajorNo(stuInfoBasicEntity.MajorNo); - var scoreList = stuScoreIBLL.GetAllScoreListByStuNo(stuNo); - var scoreListOfSortNo1 = scoreList.Where(x => x.LessonSortNo == "1"); //必修课 - if (scoreListOfSortNo1.Any()) - { - foreach (var item in scoreListOfSortNo1) - { - if ((item.Score >= 0 && item.Score < 60) || item.Score == (-5) || item.Score == (-10)) - { - item.StuNo = stuNo; - var scoreNotPassEntity = stuScoreIBLL.GetScoreNotPassByEntity(item); - if (scoreNotPassEntity != null) - { - item.Score = scoreNotPassEntity.Score; - if ((scoreNotPassEntity.Score >= 0 && scoreNotPassEntity.Score < 60) || scoreNotPassEntity.Score == (-5) || scoreNotPassEntity.Score == (-10)) - { - scoreNotPassEntity.StuNo = stuNo; - var scoreNotPassTwoEntity = stuScoreIBLL.GetScoreNotPassTwoByEntity(scoreNotPassEntity); - if (scoreNotPassTwoEntity != null) - { - item.Score = scoreNotPassTwoEntity.Score; - } - } - } - } - } - } - - var list = scoreList.GroupBy(x => new { x.AcademicYearNo, x.Semester }).Select(x => new - { - academicYearNo = x.Key.AcademicYearNo, - semester = x.Key.Semester, - title = string.Format("{0}学年度第{1}学期", x.Key.AcademicYearNo, x.Key.Semester), - list = x.Select(y => new - { - type = y.LessonSortNo == "1" ? "专业课" : y.LessonSortNo == "2" ? "选修课" : "公共课", - className = y.LessonName, - achievement = y.Score.HasValue ? y.Score.Value.ToString() : string.Empty, - lessonNo = y.LessonNo - }).OrderBy(y => y.lessonNo) - }).OrderByDescending(x => x.academicYearNo).OrderByDescending(x => x.semester); - - var data = new - { - schoolId = stuInfoBasicEntity.F_SchoolId, - school = string.Empty, - major = cdMajorEntity != null ? cdMajorEntity.MajorName : string.Empty, - className = classInfoEntity != null ? classInfoEntity.ClassName : string.Empty, - student = stuInfoBasicEntity.StuName, - number = stuInfoBasicEntity.StuNo, - arrangementId = stuInfoBasicEntity.EduSystem, - arrangement = string.Empty, - list = list.Select(x => new { x.title, list = x.list.Select(y => new { y.type, y.className, y.achievement }) }) - }; - - dataList.Add(data); - } - } - - return Success(dataList); - } - - /// - /// 审核学生成绩 - /// - /// 成绩主键 - /// - [HttpPost] - [AjaxOnly] - public ActionResult CheckStuScore(string keyValue) - { - stuScoreIBLL.CheckStuScore(keyValue); - return Success("操作成功！"); - } - /// - /// 去审核学生成绩 - /// - /// 成绩主键 - /// - [HttpPost] - [AjaxOnly] - public ActionResult UnCheckStuScore(string keyValue) - { - stuScoreIBLL.UnCheckStuScore(keyValue); - return Success("操作成功！"); - } - - /// - /// 开始录入：占用成绩 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult StartInputScore(string queryJson) - { - var loginInfo = LoginUserInfo.Get(); - var name = loginInfo.account + "_" + loginInfo.realName + "_成绩录入"; - stuScoreIBLL.StartInputScore(queryJson); - //添加任务 - RecurringJob.AddOrUpdate(name, - () => SaveInputScoreStatus2(queryJson, name), - Cron.MinuteInterval(3), TimeZoneInfo.Local); - var m = DateTime.Now.Minute + 30; - if (m >= 60) - { - m = m - 60; - } - RecurringJob.AddOrUpdate(name, - () => SaveInputScoreStatus2(queryJson, name), - m + " * * * * ", TimeZoneInfo.Local); - return Success("操作成功"); - } - /// - /// 续时 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult AddMinutes(string queryJson, int minutes) - { - var loginInfo = LoginUserInfo.Get(); - var name = loginInfo.account + "_" + loginInfo.realName + "_成绩录入"; - //更新任务 - var m = DateTime.Now.Minute + minutes; - if (m >= 60) - { - m = m - 60; - } - RecurringJob.AddOrUpdate(name, - () => SaveInputScoreStatus2(queryJson, name), - m + " * * * * ", TimeZoneInfo.Local); - return Success("操作成功"); - } - - /// - /// 提交成绩 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult SaveInputScore(string data) - { - var list = JsonConvert.DeserializeObject>(data); - if (list.Any()) - { - stuScoreIBLL.SaveInputScore(list); - } - return Success("操作成功"); - } - /// - /// 提交成绩：取消占用 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult SaveInputScoreStatus(string queryJson) - { - var loginInfo = LoginUserInfo.Get(); - var name = loginInfo.account + "_" + loginInfo.realName + "_成绩录入"; - - stuScoreIBLL.SaveInputScoreStatus(queryJson); - //删除任务 - RecurringJob.RemoveIfExists(name); - - return Success("操作成功"); - } - /// - /// 提交成绩：取消占用【服务】 - /// - /// - public ActionResult SaveInputScoreStatus2(string queryJson, string name) - { - stuScoreIBLL.SaveInputScoreStatus2(queryJson, name); - //删除任务 - RecurringJob.RemoveIfExists(name); - - return Success("操作成功"); - } - - /// - /// 审核成绩 - /// - /// - /// 已审核：1；未审核：0； - /// - [HttpPost] - [AjaxOnly] - public ActionResult DoCheckScore(string queryJson, int checkMark) - { - stuScoreIBLL.DoCheckScore(queryJson, checkMark); - return Success("操作成功"); - } - - #endregion - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/_sgbak/Sys_ReceiveDocumentController.cs.30887.1.2019-10-23.10-34-30.4966 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/_sgbak/Sys_ReceiveDocumentController.cs.30887.1.2019-10-23.10-34-30.4966 deleted file mode 100644 index 276baa567..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/_sgbak/Sys_ReceiveDocumentController.cs.30887.1.2019-10-23.10-34-30.4966 +++ /dev/null @@ -1,145 +0,0 @@ -using Learun.Util; -using System.Data; -using Learun.Application.TwoDevelopment.EducationalAdministration; -using System.Web.Mvc; -using System.Collections.Generic; - -namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers -{ - /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 - /// 创 建：超级管理员 - /// 日 期：2019-04-11 10:08 - /// 描 述：公文收发 - /// - public class Sys_ReceiveFileController : MvcControllerBase - { - private Sys_ReceiveFileIBLL sys_ReceiveFileIBLL = new Sys_ReceiveFileBLL(); - - #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 = sys_ReceiveFileIBLL.GetPageList(paginationobj, queryJson); - var jsonData = new - { - rows = data, - total = paginationobj.total, - page = paginationobj.page, - records = paginationobj.records - }; - return Success(jsonData); - } - /// - /// 获取页面显示列表数据 - /// - /// 查询参数 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetPageListByUserId(string pagination, string queryJson) - { - var UserInfoEntity = LoginUserInfo.Get(); - Pagination paginationobj = pagination.ToObject(); - var data = sys_ReceiveFileIBLL.GetPageListByUserId(paginationobj, queryJson, UserInfoEntity.userId); - var jsonData = new - { - rows = data, - total = paginationobj.total, - page = paginationobj.page, - records = paginationobj.records - }; - return Success(jsonData); - } - /// - /// 获取表单数据 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetFormData(string keyValue) - { - var Sys_ReceiveFileData = sys_ReceiveFileIBLL.GetSys_ReceiveFileEntity(keyValue); - var jsonData = new - { - Sys_ReceiveFile = Sys_ReceiveFileData, - }; - return Success(jsonData); - } - #endregion - - #region 提交数据 - - /// - /// 删除实体数据 - /// 主键 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult DeleteForm(string keyValue) - { - sys_ReceiveFileIBLL.VirtualDeleteEntity(keyValue); - return Success("删除成功！"); - } - /// - /// 保存实体数据（新增、修改） - /// 主键 - /// - /// - [HttpPost] - [ValidateAntiForgeryToken] - [AjaxOnly] - public ActionResult SaveForm(string keyValue, string strEntity) - { - Sys_ReceiveFileEntity entity = strEntity.ToObject(); - sys_ReceiveFileIBLL.SaveEntity(keyValue, entity); - return Success("保存成功！"); - } - /// - /// 查看实体数据 - /// 主键 - /// - /// - [HttpPost] - [AjaxOnly] - public ActionResult Read(string keyValue) - { - sys_ReceiveFileIBLL.ReadEntity(keyValue); - return Success("保存成功！"); - } - #endregion - - } -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/DataTableForm.cshtml.44800.2.2019-11-13.16-46-31.0767 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/DataTableForm.cshtml.44800.2.2019-11-13.16-46-31.0767 deleted file mode 100644 index cbdcfbc73..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/DataTableForm.cshtml.44800.2.2019-11-13.16-46-31.0767 +++ /dev/null @@ -1,23 +0,0 @@ -@{ - ViewBag.Title = "表单设计数据表添加"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -
-
-
数据表名*
-
-
-
-
数据表字段*
-
-
-
-
被关联表
-
-
-
-
被关联表字段
-
-
-
-@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/DataTableForm.js") \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/DataTableForm.js.44801.3.2019-11-13.16-46-31.1817 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/DataTableForm.js.44801.3.2019-11-13.16-46-31.1817 deleted file mode 100644 index a58dbaee6..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/DataTableForm.js.44801.3.2019-11-13.16-46-31.1817 +++ /dev/null @@ -1,93 +0,0 @@ -/* - * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2018 上海力软信息技术有限公司 - * 创建人：力软-前端开发组 - * 日 期：2017.04.11 - * 描 述：表单设计数据表添加 - */ -var dbId = request('dbId'); - -var selectedRow = top.layer_Form.selectedRow; -var dbTable = top.layer_Form.dbTable; - - -var acceptClick; -var bootstrap = function ($, learun) { - "use strict"; - - var page = { - init: function () { - page.bind(); - page.initData(); - }, - bind: function () { - $('#field').lrselect({ - value: 'f_column', - text: 'f_column', - title: 'f_remark', - allowSearch: true - }); - $('#relationField').lrselect({ - value: 'f_column', - text: 'f_column', - title: 'f_remark', - allowSearch: true - }); - $('#name').lrselect({ - url: top.$.rootUrl + '/LR_SystemModule/DatabaseTable/GetList', - param: { databaseLinkId: dbId }, - value: 'name', - text: 'name', - title: 'tdescription', - allowSearch: true, - select: function (item) { - if (!!item) { - $('#field').lrselectRefresh({ - url: top.$.rootUrl + '/LR_SystemModule/DatabaseTable/GetFieldList', - param: { databaseLinkId: dbId, tableName: item.name } - }); - } - } - }); - $('#relationName').lrselect({ - data: dbTable, - param: { databaseLinkId: dbId }, - value: 'name', - text: 'name', - maxHeight: 160, - allowSearch: true, - select: function (item) { - if (!!item) { - $('#relationField').lrselectRefresh({ - url: top.$.rootUrl + '/LR_SystemModule/DatabaseTable/GetFieldList', - param: { databaseLinkId: dbId, tableName: item.name } - }); - } - } - }); - }, - initData: function () { - if (!!selectedRow) { - $('#form').lrSetFormData(selectedRow); - } - } - }; - // 保存数据 - acceptClick = function (callBack) { - if (!$('#form').lrValidform()) { - return false; - } - - var data = $('#form').lrGetFormData(); - if (data.name == data.relationName) - { - learun.alert.error('关联表不能是自己本身！'); - return false; - } - if (!!callBack) { - callBack(data); - } - return true; - }; - page.init(); -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Form.cshtml.16561.1.2019-11-13.10-45-14.9117 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Form.cshtml.16561.1.2019-11-13.10-45-14.9117 deleted file mode 100644 index f0f38f198..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Form.cshtml.16561.1.2019-11-13.10-45-14.9117 +++ /dev/null @@ -1,66 +0,0 @@ -@{ - ViewBag.Title = "自定义表单设计"; - Layout = "~/Views/Shared/_CustmerFormDesigner.cshtml"; -} -@Html.AppendCssFile("/Areas/LR_FormModule/Views/Custmerform/Form.css") -
-
-
    -
  • 1基本配置
    • -
  • 2数据表设置
    • -
  • 3表单设计
    • -
-
-
-
-
-
- - 请你填写表单信息，用于创建或修改表单！ -
-
-
-
-

表单基本信息配置

-
-
- -
-
表单名称*
- -
-
-
表单分类*
-
-
-
-
备注
- -
-
-
-
-
-
-
- -
-  新增 -  编辑 -  删除 -
-
-
-
-
-
-
- - -
-@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Form.cshtml.16561.1.2019-11-13.16-46-31.1847 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Form.cshtml.16561.1.2019-11-13.16-46-31.1847 deleted file mode 100644 index f0f38f198..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Form.cshtml.16561.1.2019-11-13.16-46-31.1847 +++ /dev/null @@ -1,66 +0,0 @@ -@{ - ViewBag.Title = "自定义表单设计"; - Layout = "~/Views/Shared/_CustmerFormDesigner.cshtml"; -} -@Html.AppendCssFile("/Areas/LR_FormModule/Views/Custmerform/Form.css") -
-
-
    -
  • 1基本配置
    • -
  • 2数据表设置
    • -
  • 3表单设计
    • -
-
-
-
-
-
- - 请你填写表单信息，用于创建或修改表单！ -
-
-
-
-

表单基本信息配置

-
-
- -
-
表单名称*
- -
-
-
表单分类*
-
-
-
-
备注
- -
-
-
-
-
-
-
- -
-  新增 -  编辑 -  删除 -
-
-
-
-
-
-
- - -
-@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Form.css.16562.1.2019-11-13.10-45-14.9667 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Form.css.16562.1.2019-11-13.10-45-14.9667 deleted file mode 100644 index 9f71c6adb..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Form.css.16562.1.2019-11-13.10-45-14.9667 +++ /dev/null @@ -1,73 +0,0 @@ -.step-pane-base { - padding:10px; - padding-top:69px; -} -.lr-alert { - position:absolute; - top:10px; - left:0; - height:59px; - width:100%; - padding:0 10px; -} -.lr-alert .alert { - margin-bottom:0; -} -.lr-alert .alert > i { - position: relative; - top: 1px; - font-size: 15px; - padding-right: 5px; -} -.lr-panel { - position:relative; - width:100%; - height:100%; - margin-bottom:0; - padding-top:38px; -} -.lr-panel .panel-heading { - position:absolute; - top:0; - left:0; - width:100%; - height:38px; -} -.lr-panel .panel-body { - position:relative; - width:100%; - height:100%; - padding:91px 0 15px 0; -} -.lr-form-item { - position:absolute; - top:0; - left:0; - height:38px; - width:100%; - padding-right:20px; -} - -.wizard { - z-index:3; -} -.btn-tool-bar { - position:absolute; - top:0; - width:100%; - text-align:right; - padding:5px; - border-bottom:1px solid #ddd; -} -.step-gird-pane { - padding-top:41px; -} -.btn-tool-bar-left { - position:absolute; - left:5px; - top:6px; - width:300px; - height:28px; - z-index:4; - text-align:left; -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Form.css.16562.1.2019-11-13.16-46-31.1887 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Form.css.16562.1.2019-11-13.16-46-31.1887 deleted file mode 100644 index 9f71c6adb..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Form.css.16562.1.2019-11-13.16-46-31.1887 +++ /dev/null @@ -1,73 +0,0 @@ -.step-pane-base { - padding:10px; - padding-top:69px; -} -.lr-alert { - position:absolute; - top:10px; - left:0; - height:59px; - width:100%; - padding:0 10px; -} -.lr-alert .alert { - margin-bottom:0; -} -.lr-alert .alert > i { - position: relative; - top: 1px; - font-size: 15px; - padding-right: 5px; -} -.lr-panel { - position:relative; - width:100%; - height:100%; - margin-bottom:0; - padding-top:38px; -} -.lr-panel .panel-heading { - position:absolute; - top:0; - left:0; - width:100%; - height:38px; -} -.lr-panel .panel-body { - position:relative; - width:100%; - height:100%; - padding:91px 0 15px 0; -} -.lr-form-item { - position:absolute; - top:0; - left:0; - height:38px; - width:100%; - padding-right:20px; -} - -.wizard { - z-index:3; -} -.btn-tool-bar { - position:absolute; - top:0; - width:100%; - text-align:right; - padding:5px; - border-bottom:1px solid #ddd; -} -.step-gird-pane { - padding-top:41px; -} -.btn-tool-bar-left { - position:absolute; - left:5px; - top:6px; - width:300px; - height:28px; - z-index:4; - text-align:left; -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Form.js.44802.3.2019-11-13.16-46-31.1917 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Form.js.44802.3.2019-11-13.16-46-31.1917 deleted file mode 100644 index 05b896c60..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Form.js.44802.3.2019-11-13.16-46-31.1917 +++ /dev/null @@ -1,201 +0,0 @@ -/* - * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2018 上海力软信息技术有限公司 - * 创建人：力软-前端开发组 - * 日 期：2017.04.05 - * 描 述：自定义表单设计 - */ -var keyValue = request('keyValue'); -var categoryId = request('categoryId'); -var dbTable = []; -var dbId = ''; - -var selectedRow = null; -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.bind(); - page.initData(); - }, - /*绑定事件和初始化控件*/ - bind: function () { - // 加载导向 - $('#wizard').wizard().on('change', function (e, data) { - var $finish = $("#btn_finish"); - var $next = $("#btn_next"); - if (data.direction == "next") { - if (data.step == 1) { - if (!$('#step-1').lrValidform()) { - return false; - } - } else if (data.step == 2) { - dbTable = $('#gridtable').jfGridGet('rowdatas'); - if (dbId == '' || dbTable.length == 0) { - learun.alert.error('至少选择一张数据表'); - return false; - } - $('#step-3').lrCustmerFormDesigner('updatedb', { dbId: dbId, dbTable: dbTable }); - - $finish.removeAttr('disabled'); - $next.attr('disabled', 'disabled'); - } - else { - $finish.attr('disabled', 'disabled'); - } - } else { - $finish.attr('disabled', 'disabled'); - $next.removeAttr('disabled'); - } - }); - - // 数据库表选择 - $('#F_DbId').lrselect({ - url: top.$.rootUrl + '/LR_SystemModule/DatabaseLink/GetTreeList', - type: 'tree', - placeholder:'请选择数据库', - allowSearch: true, - select: function (item) { - if (item.hasChildren) { - dbId = ''; - dbTable = []; - $('#gridtable').jfGridSet('refreshdata', []); - } - else if (dbId != item.id) { - dbId = item.id; - dbTable = []; - $('#gridtable').jfGridSet('refreshdata', []); - } - } - }); - $('#F_Category').lrDataItemSelect({ code: 'FormSort' }); - $('#F_Category').lrselectSet(categoryId); - // 新增 - $('#lr_db_add').on('click', function () { - dbTable = $('#gridtable').jfGridGet('rowdatas'); - selectedRow = null; - learun.layerForm({ - id: 'DataTableForm', - title: '添加数据表', - url: top.$.rootUrl + '/LR_FormModule/Custmerform/DataTableForm?dbId=' + dbId, - width: 600, - height: 400, - callBack: function (id) { - return top[id].acceptClick(function (data) { - $('#gridtable').jfGridSet('addRow', data); - }); - } - }); - }); - // 编辑 - $('#lr_db_edit').on('click', function () { - dbTable = $('#gridtable').jfGridGet('rowdatas'); - selectedRow = $('#gridtable').jfGridGet('rowdata'); - var keyValue = $('#gridtable').jfGridValue('name'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'DataTableForm', - title: '编辑数据表', - url: top.$.rootUrl + '/LR_FormModule/Custmerform/DataTableForm?dbId=' + dbId, - width: 600, - height: 400, - callBack: function (id) { - return top[id].acceptClick(function (data) { - $.extend(selectedRow, data); - $('#gridtable').jfGridSet('updateRow'); - }); - } - }); - } - }); - // 删除 - $('#lr_db_delete').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('name'); - if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res, index) { - if (res) { - $('#gridtable').jfGridSet('removeRow', keyValue); - top.layer.close(index); //再执行关闭 - } - }); - } - }); - $('#gridtable').jfGrid({ - headData: [ - { label: "数据表名", name: "name", width: 200, align: "left" }, - { label: "数据表字段", name: "field", width: 200, align: "left" }, - { label: "被关联表", name: "relationName", width: 200, align: "left" }, - { label: "被关联表字段", name: "relationField", width: 200, align: "left" } - ], - mainId: 'name', - reloadSelected: true - }); - - - - // 设计页面初始化 - $('#step-3').lrCustmerFormDesigner('init'); - // 保存数据按钮 - $("#btn_finish").on('click', page.save); - $("#btn_draft").on('click', page.draftsave); - }, - - /*初始化数据*/ - initData: function () { - if (!!keyValue) { - $.lrSetForm(top.$.rootUrl + '/LR_FormModule/Custmerform/GetFormData?keyValue=' + keyValue, function (data) {// - $('#step-1').lrSetFormData(data.schemeInfoEntity); - var scheme = JSON.parse(data.schemeEntity.F_Scheme); - $('#F_DbId').lrselectSet(scheme.dbId); - $('#gridtable').jfGridSet('refreshdata', scheme.dbTable); - $('#step-3').lrCustmerFormDesigner('set', scheme); - }); - } - }, - /*保存数据*/ - save: function () { - var schemeInfo = $('#step-1').lrGetFormData(keyValue); - if (!$('#step-3').lrCustmerFormDesigner('valid')) { - return false; - } - var scheme = $('#step-3').lrCustmerFormDesigner('get'); - schemeInfo.F_Type = 0; - schemeInfo.F_EnabledMark = 1; - var postData = { - keyValue: keyValue, - schemeInfo: JSON.stringify(schemeInfo), - scheme: JSON.stringify(scheme), - type: 1 - }; - - $.lrSaveForm(top.$.rootUrl + '/LR_FormModule/Custmerform/SaveForm', postData, function (res) { - // 保存成功后才回调 - learun.frameTab.currentIframe().refreshGirdData(); - }); - }, - /*保存草稿数据*/ - draftsave: function () { - var schemeInfo = $('#step-1').lrGetFormData(keyValue); - var scheme = $('#step-3').lrCustmerFormDesigner('get'); - - dbTable = $('#gridtable').jfGridGet('rowdatas'); - scheme.dbId = dbId; - scheme.dbTable = dbTable; - schemeInfo.F_EnabledMark = 0; - schemeInfo.F_Type = 0; - var postData = { - keyValue: keyValue, - schemeInfo: JSON.stringify(schemeInfo), - scheme: JSON.stringify(scheme), - type: 2 - }; - - $.lrSaveForm(top.$.rootUrl + '/LR_FormModule/Custmerform/SaveForm', postData, function (res) { - // 保存成功后才回调 - learun.frameTab.currentIframe().refreshGirdData(); - }); - } - }; - - page.init(); -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/HistoryForm.cshtml.16564.1.2019-11-13.10-45-14.9627 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/HistoryForm.cshtml.16564.1.2019-11-13.10-45-14.9627 deleted file mode 100644 index e6370c521..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/HistoryForm.cshtml.16564.1.2019-11-13.10-45-14.9627 +++ /dev/null @@ -1,24 +0,0 @@ -@{ - ViewBag.Title = "表单模板历史记录管理"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -@Html.AppendCssFile("/Areas/LR_SystemModule/Views/DataItem/ClassifyIndex.css") -
-
-
-
-
-
- -
-
-  预览模板 -  更新到此版本 -
-
-
-
-
-
-
-@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/HistoryForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/HistoryForm.cshtml.16564.1.2019-11-13.16-46-31.1957 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/HistoryForm.cshtml.16564.1.2019-11-13.16-46-31.1957 deleted file mode 100644 index e6370c521..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/HistoryForm.cshtml.16564.1.2019-11-13.16-46-31.1957 +++ /dev/null @@ -1,24 +0,0 @@ -@{ - ViewBag.Title = "表单模板历史记录管理"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -@Html.AppendCssFile("/Areas/LR_SystemModule/Views/DataItem/ClassifyIndex.css") -
-
-
-
-
-
- -
-
-  预览模板 -  更新到此版本 -
-
-
-
-
-
-
-@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/HistoryForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/HistoryForm.js.44803.3.2019-11-13.16-46-31.1987 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/HistoryForm.js.44803.3.2019-11-13.16-46-31.1987 deleted file mode 100644 index 53028304b..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/HistoryForm.js.44803.3.2019-11-13.16-46-31.1987 +++ /dev/null @@ -1,117 +0,0 @@ -/* - * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2018 上海力软信息技术有限公司 - * 创建人：力软-前端开发组 - * 日 期：2017.04.17 - * 描 述：表单模板记录 - */ -var keyValue = request('keyValue'); - -var refreshGirdData; // 更新数据 -var bootstrap = function ($, learun) { - "use strict"; - - var nowschemeId = learun.frameTab.currentIframe().nowschemeId; - - var page = { - init: function () { - page.initGrid(); - page.bind(); - }, - bind: function () { - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - // 预览表单 - $('#lr_preview').on('click', function () { - var schemeId = $('#gridtable').jfGridValue('F_Id'); - - - if (learun.checkrow(schemeId)) { - learun.layerForm({ - id: 'custmerForm_PreviewForm', - title: '预览当前表单', - url: top.$.rootUrl + '/LR_FormModule/Custmerform/PreviewForm?schemeInfoId=' + keyValue, - width: 800, - height: 600, - maxmin: true, - btn: null - }); - } - }); - - // 更新到此版本 - $('#lr_update').on('click', function () { - var schemeId = $('#gridtable').jfGridValue('F_Id'); - if (learun.checkrow(schemeId)) { - if (schemeId != nowschemeId) { - learun.layerConfirm('是否要更新到该版本！', function (res) { - if (res) { - learun.postForm(top.$.rootUrl + '/LR_FormModule/Custmerform/UpdateScheme', { schemeInfoId: keyValue, schemeId: schemeId }, function () { - nowschemeId = schemeId; - learun.frameTab.currentIframe().nowschemeId = schemeId; - learun.frameTab.currentIframe().refreshGirdData(); - refreshGirdData(); - - }); - } - }); - } - else { - learun.alert.warning('已经是当前版本了!'); - } - } - }); - }, - initGrid: function () { - $('#gridtable').jfGrid({ - url: top.$.rootUrl + '/LR_FormModule/Custmerform/GetSchemePageList', - headData: [ - { label: "创建人", name: "F_CreateUserName", width: 160, align: "left" }, - { - label: "创建时间", name: "F_CreateDate", width: 160, align: "left", - formatter: function (cellvalue) { - return learun.formatDate(cellvalue, 'yyyy-MM-dd hh:mm:ss'); - } - }, - { - label: "状态", name: "F_Type", width: 80, align: "center", - formatter: function (cellvalue, row) { - if (row.F_Type == 1) { - return '正式'; - } - else { - return '草稿'; - } - } - }, - { - label: "", name: "F_Id", width: 80, align: "center", - formatter: function (cellvalue) { - if (cellvalue == nowschemeId) { - return '当前版本'; - } - } - } - ], - mainId: 'F_Id', - reloadSelected: true, - isPage: true, - sidx: 'F_CreateDate', - sord: 'DESC' - }); - page.search(); - }, - search: function (param) { - $('#gridtable').jfGridSet('reload', { schemeInfoId: keyValue }); - } - }; - - // 保存数据后回调刷新 - refreshGirdData = function () { - $('#gridtable').jfGridSet('reload'); - } - - page.init(); -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Index.cshtml.44804.2.2019-11-13.16-46-31.2027 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Index.cshtml.44804.2.2019-11-13.16-46-31.2027 deleted file mode 100644 index 1653e372e..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Index.cshtml.44804.2.2019-11-13.16-46-31.2027 +++ /dev/null @@ -1,53 +0,0 @@ -@{ - ViewBag.Title = "表单设计"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
-
-
-
表单分类
-
-
-
-
-
-
- 模板数据 - 未选择分类 -
-
-
-
- -
-
-  查询 -
-
-
-
- -
-
-  新增 -  编辑 -  删除 - - -
-
-  分类管理 -
-
-
-
-
-
-
-@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Index.js.44805.3.2019-11-13.16-46-31.2057 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Index.js.44805.3.2019-11-13.16-46-31.2057 deleted file mode 100644 index ba66eec81..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/Index.js.44805.3.2019-11-13.16-46-31.2057 +++ /dev/null @@ -1,245 +0,0 @@ -/* - * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2018 上海力软信息技术有限公司 - * 创建人：力软-前端开发组 - * 日 期：2017.04.17 - * 描 述：表单设计 - */ -var refreshGirdData; // 更新数据 -var categoryId; -var nowschemeId; -var keyword; - -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.initGrid(); - page.bind(); - }, - bind: function () { - // 左侧数据加载 - $('#lr_left_tree').lrtree({ - url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetDetailTree', - param: { itemCode: 'FormSort' }, - nodeClick: function (item) { - categoryId = item.value; - $('#titleinfo').text(item.text); - page.search(); - } - }); - // 查询 - $('#btn_Search').on('click', function () { - keyword = $('#txt_Keyword').val(); - page.search(); - }); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - // 新增 - $('#lr_add').on('click', function () { - learun.layerForm({ - id: 'Form', - title: '自定义表单新增', - url: top.$.rootUrl + '/LR_FormModule/Custmerform/Form?categoryId=' + categoryId, - width: 1200, - height: 700, - maxmin: true, - btn:null - }); - }); - // 编辑 - $('#lr_edit').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('F_Id'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'Form', - title: '自定义表单编辑', - url: top.$.rootUrl + '/LR_FormModule/Custmerform/Form?categoryId=' + categoryId + "&keyValue=" + keyValue, - width: 1200, - height: 700, - maxmin: true, - btn: null - }); - } - }); - // 删除 - $('#lr_delete').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('F_Id'); - if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/LR_FormModule/Custmerform/DeleteForm', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); - } - }); - - // 预览表单 - $('#lr_preview').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('F_Id'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'custmerForm_PreviewForm', - title: '预览当前表单', - url: top.$.rootUrl + '/LR_FormModule/Custmerform/PreviewForm?schemeInfoId=' + keyValue, - width: 800, - height: 600, - maxmin: true, - btn: null - }); - } - }); - - // 启用 - $('#lr_enabled').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('F_Id'); - var enabledMark = $('#gridtable').jfGridValue('F_EnabledMark'); - - var type = $('#gridtable').jfGridValue('F_Type'); - if (type == 2) { - learun.alert.warning('草稿模板不能启用!'); - return false; - } - - if (learun.checkrow(keyValue)) { - if (enabledMark != 1) { - learun.layerConfirm('是否确认启用该表单模板！', function (res) { - if (res) { - learun.postForm(top.$.rootUrl + '/LR_FormModule/Custmerform/UpDateSate', { keyValue: keyValue, state: 1 }, function () { - refreshGirdData(); - }); - } - }); - } - else { - learun.alert.warning('该表单已启用!'); - } - } - }); - // 禁用 - $('#lr_disabled').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('F_Id'); - var enabledMark = $('#gridtable').jfGridValue('F_EnabledMark'); - - var type = $('#gridtable').jfGridValue('F_Type'); - if (type == 2) { - learun.alert.warning('草稿模板不能禁用!'); - return false; - } - - if (learun.checkrow(keyValue)) { - if (enabledMark == 1) { - learun.layerConfirm('是否确认禁用该表单模板！', function (res) { - if (res) { - learun.postForm(top.$.rootUrl + '/LR_FormModule/Custmerform/UpDateSate', { keyValue: keyValue, state: 0 }, function () { - refreshGirdData(); - }); - } - }); - } - else { - learun.alert.warning('该表单已禁用!'); - } - } - }); - // 查看历史记录 - $('#lr_history').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('F_Id'); - var Name = $('#gridtable').jfGridValue('F_Name'); - nowschemeId = $('#gridtable').jfGridValue('F_SchemeId'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'HistoryForm', - title: '表单模板历史记录-' + Name, - url: top.$.rootUrl + '/LR_FormModule/Custmerform/HistoryForm?&keyValue=' + keyValue, - width: 600, - height: 400, - maxmin: true, - btn: null - }); - } - }); - - /*分类管理*/ - $('#lr_category').on('click', function () { - learun.layerForm({ - id: 'ClassifyIndex', - title: '分类管理', - url: top.$.rootUrl + '/LR_SystemModule/DataItem/DetailIndex?itemCode=FormSort', - width: 800, - height: 500, - maxmin: true, - btn: null, - end: function () { - learun.clientdata.update('dataItem'); - location.reload(); - } - }); - }); - }, - initGrid: function () { - $('#gridtable').lrAuthorizeJfGrid({ - url: top.$.rootUrl + '/LR_FormModule/Custmerform/GetPageList', - headData: [ - { label: "名称", name: "F_Name", width: 150, align: "left" }, - { - label: "分类", name: "F_Category", width: 150, align: "center", - formatterAsync: function (callback, value, row) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: 'FormSort', - callback: function (_data) { - callback(_data.text); - } - }); - } - }, - { - label: "状态", name: "F_EnabledMark", width: 50, align: "center", - formatter: function (cellvalue, row) { - if (row.F_Type == 1) { - if (cellvalue == 1) { - return '启用'; - } else if (cellvalue == 0) { - return '禁用'; - } - } - else { - return '草稿'; - } - } - }, - { label: "创建人", name: "F_CreateUserName", width: 100, align: "center" }, - { - label: "创建时间", name: "F_CreateDate", width: 150, align: "left", - formatter: function (cellvalue) { - return learun.formatDate(cellvalue, 'yyyy-MM-dd'); - } - }, - { label: "备注", name: "F_Description", width: 500, align: "left" } - ], - mainId: 'F_Id', - reloadSelected: true, - isPage: true - }); - page.search(); - }, - search: function (param) { - param = param || {}; - param.category = categoryId; - param.keyword = keyword; - $('#gridtable').jfGridSet('reload', param); - } - }; - - // 保存数据后回调刷新 - refreshGirdData = function () { - $('#gridtable').jfGridSet('reload'); - } - - page.init(); -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/LayerInstanceForm.cshtml.16568.1.2019-11-13.10-45-14.9597 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/LayerInstanceForm.cshtml.16568.1.2019-11-13.10-45-14.9597 deleted file mode 100644 index 1c3280767..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/LayerInstanceForm.cshtml.16568.1.2019-11-13.10-45-14.9597 +++ /dev/null @@ -1,8 +0,0 @@ -@{ - ViewBag.Title = "自定义表单弹层实例"; - Layout = "~/Views/Shared/_CustmerFormPreview.cshtml"; -} -@Html.AppendCssFile("/Areas/LR_FormModule/Views/Custmerform/LayerInstanceForm.css") -@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/LayerInstanceForm.js") - - diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/LayerInstanceForm.cshtml.16568.1.2019-11-13.16-46-31.2087 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/LayerInstanceForm.cshtml.16568.1.2019-11-13.16-46-31.2087 deleted file mode 100644 index 1c3280767..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/LayerInstanceForm.cshtml.16568.1.2019-11-13.16-46-31.2087 +++ /dev/null @@ -1,8 +0,0 @@ -@{ - ViewBag.Title = "自定义表单弹层实例"; - Layout = "~/Views/Shared/_CustmerFormPreview.cshtml"; -} -@Html.AppendCssFile("/Areas/LR_FormModule/Views/Custmerform/LayerInstanceForm.css") -@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/LayerInstanceForm.js") - - diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/LayerInstanceForm.css.16569.1.2019-11-13.10-45-14.9557 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/LayerInstanceForm.css.16569.1.2019-11-13.10-45-14.9557 deleted file mode 100644 index ef49f304e..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/LayerInstanceForm.css.16569.1.2019-11-13.10-45-14.9557 +++ /dev/null @@ -1,8 +0,0 @@ -.lr-form-tab { - margin: 0 10px; - margin-top: 10px; -} -.jfgrid-data-cell { - border-bottom: 1px solid #ddd; - border-right:1px solid #ddd; -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/LayerInstanceForm.css.16569.1.2019-11-13.16-46-31.2127 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/LayerInstanceForm.css.16569.1.2019-11-13.16-46-31.2127 deleted file mode 100644 index ef49f304e..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/LayerInstanceForm.css.16569.1.2019-11-13.16-46-31.2127 +++ /dev/null @@ -1,8 +0,0 @@ -.lr-form-tab { - margin: 0 10px; - margin-top: 10px; -} -.jfgrid-data-cell { - border-bottom: 1px solid #ddd; - border-right:1px solid #ddd; -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/LayerInstanceForm.js.44806.3.2019-11-13.16-46-31.2157 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/LayerInstanceForm.js.44806.3.2019-11-13.16-46-31.2157 deleted file mode 100644 index d90c0d5f1..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/LayerInstanceForm.js.44806.3.2019-11-13.16-46-31.2157 +++ /dev/null @@ -1,87 +0,0 @@ -/* - * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2018 上海力软信息技术有限公司 - * 创建人：力软-前端开发组 - * 日 期：2017.04.17 - * 描 述：自定义表单 - */ -var id = request('id'); -var keyValue = request('keyValue'); - -var acceptClick; - -var bootstrap = function ($, learun) { - "use strict"; - var formModule; - var girdCompontMap; - - var page = { - init: function () { - if (!!id) { - $.lrSetForm(top.$.rootUrl + '/LR_FormModule/Custmerform/GetFormData?keyValue=' + id, function (data) {// - formModule = JSON.parse(data.schemeEntity.F_Scheme); - girdCompontMap = $('body').lrCustmerFormRender(formModule.data); - }); - } - page.initData(); - - }, - initData: function () { - if (!!keyValue) { - $.lrSetForm(top.$.rootUrl + '/LR_FormModule/Custmerform/GetInstanceForm?schemeInfoId=' + id + '&keyValue=' + keyValue, function (data) {// - page.setFormData(data); - }); - } - }, - setFormData: function (data) { - if (!!formModule) { - $.each(data, function (id, item) { - if (!!girdCompontMap[id]) { - var fieldMap = {}; - $.each(girdCompontMap[id].fieldsData, function (id, girdFiled) { - if (!!girdFiled.field) { - fieldMap[girdFiled.field.toLowerCase()] = girdFiled.field; - } - }); - var rowDatas = []; - for (var i = 0, l = item.length; i < l; i++) { - var _point = {}; - for (var _field in item[i]) { - _point[fieldMap[_field]] = item[i][_field]; - } - rowDatas.push(_point); - } - $('#' + girdCompontMap[id].id).jfGridSet('refreshdata', { rowdatas: rowDatas }); - } - else { - $('body').lrSetCustmerformData(item[0], id); - } - }); - } - else { - setTimeout(function () { - page.setFormData(data); - }, 100); - } - } - }; - page.init(); - - // 保存调用函数 - acceptClick = function (callBack) { - if (!$.lrValidCustmerform()) { - return false; - } - var formData = $('body').lrGetCustmerformData(keyValue); - var postData = - { - formData: JSON.stringify(formData) - }; - $.lrSaveForm(top.$.rootUrl + '/LR_FormModule/Custmerform/SaveInstanceForm?keyValue=' + keyValue + "&schemeInfoId=" + id, postData, function (res) { - // 保存成功后才回调 - if (!!callBack) { - callBack(); - } - }); - } -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/PreviewForm.cshtml.16571.1.2019-11-13.10-45-14.9517 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/PreviewForm.cshtml.16571.1.2019-11-13.10-45-14.9517 deleted file mode 100644 index fc9c9163b..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/PreviewForm.cshtml.16571.1.2019-11-13.10-45-14.9517 +++ /dev/null @@ -1,6 +0,0 @@ -@{ - ViewBag.Title = "表单预览"; - Layout = "~/Views/Shared/_CustmerFormPreview.cshtml"; -} -@Html.AppendCssFile("/Areas/LR_FormModule/Views/Custmerform/PreviewForm.css") -@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/PreviewForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/PreviewForm.cshtml.16571.1.2019-11-13.16-46-31.2197 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/PreviewForm.cshtml.16571.1.2019-11-13.16-46-31.2197 deleted file mode 100644 index fc9c9163b..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/PreviewForm.cshtml.16571.1.2019-11-13.16-46-31.2197 +++ /dev/null @@ -1,6 +0,0 @@ -@{ - ViewBag.Title = "表单预览"; - Layout = "~/Views/Shared/_CustmerFormPreview.cshtml"; -} -@Html.AppendCssFile("/Areas/LR_FormModule/Views/Custmerform/PreviewForm.css") -@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/PreviewForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/PreviewForm.css.16572.1.2019-11-13.10-45-14.9487 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/PreviewForm.css.16572.1.2019-11-13.10-45-14.9487 deleted file mode 100644 index ef49f304e..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/PreviewForm.css.16572.1.2019-11-13.10-45-14.9487 +++ /dev/null @@ -1,8 +0,0 @@ -.lr-form-tab { - margin: 0 10px; - margin-top: 10px; -} -.jfgrid-data-cell { - border-bottom: 1px solid #ddd; - border-right:1px solid #ddd; -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/PreviewForm.css.16572.1.2019-11-13.16-46-31.2227 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/PreviewForm.css.16572.1.2019-11-13.16-46-31.2227 deleted file mode 100644 index ef49f304e..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/PreviewForm.css.16572.1.2019-11-13.16-46-31.2227 +++ /dev/null @@ -1,8 +0,0 @@ -.lr-form-tab { - margin: 0 10px; - margin-top: 10px; -} -.jfgrid-data-cell { - border-bottom: 1px solid #ddd; - border-right:1px solid #ddd; -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/PreviewForm.js.44807.3.2019-11-13.16-46-31.2267 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/PreviewForm.js.44807.3.2019-11-13.16-46-31.2267 deleted file mode 100644 index 008e71288..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/PreviewForm.js.44807.3.2019-11-13.16-46-31.2267 +++ /dev/null @@ -1,36 +0,0 @@ -/* - * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2018 上海力软信息技术有限公司 - * 创建人：力软-前端开发组 - * 日 期：2017.04.17 - * 描 述：自定义表单预览 - */ -var keyValue = request('keyValue'); -var schemeInfoId = request('schemeInfoId'); -var schemeId = request('schemeId'); - -var bootstrap = function ($, learun) { - "use strict"; - var formData; - var page = { - init: function () { - if (!!schemeInfoId) { - $.lrSetForm(top.$.rootUrl + '/LR_FormModule/Custmerform/GetFormData?keyValue=' + schemeInfoId, function (data) {// - formData = JSON.parse(data.schemeEntity.F_Scheme); - $('body').lrCustmerFormRender(formData.data); - }); - } - else if (!!schemeId) { - $.lrSetForm(top.$.rootUrl + '/LR_FormModule/Custmerform/GetSchemeEntity?keyValue=' + schemeId, function (res) {// - formData = JSON.parse(res.F_Scheme); - $('body').lrCustmerFormRender(formData.data); - }); - } - else if (!!keyValue) { - formData = top[keyValue]; - $('body').lrCustmerFormRender(formData); - } - } - }; - page.init(); -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldForm.cshtml.16574.1.2019-11-13.10-45-14.9797 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldForm.cshtml.16574.1.2019-11-13.10-45-14.9797 deleted file mode 100644 index c926bc4d2..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldForm.cshtml.16574.1.2019-11-13.10-45-14.9797 +++ /dev/null @@ -1,73 +0,0 @@ -@{ - ViewBag.Title = "Form"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -@Html.AppendCssFile("/Areas/LR_FormModule/Views/Custmerform/SetFieldForm.css") -
-
-
-
上级列头
-
-
-
-
显示名称*
- -
-
-
绑定字段
-
-
-
-
编辑类型*
-
-
-
-
显示宽度*
- -
-
-
对齐方式*
-
-
    -
  • left
    • -
  • center
    • -
  • right
    • -
-
-
-
-
排序号*
- -
- - - -
-
数据来源*
-
-
-
-
数据选项*
-
- -
-
-
窗口宽
- -
-
-
窗口高
- -
-
-
-
-
-  修改 -
- 数据源字段设置 -
-
-
-
-@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/SetFieldForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldForm.cshtml.16574.1.2019-11-13.16-46-31.2297 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldForm.cshtml.16574.1.2019-11-13.16-46-31.2297 deleted file mode 100644 index c926bc4d2..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldForm.cshtml.16574.1.2019-11-13.16-46-31.2297 +++ /dev/null @@ -1,73 +0,0 @@ -@{ - ViewBag.Title = "Form"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -@Html.AppendCssFile("/Areas/LR_FormModule/Views/Custmerform/SetFieldForm.css") -
-
-
-
上级列头
-
-
-
-
显示名称*
- -
-
-
绑定字段
-
-
-
-
编辑类型*
-
-
-
-
显示宽度*
- -
-
-
对齐方式*
-
-
    -
  • left
    • -
  • center
    • -
  • right
    • -
-
-
-
-
排序号*
- -
- - - -
-
数据来源*
-
-
-
-
数据选项*
-
- -
-
-
窗口宽
- -
-
-
窗口高
- -
-
-
-
-
-  修改 -
- 数据源字段设置 -
-
-
-
-@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/SetFieldForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldForm.css.16575.1.2019-11-13.10-45-14.9447 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldForm.css.16575.1.2019-11-13.10-45-14.9447 deleted file mode 100644 index 68729fb39..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldForm.css.16575.1.2019-11-13.10-45-14.9447 +++ /dev/null @@ -1,33 +0,0 @@ -body { - padding:5px; -} -.lr-form-layout { - padding-top:210px; -} -.lr-form-layout-header { - position: absolute; - top:0; - left:0; - width: 100%; - height: 210px; - padding: 10px; - border:1px solid #ccc; - z-index:2; -} -.lr-form-item-title { - width:58px; - padding-right:0px; - text-align:left; -} -.lr-form-item { - padding-left:58px; -} -.lr-form-layout-body -{ - padding-top:30px; - border:1px solid #ccc; - border-top:0px; -} -.data-edit-select,data-edit-fixedInfo { - display:none; -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldForm.css.16575.1.2019-11-13.16-46-31.2337 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldForm.css.16575.1.2019-11-13.16-46-31.2337 deleted file mode 100644 index 68729fb39..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldForm.css.16575.1.2019-11-13.16-46-31.2337 +++ /dev/null @@ -1,33 +0,0 @@ -body { - padding:5px; -} -.lr-form-layout { - padding-top:210px; -} -.lr-form-layout-header { - position: absolute; - top:0; - left:0; - width: 100%; - height: 210px; - padding: 10px; - border:1px solid #ccc; - z-index:2; -} -.lr-form-item-title { - width:58px; - padding-right:0px; - text-align:left; -} -.lr-form-item { - padding-left:58px; -} -.lr-form-layout-body -{ - padding-top:30px; - border:1px solid #ccc; - border-top:0px; -} -.data-edit-select,data-edit-fixedInfo { - display:none; -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldForm.js.44808.3.2019-11-13.16-46-31.2377 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldForm.js.44808.3.2019-11-13.16-46-31.2377 deleted file mode 100644 index 537751efc..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldForm.js.44808.3.2019-11-13.16-46-31.2377 +++ /dev/null @@ -1,243 +0,0 @@ -/* - * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2018 上海力软信息技术有限公司 - * 创建人：力软-前端开发组 - * 日 期：2017.04.11 - * 描 述：自定义表格字段设置 - */ -var dbId = request('dbId'); -var tableName = request('tableName'); - -var keyValue = request('keyValue'); // 设置列的ID项 -var parentId = request('parentId'); // 设置列的ID项 - - -var acceptClick; -var selectFieldData = null; -var bootstrap = function ($, learun) { - "use strict"; - - var dataSourceField = []; - var dataSourceId = ''; - var itemCode = ''; - var colDatas = top.layer_custmerForm_editgrid_index.colDatas; - - - function setGridData(data) - { - data = data || [ - { label: '项目名', name: 'F_ItemName', value: '', width: '100', align: 'left', hide: '0', sort: 1 }, - { label: '项目值', name: 'F_ItemValue', value: '', width: '100', align: 'left', hide: '0', sort: 2 } - ]; - data = data.sort(function (a, b) { - return parseInt(a.hide) - parseInt(b.hide); - }); - data = data.sort(function (a, b) { - return parseInt(a.sort) - parseInt(b.sort); - }); - $('#gridtable').jfGridSet('refreshdata', data); - } - - var page = { - init: function () { - page.bind(); - page.initData(); - }, - bind: function () { - // 上级 - $('#parentId').lrselect({ - data: colDatas, - text: 'name', - value: 'id' - }).lrselectSet(parentId); - // 绑定字段 - $('#field').lrselect({ - value: 'f_column', - text: 'f_column', - title: 'f_remark', - allowSearch: true, - select: function (item) { - } - }); - learun.httpAsync('GET', top.$.rootUrl + '/LR_SystemModule/DatabaseTable/GetFieldList', { databaseLinkId: dbId, tableName: tableName }, function (data) { - $('#field').lrselectRefresh({ - data: data - }); - }); - // 编辑类型 - $('#type').lrselect({ - placeholder: false, - data: [{ id: 'input', text: 'input' }, { id: 'label', text: 'label' }, { id: 'select', text: 'select' }, { id: 'guid', text: 'GUID' }], - select: function (item) { - $('.data-edit-select').hide(); - if (item.id == "select") { - $('.data-edit-select').show(); - } - } - }).lrselectSet('input'); - // 对齐方式 - $('#align').lrselect({ placeholder: false }).lrselectSet('left'); - - $('#gridtable').jfGrid({ - headData: [ - { label: "字段名", name: "label", width: 120, align: "left" }, - { label: "字段ID", name: "name", width: 120, align: "left" }, - { label: "填充栏位", name: "value", width: 120, align: "left" }, - { label: "宽度", name: "width", width: 70, align: "center" }, - { label: "对齐方式", name: "align", width: 60, align: "center" }, - { - label: "是否隐藏", name: "hide", width: 60, align: "center", - formatter: function (cellvalue, row) { - if (cellvalue == 1) { - return '是'; - } else if (cellvalue == 0) { - return '否'; - } - } - }// 1 隐藏 0 显示 - ] - }); - - // 数据字典选项 - $('#dataItemId').lrselect({ - allowSearch: true, - maxHeight: 150, - url: top.$.rootUrl + '/LR_SystemModule/DataItem/GetClassifyTree', - type: 'tree', - select: function (item) { - dataSourceId = ''; - itemCode = ''; - if (!!item) { - itemCode = item.value; - dataSourceId = item.id; - } - } - }); - // 数据源 - $('#dataSourceId').lrselect({ - value: 'F_Code', - text: 'F_Name', - allowSearch: true, - maxHeight: 150, - url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetList', - select: function (item) { - dataSourceField = []; - dataSourceId = ''; - if (!!item) { - dataSourceId = item.F_Code; - learun.httpAsync('GET', top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataColName', { code: item.F_Code }, function (data) { - for (var i = 0, l = data.length; i < l; i++) { - if (data[i] != 'rownum') { - var point = { label: '', name: data[i], value: '', width: '100', align: 'left', hide: '1', sort: i }; - dataSourceField.push(point); - } - } - setGridData(dataSourceField); - }); - } - } - }); - - - // 数据来源 - $('#dataSource').lrselect({ - data: [{ id: '0', text: '数据字典' }, { id: '1', text: '数据源' }], - value: 'id', - text: 'text', - placeholder: false, - select: function (item) { - if (item.id == '0') { - $('#dataSourceId').hide(); - $('#dataItemId').show(); - // 如果是数据字典的话 - setGridData(); - } - else { - $('#dataItemId').hide(); - $('#dataSourceId').show(); - setGridData(dataSourceField); - } - } - }).lrselectSet('0'); - - $('#lr_edit_datasource').on('click', function () { - selectFieldData = $('#gridtable').jfGridGet('rowdata'); - var _name = $('#gridtable').jfGridValue('name'); - if (learun.checkrow(_name)) { - learun.layerForm({ - id: 'SetSelectFieldForm', - title: '设置选择字段', - url: top.$.rootUrl + '/LR_FormModule/Custmerform/SetSelectFieldForm?dbId=' + dbId + '&tableName=' + tableName, - width: 450, - height: 400, - callBack: function (id) { - return top[id].acceptClick(function (data) { - var rowdatas = $('#gridtable').jfGridGet('rowdatas'); - for (var i = 0, l = rowdatas.length; i < l; i++) { - if (rowdatas[i].name == data.name) { - rowdatas[i] = data; - } - } - setGridData(rowdatas); - }); - } - }); - } - - }); - - - - }, - initData: function () { - if (!!keyValue) { - for (var i = 0, l = colDatas.length; i < l; i++) { - var item = colDatas[i]; - if (item.id == keyValue) { - item.dataItemId = item.dataSourceId; - $('#form').lrSetFormData(item); - if (item.type == 'select') { - $('#gridtable').jfGridSet('refreshdata', item.selectData); - } - break; - } - } - } - } - }; - // 保存数据 - acceptClick = function (callBack) { - if (!$('#form').lrValidform()) { - return false; - } - var formData = $('#form').lrGetFormData(); - - var resdata = {}; - resdata.id = keyValue || learun.newGuid(); - resdata.name = formData.name; - resdata.field = formData.field; - resdata.width = formData.width; - resdata.sort = formData.sort; - resdata.type = formData.type; - resdata.align = formData.align; - resdata.parentId = formData.parentId; - switch (formData.type) { - case 'select': - resdata.dataSource = formData.dataSource; - resdata.dataSourceId = dataSourceId; - resdata.dataItemCode = itemCode; - - resdata.dataSourceWidth = formData.dataSourceWidth; - resdata.dataSourceHeight = formData.dataSourceHeight; - resdata.selectData = $('#gridtable').jfGridGet('rowdatas'); - break; - case 'fixedInfo': - resdata.fixedInfoType = formData.fixedInfoType; - resdata.fixedInfoHide = formData.fixedInfoHide; - break; - } - callBack(resdata); - return true; - }; - page.init(); -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldIndex.cshtml.16577.1.2019-11-13.10-45-14.9377 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldIndex.cshtml.16577.1.2019-11-13.10-45-14.9377 deleted file mode 100644 index be55d41b7..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldIndex.cshtml.16577.1.2019-11-13.10-45-14.9377 +++ /dev/null @@ -1,25 +0,0 @@ -@{ - ViewBag.Title = "表格字段设置"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
-
-
-
-
-
-  新增 -  编辑 -  删除 -
-
-
- -
-
-
-
-
-@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/SetFieldIndex.js") - - diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldIndex.cshtml.16577.1.2019-11-13.16-46-31.1777 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldIndex.cshtml.16577.1.2019-11-13.16-46-31.1777 deleted file mode 100644 index be55d41b7..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldIndex.cshtml.16577.1.2019-11-13.16-46-31.1777 +++ /dev/null @@ -1,25 +0,0 @@ -@{ - ViewBag.Title = "表格字段设置"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
-
-
-
-
-
-  新增 -  编辑 -  删除 -
-
-
- -
-
-
-
-
-@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/SetFieldIndex.js") - - diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldIndex.js.44809.3.2019-11-13.16-46-31.1747 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldIndex.js.44809.3.2019-11-13.16-46-31.1747 deleted file mode 100644 index 0e5b5d20e..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetFieldIndex.js.44809.3.2019-11-13.16-46-31.1747 +++ /dev/null @@ -1,111 +0,0 @@ -/* - * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2018 上海力软信息技术有限公司 - * 创建人：力软-前端开发组 - * 日 期：2017.03.22 - * 描 述：表格数据字段编辑 - */ -var keyValue = request('keyValue'); -var gridSetting = top[keyValue]; -var colDatas; - -var bootstrap = function ($, learun) { - "use strict"; - colDatas = gridSetting.fields; - var page = { - init: function () { - page.initGrid(); - page.bind(); - }, - bind: function () { - // 新增 - $('#lr_add').on('click', function () { - var _Id = $('#gridtable').jfGridValue('id'); - learun.layerForm({ - id: 'SetFieldForm', - title: '添加表格编辑字段', - url: top.$.rootUrl + '/LR_FormModule/Custmerform/SetFieldForm?dbId=' + gridSetting.dbId + '&tableName=' + gridSetting.tableName + '&parentId=' + _Id, - width: 600, - height: 500, - callBack: function (id) { - return top[id].acceptClick(function (data) { - colDatas.push(data); - colDatas = colDatas.sort(function (a, b) { - return parseInt(a.sort) - parseInt(b.sort); - }); - $('#gridtable').jfGridSet('refreshdata', colDatas); - }); - - } - }); - }); - // 编辑 - $('#lr_edit').on('click', function () { - var _Id = $('#gridtable').jfGridValue('id'); - if (learun.checkrow(_Id)) { - learun.layerForm({ - id: 'SetFieldForm', - title: '编辑表格编辑字段', - url: top.$.rootUrl + '/LR_FormModule/Custmerform/SetFieldForm?dbId=' + gridSetting.dbId + '&tableName=' + gridSetting.tableName + '&keyValue=' + _Id, - width: 600, - height: 500, - callBack: function (id) { - return top[id].acceptClick(function (data) { - for (var i = 0, l = colDatas.length; i < l; i++) { - var item = colDatas[i]; - if (item.id == _Id) { - colDatas[i] = data; - break; - } - } - colDatas = colDatas.sort(function (a, b) { - return parseInt(a.sort) - parseInt(b.sort); - }); - $('#gridtable').jfGridSet('refreshdata', colDatas); - }); - - } - }); - } - }); - // 删除 - $('#lr_delete').on('click', function () { - var _id = $('#gridtable').jfGridValue('id'); - if (learun.checkrow(_id)) { - learun.layerConfirm('是否确认删除该字段', function (res, index) { - if (res) { - for (var i = 0, l = colDatas.length; i < l; i++) { - var item = colDatas[i]; - if (item.id == _id) { - colDatas.splice(i, 1); - $('#gridtable').jfGridSet('refreshdata', colDatas); - break; - } - } - top.layer.close(index); //再执行关闭 - } - }); - } - }); - }, - initGrid: function () { - $('#gridtable').jfGrid({ - headData: [ - { label: "显示名称", name: "name", width: 200, align: "left" }, - { label: "绑定字段", name: "field", width: 200, align: "left" }, - { label: "显示宽度", name: "width", width: 80, align: "center" }, - { label: "编辑类型", name: "type", width: 80, align: "center" } - ], - mainId: 'id', - reloadSelected: true, - parentId: 'parentId', - isTree: true - }); - - $('#gridtable').jfGridSet('refreshdata', colDatas); - } - }; - page.init(); -} - - diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetSelectFieldForm.cshtml.16579.1.2019-11-13.10-45-14.9337 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetSelectFieldForm.cshtml.16579.1.2019-11-13.10-45-14.9337 deleted file mode 100644 index 93b304b71..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetSelectFieldForm.cshtml.16579.1.2019-11-13.10-45-14.9337 +++ /dev/null @@ -1,46 +0,0 @@ -@{ - ViewBag.Title = "表格选择项字段选择"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -
-
-
字段ID
- -
-
-
字段名
- -
-
-
对应字段
-
-
-
-
宽度*
- -
-
-
对齐方式*
-
-
    -
  • left
    • -
  • center
    • -
  • right
    • -
-
-
-
-
是否隐藏*
-
-
    -
  • 否
    • -
  • 是
    • -
-
-
-
-
排序号*
- -
-
-@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/SetSelectFieldForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetSelectFieldForm.cshtml.16579.1.2019-11-13.16-46-31.1717 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetSelectFieldForm.cshtml.16579.1.2019-11-13.16-46-31.1717 deleted file mode 100644 index 93b304b71..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetSelectFieldForm.cshtml.16579.1.2019-11-13.16-46-31.1717 +++ /dev/null @@ -1,46 +0,0 @@ -@{ - ViewBag.Title = "表格选择项字段选择"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -
-
-
字段ID
- -
-
-
字段名
- -
-
-
对应字段
-
-
-
-
宽度*
- -
-
-
对齐方式*
-
-
    -
  • left
    • -
  • center
    • -
  • right
    • -
-
-
-
-
是否隐藏*
-
-
    -
  • 否
    • -
  • 是
    • -
-
-
-
-
排序号*
- -
-
-@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/SetSelectFieldForm.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetSelectFieldForm.js.44810.3.2019-11-13.16-46-31.1277 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetSelectFieldForm.js.44810.3.2019-11-13.16-46-31.1277 deleted file mode 100644 index 04fb68a33..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/SetSelectFieldForm.js.44810.3.2019-11-13.16-46-31.1277 +++ /dev/null @@ -1,57 +0,0 @@ -/* - * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2018 上海力软信息技术有限公司 - * 创建人：力软-前端开发组 - * 日 期：2017.04.11 - * 描 述：表格选择项字段选择 - */ -var dbId = request('dbId'); -var tableName = request('tableName'); - -var acceptClick; -var bootstrap = function ($, learun) { - "use strict"; - var selectFieldData = top.layer_SetFieldForm.selectFieldData; - var page = { - init: function () { - page.bind(); - page.initData(); - }, - bind: function () { - // 绑定字段 - $('#value').lrselect({ - value: 'f_column', - text: 'f_column', - title: 'f_remark', - allowSearch: true, - maxHeight:160 - }); - learun.httpAsync('GET', top.$.rootUrl + '/LR_SystemModule/DatabaseTable/GetFieldList', { databaseLinkId: dbId, tableName: tableName }, function (data) { - $('#value').lrselectRefresh({ - data: data - }); - }); - // 对齐方式 - $('#align').lrselect({ placeholder: false }).lrselectSet('left'); - // 是否隐藏 - $('#hide').lrselect({ placeholder: false }).lrselectSet('0'); - }, - initData: function () { - if (!!selectFieldData) - { - $('#form').lrSetFormData(selectFieldData); - } - } - }; - // 保存数据 - acceptClick = function (callBack) { - if (!$('#form').lrValidform()) { - return false; - } - var postData = $('#form').lrGetFormData(); - callBack(postData); - - return true; - }; - page.init(); -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/TabInstanceForm.cshtml.16581.1.2019-11-13.10-45-14.9307 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/TabInstanceForm.cshtml.16581.1.2019-11-13.10-45-14.9307 deleted file mode 100644 index 110258d86..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/TabInstanceForm.cshtml.16581.1.2019-11-13.10-45-14.9307 +++ /dev/null @@ -1,13 +0,0 @@ -@{ - ViewBag.Title = "自定义表单窗口页实例"; - Layout = "~/Views/Shared/_CustmerFormPreview.cshtml"; -} -
- 保存并新增 - 保存单据 -
-@Html.AppendCssFile("/Areas/LR_FormModule/Views/Custmerform/TabInstanceForm.css") -@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/TabInstanceForm.js") - - - diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/TabInstanceForm.cshtml.16581.1.2019-11-13.16-46-31.0807 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/TabInstanceForm.cshtml.16581.1.2019-11-13.16-46-31.0807 deleted file mode 100644 index 110258d86..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/TabInstanceForm.cshtml.16581.1.2019-11-13.16-46-31.0807 +++ /dev/null @@ -1,13 +0,0 @@ -@{ - ViewBag.Title = "自定义表单窗口页实例"; - Layout = "~/Views/Shared/_CustmerFormPreview.cshtml"; -} -
- 保存并新增 - 保存单据 -
-@Html.AppendCssFile("/Areas/LR_FormModule/Views/Custmerform/TabInstanceForm.css") -@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/TabInstanceForm.js") - - - diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/TabInstanceForm.css.16582.1.2019-11-13.10-45-14.9267 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/TabInstanceForm.css.16582.1.2019-11-13.10-45-14.9267 deleted file mode 100644 index 5014a309a..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/TabInstanceForm.css.16582.1.2019-11-13.10-45-14.9267 +++ /dev/null @@ -1,33 +0,0 @@ -body { - position: relative; - height: 100%; - width: 100%; - padding: 15px; -} -.lr-form-tab { - margin: 0 10px; - margin-top: 10px; -} -.jfgrid-data-cell { - border-bottom: 1px solid #ddd; - border-right:1px solid #ddd; -} -.lr-form-wrap { - background-color: #fff; - border-radius: 5px; - border: 1px solid #ccc; - box-shadow: #bdbdbd 0 0 10px; - padding-top:30px; -} -.top-btn-tool { - position: absolute; - top: 0; - right: 25px; - background-color: rgba(0, 0, 0, 0.2); - border-radius: 0px 0px 6px 6px; - padding: 8px; - z-index:1; -} -.lr-form-bg { - display:none; -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/TabInstanceForm.css.16582.1.2019-11-13.16-46-31.0847 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/TabInstanceForm.css.16582.1.2019-11-13.16-46-31.0847 deleted file mode 100644 index 5014a309a..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/TabInstanceForm.css.16582.1.2019-11-13.16-46-31.0847 +++ /dev/null @@ -1,33 +0,0 @@ -body { - position: relative; - height: 100%; - width: 100%; - padding: 15px; -} -.lr-form-tab { - margin: 0 10px; - margin-top: 10px; -} -.jfgrid-data-cell { - border-bottom: 1px solid #ddd; - border-right:1px solid #ddd; -} -.lr-form-wrap { - background-color: #fff; - border-radius: 5px; - border: 1px solid #ccc; - box-shadow: #bdbdbd 0 0 10px; - padding-top:30px; -} -.top-btn-tool { - position: absolute; - top: 0; - right: 25px; - background-color: rgba(0, 0, 0, 0.2); - border-radius: 0px 0px 6px 6px; - padding: 8px; - z-index:1; -} -.lr-form-bg { - display:none; -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/TabInstanceForm.js.44811.3.2019-11-13.16-46-31.1097 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/TabInstanceForm.js.44811.3.2019-11-13.16-46-31.1097 deleted file mode 100644 index f27533a4d..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/TabInstanceForm.js.44811.3.2019-11-13.16-46-31.1097 +++ /dev/null @@ -1,101 +0,0 @@ -/* - * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2018 上海力软信息技术有限公司 - * 创建人：力软-前端开发组 - * 日 期：2017.04.17 - * 描 述：自定义表单 - */ -var id = request('id'); -var keyValue = request('keyValue'); -var acceptClick; - -var bootstrap = function ($, learun) { - "use strict"; - var formModule; - var girdCompontMap; - - var page = { - init: function () { - if (!!id) { - $.lrSetForm(top.$.rootUrl + '/LR_FormModule/Custmerform/GetFormData?keyValue=' + id, function (data) {// - formModule = JSON.parse(data.schemeEntity.F_Scheme); - girdCompontMap = $('body').lrCustmerFormRender(formModule.data); - page.bind(); - }); - } - page.initData(); - - }, - initData: function () { - if (!!keyValue) { - $.lrSetForm(top.$.rootUrl + '/LR_FormModule/Custmerform/GetInstanceForm?schemeInfoId=' + id + '&keyValue=' + keyValue, function (data) {// - page.setFormData(data); - }); - } - }, - setFormData: function (data) { - if (!!formModule) { - $.each(data, function (id, item) { - if (!!girdCompontMap[id]) { - var fieldMap = {}; - $.each(girdCompontMap[id].fieldsData, function (id, girdFiled) { - if (!!girdFiled.field) { - fieldMap[girdFiled.field.toLowerCase()] = girdFiled.field; - } - }); - var rowDatas = []; - for (var i = 0, l = item.length; i < l; i++) { - var _point = {}; - for (var _field in item[i]) { - _point[fieldMap[_field]] = item[i][_field]; - } - rowDatas.push(_point); - } - $('#' + girdCompontMap[id].id).jfGridSet('refreshdata', rowDatas); - } - else { - $('body').lrSetCustmerformData(item[0],id); - } - }); - } - else { - setTimeout(function () { - page.setFormData(data); - }, 100); - } - }, - bind: function () { - // 保存数据 - $('#savaAndAdd').on('click', function () { - acceptClick(0); - }); - $('#save').on('click', function () { - acceptClick(1); - }); - } - }; - page.init(); - - // 保存数据 - acceptClick = function (type) {// 0保存并新增 1保存 - if (!$.lrValidCustmerform()) { - return false; - } - var formData = $('body').lrGetCustmerformData(keyValue); - var postData = - { - formData: JSON.stringify(formData) - }; - $.lrSaveForm(top.$.rootUrl + '/LR_FormModule/Custmerform/SaveInstanceForm?keyValue=' + keyValue + "&schemeInfoId=" + id, postData, function (res) { - if (res.code == 200) { - learun.frameTab.parentIframe().refreshGirdData(); - if (type == 0) { - window.location.href = top.$.rootUrl + '/LR_FormModule/Custmerform/TabInstanceForm?id=' + id; - } - else { - learun.frameTab.close(learun.frameTab.iframeId); - } - } - }); - }; -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/WorkflowInstanceForm.cshtml.44812.2.2019-11-13.16-46-31.1137 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/WorkflowInstanceForm.cshtml.44812.2.2019-11-13.16-46-31.1137 deleted file mode 100644 index 6411ea15a..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/WorkflowInstanceForm.cshtml.44812.2.2019-11-13.16-46-31.1137 +++ /dev/null @@ -1,6 +0,0 @@ -@{ - ViewBag.Title = "自定义表单用于工作流"; - Layout = "~/Views/Shared/_CustmerFormPreview.cshtml"; -} -@Html.AppendCssFile("/Areas/LR_FormModule/Views/Custmerform/WorkflowInstanceForm.css") -@Html.AppendJsFile("/Areas/LR_FormModule/Views/Custmerform/WorkflowInstanceForm.js") \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/WorkflowInstanceForm.css.16585.1.2019-11-13.10-45-14.9227 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/WorkflowInstanceForm.css.16585.1.2019-11-13.10-45-14.9227 deleted file mode 100644 index 618297e4d..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/WorkflowInstanceForm.css.16585.1.2019-11-13.10-45-14.9227 +++ /dev/null @@ -1,8 +0,0 @@ -.lr-form-tab { - margin: 0 10px; - margin-top: 10px; -} -.jfgrid-data-cell { - border-bottom: 1px solid #ddd; - border-right:1px solid #ddd; -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/WorkflowInstanceForm.css.16585.1.2019-11-13.16-46-31.1167 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/WorkflowInstanceForm.css.16585.1.2019-11-13.16-46-31.1167 deleted file mode 100644 index 618297e4d..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/WorkflowInstanceForm.css.16585.1.2019-11-13.16-46-31.1167 +++ /dev/null @@ -1,8 +0,0 @@ -.lr-form-tab { - margin: 0 10px; - margin-top: 10px; -} -.jfgrid-data-cell { - border-bottom: 1px solid #ddd; - border-right:1px solid #ddd; -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/WorkflowInstanceForm.js.44813.3.2019-11-13.16-46-31.1207 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/WorkflowInstanceForm.js.44813.3.2019-11-13.16-46-31.1207 deleted file mode 100644 index 984e0d58a..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/Custmerform/_sgbak/WorkflowInstanceForm.js.44813.3.2019-11-13.16-46-31.1207 +++ /dev/null @@ -1,195 +0,0 @@ -/* - * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2018 上海力软信息技术有限公司 - * 创建人：力软-前端开发组 - * 日 期：2017.04.17 - * 描 述：自定义表单-用于工作流 - */ -var id = request('id'); -var keyValue = ""; - -var processIdName = ""; -var isUpdate = false; - -// 保存数据 -var save; -// 设置权限 -var setAuthorize; -// 设置表单数据 -var setFormData; -// 验证数据是否填写完整 -var validForm; -// 获取表单数据 -var getFormData; - - -var bootstrap = function ($, learun) { - "use strict"; - var formModule; - var girdCompontMap; - - var authorizeData; - - var page = { - init: function () { - if (!!id) { - $.lrSetForm(top.$.rootUrl + '/LR_FormModule/Custmerform/GetFormData?keyValue=' + id, function (data) {// - formModule = JSON.parse(data.schemeEntity.F_Scheme); - }); - } - }, - setFormData: function (data) { - if (!!formModule && !!girdCompontMap) { - $.each(data, function (id, item) { - if (!!girdCompontMap[id]) { - var fieldMap = {}; - $.each(girdCompontMap[id].fieldsData, function (id, girdFiled) { - if (!!girdFiled.field) { - fieldMap[girdFiled.field.toLowerCase()] = girdFiled.field; - } - }); - var rowDatas = []; - for (var i = 0, l = item.length; i < l; i++) { - var _point = {}; - for (var _field in item[i]) { - _point[fieldMap[_field]] = item[i][_field]; - } - rowDatas.push(_point); - } - if (rowDatas.length > 0) { - isUpdate = true; - } - $('#' + girdCompontMap[id].id).jfGridSet('refreshdata', { rowdatas: rowDatas }); - } - else { - if (!!item[0]) { - isUpdate = true; - $('body').lrSetCustmerformData(item[0], id); - } - } - - }); - $.each(authorizeData || [], function (_field, _item) { - var _field = _item.fieldId; - if (_item.isLook == 1 && _item.isEdit != 1) {// 如果没有查看权限就直接移除 - $('[name="' + _field + '"]').attr('disabled', 'disabled'); - } - }); - } - else { - setTimeout(function () { - page.setFormData(data); - }, 100); - } - } - }; - page.init(); - - // 保存调用函数 - save = function (processId, callBack, i) { - if (isUpdate) { - keyValue = processId; - } - var formData = $('body').lrGetCustmerformData(keyValue); - - if (!!processIdName) { - formData[processIdName] = processId; - } - var postData = - { - formData: JSON.stringify(formData) - }; - $.lrSaveForm(top.$.rootUrl + '/LR_FormModule/Custmerform/SaveInstanceForm?keyValue=' + keyValue + "&schemeInfoId=" + id + '&processIdName=' + processIdName, postData, function (res) { - // 保存成功后才回调 - if (!!callBack) { - callBack(res, formData, i); - } - }); - }; - // 设置权限 - setAuthorize = function (data) { - authorizeData = data; - - if (!!formModule) { - var girdMap = {}; - var _flag = false; - for (var i = 0, l = data.length; i < l; i++) { - var field = data[i]; - var _ids = field.fieldId.split('|'); - if (_ids.length > 1) { - if (field.isLook != 1 || field.isEdit != 1) { - girdMap[_ids[0]] = girdMap[_ids[0]] || {}; - girdMap[_ids[0]][_ids[1]] = field; - _flag = true; - } - } - } - if (_flag) { - $.each(formModule.data, function (_i, _item) { - $.each(_item.componts, function (_j, _jitem) { - if ((_jitem.type == 'girdtable' || _jitem.type == 'gridtable') && !!girdMap[_jitem.id]) { - var _gird = girdMap[_jitem.id]; - var _fieldsData = []; - $.each(_jitem.fieldsData, function (_m, _mitem) { - if (!_gird[_mitem.id] || _gird[_mitem.id].isLook == 1) { - _fieldsData.push(_mitem); - if (!!_gird[_mitem.id] && _gird[_mitem.id].isEdit != 1) { - _mitem._isEdit = 1; - } - } - }); - _jitem.fieldsData = _fieldsData; - } - }); - }); - } - - girdCompontMap = $('body').lrCustmerFormRender(formModule.data); - for (var i = 0, l = data.length; i < l; i++) { - var field = data[i]; - var _ids = field.fieldId.split('|'); - if (_ids.length == 1) { - if (field.isLook != 1) {// 如果没有查看权限就直接移除 - $('#' + _ids[0]).parent().remove(); - } - else { - if (field.isEdit != 1) { - $('#' + _ids[0]).attr('disabled', 'disabled'); - if ($('#' + _ids[0]).hasClass('lrUploader-wrap')) { - $('#' + _ids[0]).css({ 'padding-right': '58px' }); - $('#' + _ids[0]).find('.btn-success').remove(); - } - } - } - } - } - } - else { - setTimeout(function () { - setAuthorize(data); - }, 100); - } - }; - - // 设置表单数据 - setFormData = function (processId) { - if (!!processId) { - $.lrSetForm(top.$.rootUrl + '/LR_FormModule/Custmerform/GetInstanceForm?schemeInfoId=' + id + '&keyValue=' + processId + '&processIdName=' + processIdName, function (data) {// - page.setFormData(data); - }); - } - }; - - // 验证数据是否填写完整 - validForm = function () { - if (!$.lrValidCustmerform()) { - return false; - } - return true; - }; - - // 获取表单数据 - getFormData = function () { - return $('body').lrGetCustmerformData(keyValue); - } -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/ColFieldForm.cshtml.44814.2.2019-11-13.16-46-31.1237 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/ColFieldForm.cshtml.44814.2.2019-11-13.16-46-31.1237 deleted file mode 100644 index 3fb153bf4..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/ColFieldForm.cshtml.44814.2.2019-11-13.16-46-31.1237 +++ /dev/null @@ -1,29 +0,0 @@ -@{ - ViewBag.Title = "列表字段字段添加"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -
-
-
字段选择*
-
-
-
-
宽度*
- -
-
-
对齐方式*
-
-
    -
  • left
    • -
  • center
    • -
  • right
    • -
-
-
-
-
排序号*
- -
-
-@Html.AppendJsFile("/Areas/LR_FormModule/Views/FormRelation/ColFieldForm.js") \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/ColFieldForm.js.44815.3.2019-11-13.16-46-31.1397 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/ColFieldForm.js.44815.3.2019-11-13.16-46-31.1397 deleted file mode 100644 index 83df16d9e..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/ColFieldForm.js.44815.3.2019-11-13.16-46-31.1397 +++ /dev/null @@ -1,64 +0,0 @@ -/* - * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2018 上海力软信息技术有限公司 - * 创建人：力软-前端开发组 - * 日 期：2017.04.11 - * 描 述：列表字段添加 - */ -var id = request('id'); - -var acceptClick; -var bootstrap = function ($, learun) { - "use strict"; - var formscheme = top.layer_Form.formscheme; - var formFields = top.layer_Form.formFields; - var colData = top.layer_Form.colData; - - - var fieldName = ''; - var compontId = ''; - - var page = { - init: function () { - page.bind(); - page.initData(); - }, - bind: function () { - $('#fieldId').lrselect({ - text: 'title', - value: 'field', - data: formFields, - allowSearch: true, - select: function (item) { - fieldName = item.title; - compontId = item.id; - } - }); - // 所在行所占比 - $('#align').lrselect().lrselectSet('left'); - }, - initData: function () { - if (!!id) { - for (var i = 0, l = colData.length; i < l; i++) { - if (colData[i].id == id) { - $('#form').lrSetFormData(colData[i]); - break; - } - } - } - } - }; - // 保存数据 - acceptClick = function (callBack) { - if (!$('#form').lrValidform()) { - return false; - } - var postData = $('#form').lrGetFormData(); - postData.id = id || learun.newGuid(); - postData.fieldName = fieldName; - postData.compontId = compontId; - callBack(postData); - return true; - }; - page.init(); -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/Form.cshtml.44816.2.2019-11-13.16-46-31.1677 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/Form.cshtml.44816.2.2019-11-13.16-46-31.1677 deleted file mode 100644 index b74dddd08..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/Form.cshtml.44816.2.2019-11-13.16-46-31.1677 +++ /dev/null @@ -1,148 +0,0 @@ -@{ - ViewBag.Title = "发布表单功能"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -@Html.AppendCssFile("/Areas/LR_FormModule/Views/FormRelation/Form.css") -
-
-
    -
  • 1基础配置
    • -
  • 2条件配置
    • -
  • 3视图列表
    • -
-
-
-
- - -
-
功能编号*
- -
-
-
功能名称*
- -
-
-
上级功能
-
-
-
-
功能图标
- - ... -
- -
-
表单选择*
-
- 预览表单 -
-
-
表单打开方式*
-
- - -
-
-
-
功能排序*
- -
-
-
表单框宽
- -
-
-
表单框高
- -
-
-
功能描述
- -
-
-
-
-
-
时间查询
-
- - -
-
-
-
时间字段
-
-
-
-
搜索框宽
- -
-
-
搜索框高
- -
-
-
-
-
-  添加 -  修改 -  移除 -
- 条件项设计 -
-
-
-
-
-
-
-
是否分页
-
- - -
-
-
-
-
-
-  添加 -  修改 -  移除 -
- 页面列表设计 -
-
-
- -
-
- - -
-@Html.AppendJsFile("/Areas/LR_FormModule/Views/FormRelation/Form.js") \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/Form.css.16590.1.2019-11-13.10-45-14.9187 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/Form.css.16590.1.2019-11-13.10-45-14.9187 deleted file mode 100644 index 7202dc12b..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/Form.css.16590.1.2019-11-13.10-45-14.9187 +++ /dev/null @@ -1,39 +0,0 @@ -.step-gird-pane { - padding-top:41px; -} -.lr-form-layout { - padding-top:81px; -} -.lr-form-layout-header { - position: absolute; - top:0; - left:0; - width: 100%; - height: 81px; - padding: 0px 10px 0px 10px; - border-bottom:1px solid #ccc; - z-index:10; -} -.lr-form-layout-header .lr-form-item-title { - width:58px; - padding-right:0px; - text-align:left; -} -.lr-form-layout-header .lr-form-item { - padding-left:58px; -} -.lr-form-layout-body -{ - padding-top:30px; - border:1px solid #ccc; - border-top:0px; -} - -.btn-tool-bar { - position:absolute; - top:0; - width:100%; - text-align:right; - padding:5px; - border-bottom:1px solid #ddd; -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/Form.css.16590.1.2019-11-13.16-46-31.1437 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/Form.css.16590.1.2019-11-13.16-46-31.1437 deleted file mode 100644 index 7202dc12b..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/Form.css.16590.1.2019-11-13.16-46-31.1437 +++ /dev/null @@ -1,39 +0,0 @@ -.step-gird-pane { - padding-top:41px; -} -.lr-form-layout { - padding-top:81px; -} -.lr-form-layout-header { - position: absolute; - top:0; - left:0; - width: 100%; - height: 81px; - padding: 0px 10px 0px 10px; - border-bottom:1px solid #ccc; - z-index:10; -} -.lr-form-layout-header .lr-form-item-title { - width:58px; - padding-right:0px; - text-align:left; -} -.lr-form-layout-header .lr-form-item { - padding-left:58px; -} -.lr-form-layout-body -{ - padding-top:30px; - border:1px solid #ccc; - border-top:0px; -} - -.btn-tool-bar { - position:absolute; - top:0; - width:100%; - text-align:right; - padding:5px; - border-bottom:1px solid #ddd; -} diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/Form.js.44817.3.2019-11-13.16-46-31.1477 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/Form.js.44817.3.2019-11-13.16-46-31.1477 deleted file mode 100644 index 684c06603..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/Form.js.44817.3.2019-11-13.16-46-31.1477 +++ /dev/null @@ -1,467 +0,0 @@ -/* - * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2018 上海力软信息技术有限公司 - * 创建人：力软-前端开发组 - * 日 期：2018.06.29 - * 描 述：功能模块 - */ -var keyValue = request('keyValue'); -var tableFields = {}; // 用来缓存数据表字段 -var formscheme; -var setFormId = ""; -var formFields = []; - -var queryData = []; -var colData = []; - -var moduleForm = []; - -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.bind(); - page.initGrid(); - page.initData(); - }, - /*绑定事件和初始化控件*/ - bind: function () { - // 加载导向 - $('#wizard').wizard().on('change', function (e, data) { - var $finish = $("#btn_finish"); - var $next = $("#btn_next"); - if (data.direction == "next") { - if (data.step == 1) { - if (!$('#step-1').lrValidform()) { - return false; - } - // 加载表单数据 - var formId = $('#F_FormId').lrselectGet(); - if (setFormId != formId) { - queryData = []; - colData = []; - setFormId = formId; - $('#query_girdtable').jfGridSet('refreshdata', queryData); - $('#col_girdtable').jfGridSet('refreshdata', colData); - - $.lrSetForm(top.$.rootUrl + '/LR_FormModule/Custmerform/GetFormData?keyValue=' + formId, function (data) {// - formscheme = JSON.parse(data.schemeEntity.F_Scheme); - // 获取表单字段 - for (var i = 0, l = formscheme.data.length; i < l; i++) { - var componts = formscheme.data[i].componts; - for (var j = 0, jl = componts.length; j < jl; j++) { - var item = componts[j]; - if ((item.type != "gridtable" && item.type != "girdtable") && item.type != "label" && item.type != "html" && item.type != "guid" && item.type != "upload") { - formFields.push(item); - } - if (item.type != "gridtable" && item.type != "girdtable" && item.type != "guid") { - var point = { 'F_ModuleFormId': learun.newGuid(), 'F_EnCode': item.id, 'F_FullName': item.title }; - moduleForm.push(point); - } - } - } - - - // 获取主表字段 - // 确定主表信息 - var mainTable = ""; - for (var i = 0, l = formscheme.dbTable.length; i < l; i++) { - if (formscheme.dbTable[i].relationName == "") { - mainTable = formscheme.dbTable[i].name; - break; - } - } - if (!!tableFields[formscheme.dbId + mainTable]) { - $('#queryDatetime').lrselectRefresh({ - data: tableFields[formscheme.dbId + mainTable] - }); - } - else { - learun.httpAsync('GET', top.$.rootUrl + '/LR_SystemModule/DatabaseTable/GetFieldList', { databaseLinkId: formscheme.dbId, tableName: mainTable }, function (data) { - tableFields[formscheme.dbId + mainTable] = data; - $('#queryDatetime').lrselectRefresh({ - data: data - }); - }); - } - - }); - - } - - - - } else if (data.step == 2) { - $finish.removeAttr('disabled'); - $next.attr('disabled', 'disabled'); - } else { - $finish.attr('disabled', 'disabled'); - } - } else { - $finish.attr('disabled', 'disabled'); - $next.removeAttr('disabled'); - } - }); - // 上级 - $('#F_ParentId').lrselect({ - url: top.$.rootUrl + '/LR_SystemModule/Module/GetExpendModuleTree', - type: 'tree', - maxHeight: 180, - allowSearch: true - }); - // 选择图标 - $('#selectIcon').on('click', function () { - learun.layerForm({ - id: 'iconForm', - title: '选择图标', - url: top.$.rootUrl + '/Utility/Icon', - height: 700, - width: 1000, - btn: null, - maxmin: true, - end: function () { - if (top._learunSelectIcon != '') { - $('#F_Icon').val(top._learunSelectIcon); - } - } - }); - }); - // 选在表单 - $('#F_FormId').lrselect({ - text: 'F_Name', - value: 'F_Id', - url: top.$.rootUrl + '/LR_FormModule/Custmerform/GetSchemeInfoList', - allowSearch: true - }); - $('#lr_preview').on('click', function () { - var formId = $('#F_FormId').lrselectGet(); - if (!!formId) { - learun.layerForm({ - id: 'custmerForm_PreviewForm', - title: '预览当前表单', - url: top.$.rootUrl + '/LR_FormModule/Custmerform/PreviewForm?schemeInfoId=' + formId, - width: 800, - height: 600, - maxmin: true, - btn: null - }); - } - else { - learun.alert.warning('请选择表单！'); - } - }); - - // 条件设置 - $('#queryDatetime').lrselect({ - value: 'f_column', - text: 'f_column', - title: 'f_remark', - allowSearch: true - }); - - // 新增 - $('#lr_add_query').on('click', function () { - learun.layerForm({ - id: 'QueryFieldForm', - title: '添加条件字段', - url: top.$.rootUrl + '/LR_FormModule/FormRelation/QueryFieldForm', - height: 300, - width: 400, - callBack: function (id) { - return top[id].acceptClick(function (data) { - queryData.push(data); - queryData = queryData.sort(function (a, b) { - return parseInt(a.sort) - parseInt(b.sort); - }); - $('#query_girdtable').jfGridSet('refreshdata', queryData); - }); - } - }); - }); - // 编辑 - $('#lr_edit_query').on('click', function () { - var id = $('#query_girdtable').jfGridValue('id'); - if (learun.checkrow(id)) { - learun.layerForm({ - id: 'QueryFieldForm', - title: '添加条件字段', - url: top.$.rootUrl + '/LR_FormModule/FormRelation/QueryFieldForm?id=' + id, - height: 300, - width: 400, - callBack: function (id) { - return top[id].acceptClick(function (data) { - for (var i = 0, l = queryData.length; i < l; i++) { - if (queryData[i].id == data.id) { - queryData[i] = data; - break; - } - } - queryData = queryData.sort(function (a, b) { - return parseInt(a.sort) - parseInt(b.sort); - }); - $('#query_girdtable').jfGridSet('refreshdata', queryData); - }); - } - }); - } - }); - // 删除 - $('#lr_delete_query').on('click', function () { - var id = $('#query_girdtable').jfGridValue('id'); - if (learun.checkrow(id)) { - learun.layerConfirm('是否确认删除该字段', function (res, index) { - if (res) { - for (var i = 0, l = queryData.length; i < l; i++) { - if (queryData[i].id == id) { - queryData.splice(id, 1); - break; - } - } - $('#query_girdtable').jfGridSet('refreshdata', queryData); - top.layer.close(index); //再执行关闭 - } - }); - } - }); - - - // 列表设置 - // 新增 - $('#lr_add_col').on('click', function () { - learun.layerForm({ - id: 'ColFieldForm', - title: '添加列表字段', - url: top.$.rootUrl + '/LR_FormModule/FormRelation/ColFieldForm', - height: 300, - width: 400, - callBack: function (id) { - return top[id].acceptClick(function (data) { - colData.push(data); - colData = colData.sort(function (a, b) { - return parseInt(a.sort) - parseInt(b.sort); - }); - $('#col_girdtable').jfGridSet('refreshdata', colData); - }); - } - }); - }); - // 编辑 - $('#lr_edit_col').on('click', function () { - var id = $('#col_girdtable').jfGridValue('id'); - if (learun.checkrow(id)) { - learun.layerForm({ - id: 'ColFieldForm', - title: '添加条件字段', - url: top.$.rootUrl + '/LR_FormModule/FormRelation/ColFieldForm?id=' + id, - height: 300, - width: 400, - callBack: function (id) { - return top[id].acceptClick(function (data) { - for (var i = 0, l = colData.length; i < l; i++) { - if (colData[i].id == data.id) { - colData[i] = data; - break; - } - } - colData = colData.sort(function (a, b) { - return parseInt(a.sort) - parseInt(b.sort); - }); - $('#col_girdtable').jfGridSet('refreshdata', colData); - }); - } - }); - } - }); - // 删除 - $('#lr_delete_col').on('click', function () { - var id = $('#col_girdtable').jfGridValue('id'); - if (learun.checkrow(id)) { - learun.layerConfirm('是否确认删除该字段', function (res, index) { - if (res) { - for (var i = 0, l = colData.length; i < l; i++) { - if (colData[i].id == id) { - colData.splice(i, 1); - break; - } - } - $('#col_girdtable').jfGridSet('refreshdata', colData); - top.layer.close(index); //再执行关闭 - } - }); - } - }); - - // 保存数据按钮 - $("#btn_finish").on('click', page.save); - }, - /*初始化表格*/ - initGrid: function () { - $('#query_girdtable').jfGrid({ - headData: [ - { label: "字段项名称", name: "fieldName", width: 260, align: "left" }, - { - label: "所占行比例", name: "portion", width: 150, align: "left", - formatter: function (cellvalue, row) { - return '1/' + cellvalue; - } - }, - ], - mainId: 'id', - }); - $('#col_girdtable').jfGrid({ - headData: [ - { label: "字段名称", name: "fieldName", width: 260, align: "left" }, - { label: "宽度", name: "width", width: 150, align: "left" }, - { label: "对齐方式", name: "align", width: 150, align: "left" } - ] - }); - }, - /*初始化数据*/ - initData: function () { - if (!!keyValue) { - $.lrSetForm(top.$.rootUrl + '/LR_FormModule/FormRelation/GetFormData?keyValue=' + keyValue, function (data) {// - setFormId = data.relation.F_FormId; - - $.lrSetForm(top.$.rootUrl + '/LR_FormModule/Custmerform/GetFormData?keyValue=' + setFormId, function (data) {// - formscheme = JSON.parse(data.schemeEntity.F_Scheme); - // 获取表单字段 - for (var i = 0, l = formscheme.data.length; i < l; i++) { - var componts = formscheme.data[i].componts; - for (var j = 0, jl = componts.length; j < jl; j++) { - var item = componts[j]; - if (item.type != "gridtable" && item.type != "label" && item.type != "html" && item.type != "guid" && item.type != "upload") { - formFields.push(item); - } - if (item.type != "gridtable" && item.type != "guid") { - var point = { 'F_ModuleFormId': learun.newGuid(), 'F_EnCode': item.id, 'F_FullName': item.title }; - moduleForm.push(point); - } - } - } - // 获取主表字段 - // 确定主表信息 - var mainTable = ""; - for (var i = 0, l = formscheme.dbTable.length; i < l; i++) { - if (formscheme.dbTable[i].relationName == "") { - mainTable = formscheme.dbTable[i].name; - break; - } - } - if (!!tableFields[formscheme.dbId + mainTable]) { - $('#queryDatetime').lrselectRefresh({ - data: tableFields[formscheme.dbId + mainTable] - }); - } - else { - learun.httpAsync('GET', top.$.rootUrl + '/LR_SystemModule/DatabaseTable/GetFieldList', { databaseLinkId: formscheme.dbId, tableName: mainTable }, function (data) { - tableFields[formscheme.dbId + mainTable] = data; - $('#queryDatetime').lrselectRefresh({ - data: data - }); - }); - } - - }); - - - $('#step-1').lrSetFormData(data.module); - $('#F_FormId').lrselectSet(data.relation.F_FormId); - - var settingJson = JSON.parse(data.relation.F_SettingJson); - $('[name="formOpenType"][value="' + settingJson.layer.opentype + '"]').attr('checked', 'checked'); - $('#fromWidth').val(settingJson.layer.width); - $('#fromHeight').val(settingJson.layer.height); - - $('[name="queryDatetime"][value="' + settingJson.query.isDate + '"]').attr('checked', 'checked'); - $('#queryDatetime').lrselectSet(settingJson.query.DateField); - $('#queryWidth').val(settingJson.query.width); - $('#queryHeight').val(settingJson.query.height); - - queryData = settingJson.query.fields; - console.log(queryData); - $('#query_girdtable').jfGridSet('refreshdata', queryData); - - - - $('[name="ispage"][value="' + settingJson.col.isPage + '"]').attr('checked', 'checked'); - colData = settingJson.col.fields; - $('#col_girdtable').jfGridSet('refreshdata', colData); - }); - } - }, - /*保存数据*/ - save: function () { - if (!$('#step-1').lrValidform()) { - return false; - } - var formdata = $('#step-1').lrGetFormData(keyValue); - - formdata.F_ParentId = formdata.F_ParentId || '0'; - // 设置信息 - var settingJson = { - layer: { - width: formdata.fromWidth, - height: formdata.fromHeight, - opentype: $('[name="formOpenType"]:checked').val() // 1 弹层 2窗口页 - }, - - query: { - width: $('#queryWidth').val(), - height: $('#queryHeight').val(), - isDate: $('[name="queryDatetime"]:checked').val(), - DateField: $('#queryDatetime').lrselectGet(), - fields: queryData - }, - col: { - isPage: $('[name="ispage"]:checked').val(), - fields: colData - } - } - // 表单功能设置 - var relation = { - F_ModuleId: formdata.F_ModuleId, - F_FormId: formdata.F_FormId, - F_SettingJson: JSON.stringify(settingJson) - } - var tableIndex = 0; - var tableMap = {}; - var compontsMap = {}; - for (var i = 0, l = formscheme.data.length; i < l; i++) { - var componts = formscheme.data[i].componts; - for (var j = 0, jl = componts.length; j < jl; j++) { - var item = componts[j]; - compontsMap[item.id] = item; - if (!!item.table && tableMap[item.table] == undefined) { - tableMap[item.table] = tableIndex; - tableIndex++; - } - } - } - - // 列表设置 - var moduleColumn = []; - for (var i = 0, l = colData.length; i < l; i++) { - var code = colData[i].fieldId + tableMap[compontsMap[colData[i].compontId].table]; - var point = { F_ModuleColumnId: learun.newGuid(), F_FullName: colData[i].fieldName, F_EnCode: code.toLowerCase() }; - moduleColumn.push(point); - } - - - // 提交数据 - var postData = { - relationJson:JSON.stringify(relation), - moduleJson: JSON.stringify(formdata), - moduleColumnJson: JSON.stringify(moduleColumn), - moduleFormJson: JSON.stringify(moduleForm) - }; - - - $.lrSaveForm(top.$.rootUrl + '/LR_FormModule/FormRelation/SaveForm?keyValue=' + keyValue, postData, function (res) { - // 保存成功后才回调 - learun.frameTab.currentIframe().refreshGirdData(); - }); - } - }; - - page.init(); -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/Index.cshtml.44818.2.2019-11-13.16-46-31.1507 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/Index.cshtml.44818.2.2019-11-13.16-46-31.1507 deleted file mode 100644 index d5cd8197e..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/Index.cshtml.44818.2.2019-11-13.16-46-31.1507 +++ /dev/null @@ -1,32 +0,0 @@ -@{ - ViewBag.Title = "发布表单功能"; - Layout = "~/Views/Shared/_Index.cshtml"; -} -
-
-
-
-
-
- -
-
-  查询 -
-
-
-
- -
-
-  新增 -  编辑 -  删除 -
-
-
-
-
-
-
-@Html.AppendJsFile("/Areas/LR_FormModule/Views/FormRelation/Index.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/Index.js.44819.3.2019-11-13.16-46-31.1537 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/Index.js.44819.3.2019-11-13.16-46-31.1537 deleted file mode 100644 index 8477de603..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/Index.js.44819.3.2019-11-13.16-46-31.1537 +++ /dev/null @@ -1,106 +0,0 @@ -/* - * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2018 上海力软信息技术有限公司 - * 创建人：力软-前端开发组 - * 日 期：2017.04.17 - * 描 述：发布表单功能 - */ -var refreshGirdData; // 更新数据 -var bootstrap = function ($, learun) { - "use strict"; - var page = { - init: function () { - page.initGrid(); - page.bind(); - }, - bind: function () { - // 查询 - $('#btn_Search').on('click', function () { - var keyword = $('#txt_Keyword').val(); - page.search({ keyword: keyword }); - }); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - // 新增 - $('#lr_add').on('click', function () { - learun.layerForm({ - id: 'Form', - title: '发布表单功能', - url: top.$.rootUrl + '/LR_FormModule/FormRelation/Form', - width: 700, - height: 500, - btn: null - }); - }); - - - // 编辑 - $('#lr_edit').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('F_Id'); - if (learun.checkrow(keyValue)) { - learun.layerForm({ - id: 'Form', - title: '编辑表单功能', - url: top.$.rootUrl + '/LR_FormModule/FormRelation/Form?keyValue=' + keyValue, - width: 700, - height: 500, - btn: null - }); - } - }); - // 删除 - $('#lr_delete').on('click', function () { - var keyValue = $('#gridtable').jfGridValue('F_Id'); - if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/LR_FormModule/FormRelation/DeleteForm', { keyValue: keyValue }, function () { - refreshGirdData(); - }); - } - }); - } - }); - - }, - initGrid: function () { - $('#gridtable').lrAuthorizeJfGrid({ - url: top.$.rootUrl + '/LR_FormModule/FormRelation/GetPageList', - headData: [ - { label: "表单名称", name: "F_FormId", width: 250, align: "left" }, - { label: "功能名称", name: "F_ModuleId", width: 250, align: "left" }, - { - label: "编辑人", name: "F_CreateUserName", width: 150, align: "center", - formatter: function (cellvalue, row) { - return !!row.F_ModifyUserName ? row.F_ModifyUserName : cellvalue; - } - }, - { - label: "编辑时间", name: "F_CreateDate", width: 150, align: "left", - formatter: function (cellvalue, row) { - var datetime = !!row.F_ModifyUserName ? row.F_ModifyDate : cellvalue; - return learun.formatDate(datetime, 'yyyy-MM-dd hh:mm'); - } - } - ], - mainId: 'F_Id', - reloadSelected: true, - isPage: true - }); - page.search(); - }, - search: function (param) { - param = param || {}; - $('#gridtable').jfGridSet('reload', param); - } - }; - - // 保存数据后回调刷新 - refreshGirdData = function () { - $('#gridtable').jfGridSet('reload'); - } - - page.init(); -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/PreviewIndex.cshtml.16594.1.2019-11-13.10-45-14.9417 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/PreviewIndex.cshtml.16594.1.2019-11-13.10-45-14.9417 deleted file mode 100644 index a199dc1a5..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/PreviewIndex.cshtml.16594.1.2019-11-13.10-45-14.9417 +++ /dev/null @@ -1,34 +0,0 @@ -@{ - ViewBag.Title = "自定义表单功能"; - Layout = "~/Views/Shared/_CustmerIndexPreview.cshtml"; -} -
-
-
-
-
-
-
-
-
- -
-
-
-
- -
-
-  新增 -  编辑 -  删除 -
-
-
- -
-
-
-
-@Html.AppendJsFile("/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js") - diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/PreviewIndex.cshtml.16594.1.2019-11-13.16-46-31.1577 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/PreviewIndex.cshtml.16594.1.2019-11-13.16-46-31.1577 deleted file mode 100644 index a199dc1a5..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/PreviewIndex.cshtml.16594.1.2019-11-13.16-46-31.1577 +++ /dev/null @@ -1,34 +0,0 @@ -@{ - ViewBag.Title = "自定义表单功能"; - Layout = "~/Views/Shared/_CustmerIndexPreview.cshtml"; -} -
-
-
-
-
-
-
-
-
- -
-
-
-
- -
-
-  新增 -  编辑 -  删除 -
-
-
- -
-
-
-
-@Html.AppendJsFile("/Areas/LR_FormModule/Views/FormRelation/PreviewIndex.js") - diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/PreviewIndex.js.44820.3.2019-11-13.16-46-31.1607 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/PreviewIndex.js.44820.3.2019-11-13.16-46-31.1607 deleted file mode 100644 index 924298dfd..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/PreviewIndex.js.44820.3.2019-11-13.16-46-31.1607 +++ /dev/null @@ -1,321 +0,0 @@ -/* - * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2018 上海力软信息技术有限公司 - * 创建人：力软-前端开发组 - * 日 期：2017.04.17 - * 描 述：自定义表单发布功能 - */ -var id = request('id'); - -var refreshGirdData; // 更新数据 - -var formScheme; -var settingJson; -var relation; - -var mainTablePk = ""; -var mainTable = ""; -var mainCompontId = ""; - -var bootstrap = function ($, learun) { - "use strict"; - - var queryJson = {}; - - var page = { - init: function () { - // 获取自定义表单设置内容 - learun.httpAsync('GET', top.$.rootUrl + '/LR_FormModule/FormRelation/GetCustmerFormData', { keyValue: id }, function (data) { - relation = data.relation; - settingJson = JSON.parse(data.relation.F_SettingJson); - formScheme = JSON.parse(data.scheme.F_Scheme); - - for (var i = 0, l = formScheme.dbTable.length; i < l; i++) { - var tabledata = formScheme.dbTable[i]; - if (tabledata.relationName == "") { - mainTable = tabledata.name; - mainTablePk = tabledata.field; - } - } - - - // 条件项设置 - if (settingJson.query.isDate == '1' && !!settingJson.query.DateField) {// 时间搜索框 - $('#datesearch').lrdate({ - dfdata: [ - { name: '今天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00') }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, - { name: '近7天', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'd', -6) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, - { name: '近1个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -1) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, - { name: '近3个月', begin: function () { return learun.getDate('yyyy-MM-dd 00:00:00', 'm', -3) }, end: function () { return learun.getDate('yyyy-MM-dd 23:59:59') } }, - ], - // 月 - mShow: false, - premShow: false, - // 季度 - jShow: false, - prejShow: false, - // 年 - ysShow: false, - yxShow: false, - preyShow: false, - yShow: false, - // 默认 - dfvalue: '1', - selectfn: function (begin, end) { - queryJson.lrbegin = begin; - queryJson.lrend = end; - queryJson.lrdateField = settingJson.query.DateField; - - page.search(); - } - }); - } - - // 复合条件查询 - if (!!settingJson.query.fields && settingJson.query.fields.length > 0) { - var height = 220; - if (!!settingJson.query.height) { - height = settingJson.query.height; - if (height <= 50) { - height = 220; - } - } - $('#multiple_condition_query_item').html('
'); - $('#multiple_condition_query').lrMultipleQuery(function (_queryJson) { - queryJson = _queryJson; - page.search(); - }, height); - var $content = $('#multiple_condition_query .lr-query-content'); - - var queryFieldMap = {}; - $.each(settingJson.query.fields, function (id, item) { - queryFieldMap[item.fieldId] = item; - }); - for (var i = 0, l = formScheme.data.length; i < l; i++) { - var componts = formScheme.data[i].componts; - for (var j = 0, jl = componts.length; j < jl; j++) { - var item = componts[j]; - var queryItem = queryFieldMap[item.id]; - if (!!queryItem) { - queryItem.compont = item; - } - } - } - $.each(queryFieldMap, function (id, item) { - if (!!item.compont) { - var $row = $('
'); - var $title = $('
' + item.fieldName + '
'); - $row.append($title); - $content.append($row); - $.lrFormComponents[item.compont.type].renderQuery(item.compont, $row)[0].compont = item.compont; - } - }); - } - // 列表设置 - page.initGrid(); - // 按钮绑定事件 - page.bind(); - }); - }, - bind: function () { - // 查询 - $('#btn_Search').on('click', function () { - var keyword = $('#txt_Keyword').val(); - page.search({ keyword: keyword }); - }); - // 刷新 - $('#lr_refresh').on('click', function () { - location.reload(); - }); - // 新增 - $('#lr_add').on('click', function () { - if (settingJson.layer.opentype == '1') {// 窗口弹层页 - learun.layerForm({ - id: 'Form', - title: '新增', - url: top.$.rootUrl + '/LR_FormModule/Custmerform/LayerInstanceForm?id=' + relation.F_FormId, - width: settingJson.layer.width, - height: settingJson.layer.height, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - else {// 窗口页 - learun.frameTab.open({ F_ModuleId: id, F_Icon: 'fa fa-pencil-square-o', F_FullName: '新增', F_UrlAddress: '/LR_FormModule/Custmerform/TabInstanceForm?id=' + relation.F_FormId }); - } - }); - // 编辑 - $('#lr_edit').on('click', function () { - var keyValue = $('#gridtable').jfGridValue(mainCompontId.toLowerCase()); - - - if (learun.checkrow(keyValue)) { - if (settingJson.layer.opentype == '1') {// 窗口弹层页 - learun.layerForm({ - id: 'Form', - title: '编辑', - url: top.$.rootUrl + '/LR_FormModule/Custmerform/LayerInstanceForm?id=' + relation.F_FormId + "&keyValue=" + keyValue, - width: settingJson.layer.width, - height: settingJson.layer.height, - callBack: function (id) { - return top[id].acceptClick(refreshGirdData); - } - }); - } - else {// 窗口页 - learun.frameTab.open({ F_ModuleId: id, F_Icon: 'fa fa-pencil-square-o', F_FullName: '编辑', F_UrlAddress: '/LR_FormModule/Custmerform/TabInstanceForm?id=' + relation.F_FormId + "&keyValue=" + keyValue }); - } - } - }); - // 删除 - $('#lr_delete').on('click', function () { - var keyValue = $('#gridtable').jfGridValue(mainCompontId.toLowerCase()); - if (learun.checkrow(keyValue)) { - learun.layerConfirm('是否确认删除该项！', function (res) { - if (res) { - learun.deleteForm(top.$.rootUrl + '/LR_FormModule/Custmerform/DeleteInstanceForm', { keyValue: keyValue, schemeInfoId: relation.F_FormId }, function () { - refreshGirdData(); - }); - } - }); - } - }); - }, - initGrid: function () { - var colFieldMap = {}; - for (var i = 0, l = settingJson.col.fields.length; i < l; i++) { - colFieldMap[settingJson.col.fields[i].compontId] = settingJson.col.fields[i]; - } - var headData = []; - - var tableIndex = 0; - var tableMap = {}; - - for (var i = 0, l = formScheme.data.length; i < l; i++) { - var componts = formScheme.data[i].componts; - for (var j = 0, jl = componts.length; j < jl; j++) { - var item = componts[j]; - if (!!item.table && tableMap[item.table] == undefined) { - tableMap[item.table] = tableIndex; - tableIndex++; - } - - - if (mainTable == item.table && mainTablePk == item.field) { - mainCompontId = item.field + tableMap[item.table]; - } - - var colItem = colFieldMap[item.id]; - if (!!colItem) { - colItem.compont = item; - } - } - } - $.each(colFieldMap, function (id, item) { - if (!!item.compont) { - var point = { label: item.fieldName, name: (item.compont.field + tableMap[item.compont.table]).toLowerCase(), width: parseInt(item.width), align: item.align }; - switch (item.compont.type) { - case 'radio': - case 'checkbox': - case 'select': - if (item.compont.dataSource == "0") { - point.formatterAsync = function (callback, value, row) { - learun.clientdata.getAsync('dataItem', { - key: value, - code: item.compont.itemCode, - callback: function (_data) { - callback(_data.text); - } - }); - } - } - else { - var vlist = item.compont.dataSourceId.split(','); - point.formatterAsync = function (callback, value, row) { - learun.clientdata.getAsync('sourceData', { - key: value, - keyId: vlist[2], - code: vlist[0], - callback: function (_data) { - callback(_data[vlist[1]]); - } - }); - } - } - break; - - case 'organize': - case 'currentInfo': - if (item.compont.dataType == 'user') { - - point.formatterAsync = function (callback, value, row) { - learun.clientdata.getAsync('user', { - key: value, - callback: function (item) { - callback(item.name); - } - }); - } - - } - else if (item.compont.dataType == 'company') { - point.formatterAsync = function (callback, value, row) { - learun.clientdata.getAsync('company', { - key: value, - callback: function (_data) { - callback(_data.name); - } - }); - } - } - else if (item.compont.dataType == 'department') { - point.formatterAsync = function (callback, value, row) { - learun.clientdata.getAsync('department', { - key: value, - callback: function (item) { - callback(item.name); - } - }); - } - } - break; - } - headData.push(point); - } - - }); - - var girdurl = ""; - if (settingJson.col.isPage == "1") { - girdurl = top.$.rootUrl + '/LR_FormModule/FormRelation/GetPreviewPageList?keyValue=' + id; - } - else { - girdurl = top.$.rootUrl + '/LR_FormModule/FormRelation/GetPreviewList?keyValue=' + id; - } - - $('#gridtable').lrAuthorizeJfGrid({ - url: girdurl, - headData: headData, - reloadSelected: true, - isPage: (settingJson.col.isPage == "1" ? true : false), - mainId: mainCompontId.toLowerCase() - }); - page.search(); - }, - search: function (param) { - param = param || {}; - param.queryJson = JSON.stringify(queryJson); - $('#gridtable').jfGridSet('reload', param); - } - }; - - // 保存数据后回调刷新 - refreshGirdData = function () { - $('#gridtable').jfGridSet('reload'); - } - - page.init(); -} - - diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/QueryFieldForm.cshtml.44821.2.2019-11-13.16-46-31.1647 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/QueryFieldForm.cshtml.44821.2.2019-11-13.16-46-31.1647 deleted file mode 100644 index ea95cd468..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/QueryFieldForm.cshtml.44821.2.2019-11-13.16-46-31.1647 +++ /dev/null @@ -1,19 +0,0 @@ -@{ - ViewBag.Title = "查询条件字段添加"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -
-
-
字段选择*
-
-
-
-
所在行占比*
-
-
-
-
排序号*
- -
-
-@Html.AppendJsFile("/Areas/LR_FormModule/Views/FormRelation/QueryFieldForm.js") \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/QueryFieldForm.js.44822.3.2019-11-13.16-46-31.2407 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/QueryFieldForm.js.44822.3.2019-11-13.16-46-31.2407 deleted file mode 100644 index b2337308d..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_FormModule/Views/FormRelation/_sgbak/QueryFieldForm.js.44822.3.2019-11-13.16-46-31.2407 +++ /dev/null @@ -1,89 +0,0 @@ -/* - * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) - * Copyright (c) 2013-2018 上海力软信息技术有限公司 - * 创建人：力软-前端开发组 - * 日 期：2017.04.11 - * 描 述：查询条件字段添加 - */ -var id = request('id'); - -var acceptClick; -var bootstrap = function ($, learun) { - "use strict"; - var formscheme = top.layer_Form.formscheme; - var formFields = top.layer_Form.formFields; - var queryData = top.layer_Form.queryData; - - - var fieldName = ''; - - var page = { - init: function () { - page.bind(); - page.initData(); - }, - bind: function () { - var formFields2 = []; - $.each(formFields, function (id, item) { - if (item.type != 'label' && item.type != 'datetime' && item.type != 'upload' && item.type != 'currentInfo') { - formFields2.push(item); - } - }); - - $('#fieldId').lrselect({ - text: 'title', - data: formFields2, - allowSearch: true, - maxHeight: 140, - select: function (item) { - fieldName = item.title; - } - }); - // 所在行所占比 - $('#portion').lrselect({ - data: [ - { - id: '1', text: '1' - }, - { - id: '2', text: '1/2' - }, - { - id: '3', text: '1/3' - }, - { - id: '4', text: '1/4' - }, - { - id: '6', text: '1/6' - } - ], - placeholder: false, - value: 'id', - text: 'text' - }).lrselectSet('1'); - }, - initData: function () { - if (!!id) { - for (var i = 0, l = queryData.length; i < l; i++) { - if (queryData[i].id == id) { - $('#form').lrSetFormData(queryData[i]); - break; - } - } - } - } - }; - // 保存数据 - acceptClick = function (callBack) { - if (!$('#form').lrValidform()) { - return false; - } - var postData = $('#form').lrGetFormData(); - postData.id = id || learun.newGuid(); - postData.fieldName = fieldName; - callBack(postData); - return true; - }; - page.init(); -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js index d91892af3..07b88164d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.js @@ -246,7 +246,8 @@ var bootstrap = function ($, learun) { } else { //$iframes.find('.form-list-container.active').find('.lr-form-wrap:visible').jqprint(); - $('#form_list_iframes').jqprint(); + //$('#form_list_iframes').jqprint(); + $.print('#form_list_iframes'); } }); $('#print').show(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/_sgbak/UserController.cs.71093.4.2020-07-27.16-58-03.6089 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/_sgbak/UserController.cs.71093.4.2020-07-27.16-58-03.6089 deleted file mode 100644 index 13df7c92b..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_OrganizationModule/Controllers/_sgbak/UserController.cs.71093.4.2020-07-27.16-58-03.6089 +++ /dev/null @@ -1,400 +0,0 @@ -using Learun.Application.Organization; -using Learun.Util; -using System.Collections.Generic; -using System.Web.Mvc; -using Learun.Application.Base.AuthorizeModule; -using System.Linq; -using System; -using Learun.Application.Base.SystemModule; - -namespace Learun.Application.Web.Areas.LR_OrganizationModule.Controllers -{ - /// - /// 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园 - /// Copyright (c) 2013-2018 北京泉江科技有限公司 - /// 创建人：陈彬彬 - /// 日 期：2017.03.09 - /// 描 述：用户管理控制器 - /// - public class UserController : MvcControllerBase - { - private UserIBLL userIBLL = new UserBLL(); - private DepartmentIBLL departmentIBLL = new DepartmentBLL(); - private UserRelationIBLL userRelationIBLL = new UserRelationBLL(); - private RoleIBLL roleIBLL = new RoleBLL(); - - - #region 获取视图 - - [HttpGet] - public ActionResult StudentIndex() - { - return View(); - } - - /// - /// 用户管理主页 - /// - /// - [HttpGet] - public ActionResult Index() - { - return View(); - } - /// - /// 用户管理表单 - /// - /// - [HttpGet] - public ActionResult Form() - { - return View(); - } - - /// - /// 人员选择 - /// - /// - [HttpGet] - public ActionResult SelectForm() - { - return View(); - } - [HttpGet] - public ActionResult LookForm() - { - return View(); - } - /// - /// 人员选择 - /// - /// - [HttpGet] - public ActionResult SelectOnlyForm() - { - return View(); - } - - - #endregion - - #region 获取数据 - /// - /// 获取分页数据 - /// - /// 分页参数 - /// 关键字 - /// 公司主键 - /// 部门主键 - /// 0 教师 1学生 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetPageList(string pagination, string keyword, string companyId, string departmentId, string tp) - { - Pagination paginationobj = pagination.ToObject(); - var data = userIBLL.GetPageList(companyId, departmentId, paginationobj, keyword, tp); - var jsonData = new - { - rows = data, - total = paginationobj.total, - page = paginationobj.page, - records = paginationobj.records, - }; - return JsonResult(jsonData); - } - /// - /// 获取用户列表 - /// - /// 公司主键 - /// 部门主键 - /// 查询关键词 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetList(string companyId, string departmentId, string keyword) - { - if (string.IsNullOrEmpty(companyId)) - { - var department = departmentIBLL.GetEntity(departmentId); - if (department != null) - { - var data = userIBLL.GetList(department.F_CompanyId, departmentId, keyword); - return JsonResult(data); - } - else - { - return JsonResult(new List()); - } - } - else - { - var data = userIBLL.GetList(companyId, departmentId, keyword); - return JsonResult(data); - } - } - /// - /// 根据部门获取用户 - /// - /// 部门主键 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetListByDepartmentId(string departmentId) - { - var data = userIBLL.GetListByDepartmentId(departmentId); - return JsonResult(data); - } - /// - /// 获取本部门的人员 - /// - /// 公司主键 - /// 部门主键 - /// 查询关键词 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetMyDepartmentList() - { - UserInfo userinfo = LoginUserInfo.Get(); - var data = userIBLL.GetList(userinfo.companyId, userinfo.departmentId, ""); - return JsonResult(data); - } - /// - /// 获取用户信息列表 - /// - /// 用户主键串 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetListByUserIds(string keyValue) - { - var list = userIBLL.GetListByUserIds(keyValue); - string text = ""; - foreach (var item in list) - { - if (!string.IsNullOrEmpty(text)) - { - text += ","; - } - text += item.F_RealName; - } - return SuccessString(text); - } - /// - /// 获取用户信息列表 - /// - /// 用户主键串 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetEntityListByUserIds(string keyValue) - { - var list = userIBLL.GetListByUserIds(keyValue); - return JsonResult(list); - } - - /// - /// 获取用户信息 - /// - /// 用户主键 - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetUserEntity(string userId) - { - var data = userIBLL.GetEntityByUserId(userId); - return JsonResult(data); - } - - /// - /// 获取映射数据 - /// - /// - [HttpGet] - [AjaxOnly] - public ActionResult GetMap(string ver) - { - var data = userIBLL.GetModelMap(); - string md5 = Md5Helper.Encrypt(data.ToJson(), 32); - if (md5 == ver) - { - return Success("no update"); - } - else - { - var jsondata = new - { - data = data, - ver = md5 - }; - return JsonResult(jsondata); - } - } - /// - /// 获取头像 - /// - /// 用户主键 - /// - [HttpGet] - public ActionResult GetImg(string userId) - { - userIBLL.GetImg(userId); - return Success("获取成功。"); - } - [HttpGet] - public ActionResult GetImgForDC(string userId) - { - userIBLL.GetImg(userId); - return Success("获取成功。"); - } - [HttpGet] - public ActionResult GetRoleList(string objectId) - { - var roleList = userRelationIBLL.GetRoleListByUserId(objectId); - var jsonResult = new { roleInfoList = roleList }; - return Success(jsonResult); - } - - [HttpGet] - [AjaxOnly] - public ActionResult GetLastLoginTime(string userId) - { - return Success(LogBLL.GetUserLogList(userId)?.F_OperateTime); - } - - #endregion - - #region 提交数据 - /// - /// 保存表单数据 - /// - /// 主键 - /// 实体 - /// - [HttpPost] - [ValidateAntiForgeryToken] - [AjaxOnly] - public ActionResult SaveForm(string keyValue, UserEntity entity) - { - userIBLL.SaveEntity(keyValue, entity); - return Success("保存成功！"); - } - /// - /// 删除表单数据 - /// - /// 主键 - /// - [HttpPost] - [AjaxOnly] - public ActionResult DeleteForm(string keyValue) - { - //userIBLL.VirtualDelete(keyValue); - userIBLL.VirtualDeleteBatch(keyValue); - return Success("删除成功！"); - } - /// - /// 启用禁用账号 - /// - /// 主键 - /// - [HttpPost] - [AjaxOnly] - public ActionResult UpdateState(string keyValue, int state) - { - userIBLL.UpdateState(keyValue, state); - return Success("操作成功！"); - } - /// - /// 重置用户账号密码 - /// - /// 主键 - /// - [HttpPost] - [AjaxOnly] - public ActionResult ResetPassword(string keyValue) - { - userIBLL.ResetPassword(keyValue); - return Success("操作成功！"); - } - /// - /// 重置用户账号密码(八位) - /// - /// 主键 - /// - [HttpPost] - [AjaxOnly] - public ActionResult ResetPasswordEight(string keyValue) - { - userIBLL.ResetPasswordEight(keyValue); - return Success("操作成功！"); - } - - - [HttpGet] - [AjaxOnly] - public ActionResult ResetStudentRelation() - { - var allStudents = userIBLL.GetStudents(); - var studentRoleId = roleIBLL.GetIdByRoleName("学生"); - - var hasStudentsRolePeople = userRelationIBLL.GetUserIdList(studentRoleId).Select(a => a.F_UserId); - var studentList = allStudents.Where(a => !hasStudentsRolePeople.Contains(a.F_UserId)); - var relationList = new List(); - var userIds = ""; - foreach (var item in allStudents) - { - if (userIds != "") - { - userIds += ","; - } - userIds += item.F_UserId; - - } - userRelationIBLL.SaveEntityList(studentRoleId, 1, userIds); - return Success("操作成功"); - - - } - #endregion - - #region 数据导出 - /// - /// 导出用户列表 - /// - /// - [HttpGet] - public ActionResult ExportUserList() - { - userIBLL.GetExportList(); - return Success("导出成功。"); - } - /// - /// 导出用户列表【学生】 - /// - /// - [HttpGet] - public ActionResult ExportUserListOfStudent() - { - userIBLL.GetExportListOfStudent(); - return Success("导出成功。"); - } - #endregion - - #region 验证数据 - /// - /// 账号不能重复 - /// - /// 主键 - /// 账号 - /// - [HttpGet] - [AjaxOnly] - public ActionResult ExistAccount(string keyValue, string F_Account) - { - bool res = userIBLL.ExistAccount(F_Account, keyValue); - return JsonResult(res); - } - #endregion - } -} \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/Perm_Function/_sgbak/Form.cshtml.16888.1.2020-06-19.10-50-39.9112 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/Perm_Function/_sgbak/Form.cshtml.16888.1.2020-06-19.10-50-39.9112 deleted file mode 100644 index 3283afc24..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/Permission/Views/Perm_Function/_sgbak/Form.cshtml.16888.1.2020-06-19.10-50-39.9112 +++ /dev/null @@ -1,47 +0,0 @@ -@{ - ViewBag.Title = "应用管理"; - Layout = "~/Views/Shared/_Form.cshtml"; -} -
-
-
应用名称*
- -
-
-
分类名称*
-
-
-
-
应用地址*
- -
-
-
登录接口地址*
- -
-
-
应用私钥*
- -
-
-
排序*
- -
-
-
是否启用*
-
-
-
-
是否管理页*
-
-
-
-
图片*
-
-
-
-
备注
- -
-
-@Html.AppendJsFile("/Areas/Permission/Views/Perm_Function/Form.js") diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/echarts/map/china/_sgbak/taiwan.js.17026.1.2019-11-25.12-02-55.3777 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/echarts/map/china/_sgbak/taiwan.js.17026.1.2019-11-25.12-02-55.3777 deleted file mode 100644 index 95afe195e..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/echarts/map/china/_sgbak/taiwan.js.17026.1.2019-11-25.12-02-55.3777 +++ /dev/null @@ -1 +0,0 @@ -(function (root, factory) {if (typeof define === 'function' && define.amd) {define(['exports', 'echarts'], factory);} else if (typeof exports === 'object' && typeof exports.nodeName !== 'string') {factory(exports, require('echarts'));} else {factory({}, root.echarts);}}(this, function (exports, echarts) {var log = function (msg) {if (typeof console !== 'undefined') {console && console.error && console.error(msg);}};if (!echarts) {log('ECharts is not Loaded');return;}if (!echarts.registerMap) {log('ECharts Map is not loaded');return;}echarts.registerMap('台湾', {"type":"FeatureCollection","features":[{"type":"Feature","id":"710000","properties":{"name":"台湾省","cp":[121.509062,25.044332],"childNum":82},"geometry":{"type":"MultiPolygon","coordinates":[["@@@BBB@@B@@@@@@B@@@@B@@A@@@@@@BB@@B@@AB@@@@@BA@@@@@@BA@@@@BA@@@@@A@@B@@@@@@@@A@@@@@@B@@@@@@@@@@@@@@@@@@@@@@A@@@@@@@@@@@@@A@@@@@@AA@@@@@@@@@@@@@@@@A@@@@@@@@@@A@@@@@@A@@@@@@@@@A@@A@@@BA@@@AA@@@@A@AB@@A@@@A@@@@B@@A@@BA@@B@@A@@@@@@@@B@@@@@@@@@@@B@@@@@BDB"],["@@@@@@@@@@@A@@@@@@@@@@@@@B"],["@@@@@@@@@@@@B@A@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@B@@@@@A@@@@@@@@@B@@@AA@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@A@@@@@@@@B@@@@@@B@@@@@@@"],["@@B@DA@@@@B@@@@@@@@AA@@@A@@@@@A@@@@@@AA@@@A@@@A@@@A@@@@B@@@@@BB@@@@@@@@@BB@@@@B@"],["@@@@B@@@@@@@@@@@@@@@A@@@@@@@@@@@"],["@@@@@@@@@A@@@@@@@@@@@B@@"],["@@DHBDB@DC@KACEA@@ADAF"],["@@BDDBBBDAFE@C@@CAI@@@CF"],["@@@@@B@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@B@@@@@@@@@@@@@@@@@@@@@@@@@@@@A@@@@@@@@@@@@@@@@@@@@@@@@@@B@A@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@A@@@@@@@@@@A@@@@@@@@@@@@@@@@@@@B@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@B@@@@@@@@@@@@B@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@A@@@@@@@@@@@@@@@@@@@@@@@@@@A@@@@@@@@@@@@@"],["@@@@@@@@@@B@@@@B@@@A@@@@@B@@@@@@@AB@@@@@@@@@@@@@A@@@@@@@@@@@@@@@@@A@@@@@@@"],["@@@FFD@@BABABCCE@CA@ABCF@@"],["@@B@@@@@@@@@@@@@@@@@@@@@AA@@@@@BA@@@@@@@@@@@@@@@B@@@@@@@@@@@@@@@@@"],["@@BBFDD@@@B@@BB@@@@@B@@@B@B@@@@@D@@@B@B@@AB@@@B@B@BA@@@@@B@@B@@@@@@A@@@@B@@@B@@@@@@@@@@@@@@@@@B@@@BABADABABA@A@@B@AA@@@AA@@@AA@@A@@@A@@@@@A@@@A@@@@@A@A@@@@@A@@@A@@@A@@@A@@@A@@@A@@@@@@@AB@@@@@@A@A@@@@A@@@@A@@A@@@@@@@@@@@@@@@@A@@@@@@@@@@@@@A@@AB@@@A@@A@@@BA@@@A@@@A@AAAAC@CAAAC@@BA@@@A@@@@@A@@@@@@B@@AB@B@B@BBFDDDBDB"],["@@@@@B@@@@@@@@@@@@@@@@@@@@@@@@B@@@@@@AA@@@@@"],["@@@@@@B@@@@@@@@@@@@@@@@@@@A@@@@@@@@@@@"],["@@@@B@@@@@@@@@A@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@A@@@@@@@@@@@B@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@A@@@@A@@@@B@@B@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@B@@@@@A@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@A@@@@@@@B@@@@"],["@@@B@@B@@@@@@@@A@@@@@@@@A@@@@@@@@@"],["@@B@@AB@@A@@@@@@@@B@@@@@@@B@@@A@@A@@@@@@@@@@@@@@@@@@@@@A@@@@@@A@@@@@@@@@@@@@@@@@B@@A@@@@@@@@A@@@A@@@@AA@@@@@@@@@@@@B@@@@@@@@A@@@@@@@@@@B@@@B@@@@@@@BA@@@@BA@@B@BA@@@@@@@@@@@A@@@@@B@@@@@@@@BB@@@@@B@@@@@@B@@@@@@@BB@@@@@@@@@B@@@@A@@@@@@@@A@@@@@@@@@@@@@B@@A@@A@@@@AB@@@@@@@@@@@@@@@@@@@@@@A"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@A@@@@@B@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@B@@@@@BA@@@@B@@AB@@@B@@A@@@@@@@@@A@@@@@@@@B@@@@@@@@@@A@@@@@@@@@@@@A@@A@@@@A@C@ABA@A@AB@@@@@@@@@@@@@@@@@@A@@@@@A@@@A@@@@@@@@@@@@@@@@B@@@@@@@@@@@@@@@B@@@@@@@@@@@@@@@@@@@BB@@@B@B@@@DB"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@A@@@@@@@@@@@B"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@B@@@@@@@@@@@A@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@A@@@@@@@@@@@B@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"],["@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@A@@@@@@@B@@@@@"],["@@BB@@D@BA@@ACAA@@CB@D"],["@@@BD@BA@A@@AAABA@@B"],["@@BNHFNHN@@@BGFI@@AAEAECECIEEAGBAH"],["@@@@@BB@BAB@@AAAA@AB@B"],["@@BVFLTZLLHJLPHJJNNPHJFFFB@@BC@AKOW[WaEM@GGIGGGGCGCEAGEEAA@@EF@@"],["@@LTHHFHHHDDDBJADB@@@@@@KMIIIIOQEA@@@@AD"],["@@BD@@F@BCB@ACC@A@ABAB"],["@@@BBBF@@@@@@CAACAAB@B"],["@@@BDBDABC@@CA@@C@AB@B"],["@@n‰n]Nµoz[‚¹ňiÚĎUÒGtANCDV±v]ROXEZDhD`J\\N\\NX^°f¼FfHVLRTZVzHˆD€H¦H ALK^[|I`AdFdFpF¸A\\FP^f\\\\XlZhVbLRnXbRhRXHTXHTT’BRPdZZ^XV‚v–`‚†º†ŠtzPxV‚|l~t¸˜¾|€rv\\œ`Œb|f`~lVV\\TrVdRhTX\\`fLPJJ^TJFNXHTJŒFpHZJXLZZlZhZlPZ^`jd\\jLZHjFRFJJFHDPD^BZLfZPJNFhDL@LDjd|bv^xJèRŽV^PfnV‚Zr€‚dVpV|VhHvDr@bIjShuP]LWHE^KZA\\IJO@aDU|qRKJA`BbAlKbK^WNCt@ŠF\\@LILEBGCMBaBgDST‡LMNATBbARGNEHERKHMAMc_oeycgya_s‰IoC{@oFul¿|­D]G§ImUcGWEkOYƒ—U‘M™k…wƒ•¿ckW[QoCa[giaK[DiL[XiH[CQeƒg­…ƅŸƙc­CiDaAeEIQeY‘U¹GsEWMYIKKMUWW[M]OkBQCMSq@KHgRsFO@QAIEGGIKKMKMGYKOASICEQyMYyc‰as—ce[YMSgOgYew{scljyUaOKMU}AeAUSOSU[{ċmË_µE‹E«E•C{@]@MFMHMDgCE[ISKKOYKSWKIIEYBcFcDaFoKOIGMCWDMH]^‘j_FQBQMIKWAWFQFSNm–W\\_¦@ZJVJVAA¤OŽM†I^M\\_xeˆcvWd_^‹‚WPmT^"],["@@LFBBHLBB@DBDB@F@@A@AAA@ABAD@D@DAFEBE@CACCAE@A@@C@CA@EBE@A@CAAECIAC@@AB@B@DCJA@ABC@@B@D@BBD"],["@@BBB@B@BABA@A@@@@B@@@@B@@@@@@B@@AAA@@@@A@@@@@@A@@@AAA@@@@@A@A@@@@B@@A@@@A@@B@@@AAAAA@@@A@@B@@@@@B@@@BB@@D@B@@@B@B@@@@@@ABA@@BA@@B@B"],["@@BBBBF@B@@@BBB@B@BAB@B@BA@@@ACACAAAA@@@E@A@A@@@CB@B@B@@"],["@@@JDHB@BBFHBLDFHBF@HGLIFALAJDDABC@CGKEAKAOACAAAAC@EDKBI@M@IEKAAC@C@A@@CDIBACGAE@A@EBCDEBEACECG@QDEBCBA@A@CAAEE@I@ECICG@IBAB@DBFRHDBDJDBD@FCFCF@FDBDBDF@BDBJ@FCDGFIBABBHDDF@BC@AB@D@BD@HBHDFBBBBABCBEFAD@DDF@D@D"],["@@DDBB@@B@DAD@D@@AB@@C@GACEEE@C@AAA@ADE@@BBB@@GD@D@B@BB@B@BAD@BBBB"],["@@`JPDLFHAFEFAF@BBD@JAHGDIFC@ACCBGFEAGAGA@GBEACC@EBEFAH@DCAECAC@AA@C@EACCCECCB@DCBC@CAEAA@ADDLBDFDBHADKHKPEL@FCBE@GEEICCEAMDIHAFBNFH"],["@@IGEGOGEGECEBECGMAE@AFA@EAECCACBGACACE@MFIBGASCGCGBCF@F@FBFAFEDGBGCCBEFAD@DAD@BC@A@AB@DCBABCAEBAHBLHLDFH@DIBC@IHIBGBC@CD@DFHDHCDABGDAD@BDDFF@JAFAFBBBAF@DBDBDBDADEDK@YEOBIFAH@FBDBBFADAB@BDADABICG@C@AD@BBBDB@B@FADDDDBFBBDCHEH@DBBN@LBFDDHDBDBDADIBGDKDEF@DB@HBDFDFFBHEH@LDFDBVBF@FFLBFCJMFAHBFHDHJBF@FGBGDEF@D@DHF@FCJMLSBW@MHELCFGCKSEOAMDOJMDUAIE"],["@@@F@@BBF@BA@A@AB@B@DA@@DB@BBB@BBBF@FDDBFBDABBBBBBB@JEBA@A@ACAC@EAMICAE@E@EAA@C@CCC@C@CBADBF"],["@@CBAB@DBBBB@BBBBAB@B@@@BBB@BA@C@E@AEAE@"],["@@DBDAB@B@BBAD@BDDD@BAB@@BB@@@D@B@BBDBDADABC@EBA@A@A@@AACBA@C@A@CBCAEACCAC@A@AAAABAB@BC@A@A@AF@D@D"],["@@ADADAB@DDDF@DEBEBAD@@@DDBDD@DABC@C@CAIBEBEBABA@ACC@AD@BBBDBBDABCAIAAE@CAA@@A@C@C@C@CFE@A@@G@EBCBCAE@E@G@AAC@CD@D@FFHFB@FAFAL@LBDDB@DAB@B"],["@@B@@BB@@B@B@B@B@BB@B@DAFCBA@@@@@AB@BBB@BABABA@AA@AAA@@A@@@CAAA@EAC@A@AAA@A@AAA@A@@DCDBDBDBD"],["@@@BB@@B@@@@@B@A@@BA@@BA@@@A@@B@@@@A@@A@A@@@@@@B@@A@@@@A@@@@AB@@@@@@@B@@@@"],["@@@B@BBB@@B@@@BA@A@@@A@A@@B@@A@A@@A@@@A@@@A@A@@@@B@B@B"],["@@`FPBLAFC@AEGAG@K@GCCA@EBC@GCAG@GACA@C@MDIBABADBDDFDFEFCDGHAF@DDDJB"],["@@DBD@B@B@B@BA@@@CAAA@A@@A@@@@@AA@@@@AA@AA@@@@@A@AA@@@ABCA@@@AAAA@AB@B@B@BDBB@BB@D@BBB@B"],["@@CF@B@BBBB@DADBBAB@BEACB@AA@@E@CBA@"],["@@HBHBF@DABA@AAAAA@@@A@AB@@A@AA@A@A@AAA@C@@BA@A@CBAD@@A@@B@B@B@B"],["@@LDH@HABA@CAC@A@AAACAAAAC@C@CAAAC@@AA@BED@DA@CF@BBB@D@BAB@B@D@B@B"],["@@NHBJBJ@FBDJJHBTHHAPKBEAGGIMIMKGEIIICG@GHCFBH"],["@@NIHAzBVDPBL@DADIAGAE@KFKDEBCCAGAC@CE@IBIDGPIXKVGBE@GAIGOMOGAK@]LIXMJODS@MFY\\UNELDXDF@FCHOLCD@JBFJDJ@"],["@@AB@BBBD@JDD@D@@ABA@C@E@CAAAACAC@C@ABAD@DABAB"],["@@RCL@JDFBDADBB@BAF@FAJDL@DA@EBIDE@EACACAEBGCCEACCCE@CDGHG@CAEEAO@EBCDAHGFOFG@GBAD@DBHBHCDAJEDEHAJAHDB"],["@@HED@D@B@BFDHFBD@HAHEBC@EBADAB@BA@CACCCC@A@ADA@E@EAC@G@IDCHCDCBAB@B@B@@B@"],["@@@DBDB@BBDA@ABC@AACAAA@A@CB@D"],["@@HFH@F@BABC@E@EACECCAEBEDCFAFDD"],["@@LFN@JCHI@I@IEGGAMBKBCLCJDL"]],"encodeOffsets":[[[126651,26546]],[[126660,26547]],[[126659,26546]],[[126661,26545]],[[127552,26543]],[[126662,26541]],[[126660,26540]],[[126515,26405]],[[126526,26402]],[[126513,26397]],[[126513,26396]],[[126509,26395]],[[126510,26395]],[[126548,26376]],[[126537,26371]],[[126433,26363]],[[126456,26365]],[[126461,26357]],[[126459,26356]],[[126459,26356]],[[126460,26356]],[[126459,26356]],[[126445,26356]],[[126458,26356]],[[126458,26356]],[[126458,26356]],[[126457,26356]],[[126457,26356]],[[126429,26350]],[[126512,26346]],[[126512,26347]],[[126512,26347]],[[126515,26343]],[[126520,26341]],[[126514,26339]],[[126514,26339]],[[126515,26339]],[[126513,26338]],[[126513,26338]],[[126526,26337]],[[126527,26337]],[[126526,26337]],[[126527,26336]],[[126526,26336]],[[126527,26336]],[[122469,24374]],[[122474,24363]],[[122424,24251]],[[122554,24186]],[[122886,24033]],[[122929,24079]],[[122214,23857]],[[123719,22284]],[[123719,22276]],[[123335,22980]],[[122472,24310]],[[122427,24288]],[[122531,24227]],[[122375,24193]],[[122479,24184]],[[122427,24235]],[[122518,24117]],[[122382,24050]],[[122390,24070]],[[122392,23926]],[[122366,23948]],[[122185,23966]],[[122188,23883]],[[122204,23878]],[[122288,23774]],[[122388,23820]],[[122378,23824]],[[122484,23808]],[[122542,23818]],[[123244,22864]],[[124427,22618]],[[124526,22475]],[[124384,23221]],[[124866,25441]],[[125038,26094]],[[125007,26245]],[[124862,26043]]]}}],"UTF8Encoding":true});})); \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jQuery.print.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jQuery.print.js new file mode 100644 index 000000000..19049eca7 --- /dev/null +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Content/jquery/plugin/jqprint/jQuery.print.js @@ -0,0 +1,255 @@ +/* @license + * jQuery.print, version 1.5.1 + * (c) Sathvik Ponangi, Doers' Guild + * Licence: CC-By (http://creativecommons.org/licenses/by/3.0/) + *--------------------------------------------------------------------------*/ +(function ($) { + "use strict"; + // A nice closure for our definitions + function getjQueryObject(string) { + // Make string a vaild jQuery thing + var jqObj = $(""); + try { + jqObj = $(string) + .clone(); + } catch (e) { + jqObj = $("") + .html(string); + } + return jqObj; + } + + function printFrame(frameWindow, content, options) { + // Print the selected window/iframe + var def = $.Deferred(); + try { + frameWindow = frameWindow.contentWindow || frameWindow.contentDocument || frameWindow; + var wdoc = frameWindow.document || frameWindow.contentDocument || frameWindow; + if(options.doctype) { + wdoc.write(options.doctype); + } + wdoc.write(content); + wdoc.close(); + var printed = false; + var callPrint = function () { + if(printed) { + return; + } + // Fix for IE : Allow it to render the iframe + frameWindow.focus(); + try { + // Fix for IE11 - printng the whole page instead of the iframe content + if (!frameWindow.document.execCommand('print', false, null)) { + // document.execCommand returns false if it failed -http://stackoverflow.com/a/21336448/937891 + frameWindow.print(); + } + // focus body as it is losing focus in iPad and content not getting printed + $('body').focus(); + } catch (e) { + frameWindow.print(); + } + frameWindow.close(); + printed = true; + def.resolve(); + } + // Print once the frame window loads - seems to work for the new-window option but unreliable for the iframe + $(frameWindow).on("load", callPrint); + // Fallback to printing directly if the frame doesn't fire the load event for whatever reason + setTimeout(callPrint, options.timeout); + } catch (err) { + def.reject(err); + } + return def; + } + + function printContentInIFrame(content, options) { + var $iframe = $(options.iframe + ""); + var iframeCount = $iframe.length; + if (iframeCount === 0) { + // Create a new iFrame if none is given + $iframe = $(' - - -
-
-
我的头像
-
-
- -
-
-
-
-
修改密码
-
-
- -
-
-
- -
- @if (ViewBag.UserType == "学生") - { -
-

西昌民族幼儿师范高等专科学校

-
-

- 选修课选课流程 -

-
-
-

- 亲爱的同学： - 选修课选课流程如下： -

-

- 点击左侧 学子在线 选择 选课中心 选择 选修课选课 可以查看到所有选修课课程信息，点击课程名称和教师名称可以查看到当前课程简介和教师简介，选中课程点击右上角的 报名 按钮，可以进行选课报名，选中已报名课程点击右上角 取消报名 可以取消当前课程的报名状态。 -

-

- 点击左侧 学子在线 选择 选课中心 选择 我的选修课 可以查看到自己报名成功的选修课课程。 -

-

- 注：1、如果老师已经审核通过的课程不能进行取消报名操作。
- 2、每个学生有且只能选择一门选修课进行报名。
- 3、选择课只开放三天，三天后自动关闭选课功能，每门选修课记2个选修学分，如果修不够选修学分将会无法毕业。
-

-
-
- } - - @if (ViewBag.UserType == "学生" || ViewBag.UserType == "教师") - { -
-
-  编辑 -
-
- - } - - - - - -@Html.AppendJsFile("/Views/UserCenter/Index.js") \ No newline at end of file diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/_sgbak/PreviewForm.cshtml.14637.1.2019-11-13.16-46-31.2447 b/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/_sgbak/PreviewForm.cshtml.14637.1.2019-11-13.16-46-31.2447 deleted file mode 100644 index d6011b736..000000000 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Utility/_sgbak/PreviewForm.cshtml.14637.1.2019-11-13.16-46-31.2447 +++ /dev/null @@ -1,7 +0,0 @@ -@{ - ViewBag.Title = "表单预览"; - Layout = "~/Views/Shared/_CustmerFormPreview.cshtml"; -} -@Html.AppendJsFile("/Views/Utility/PreviewForm.js") - -