diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.cshtml index eae4e3edb..4d1e1614f 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.cshtml @@ -7,6 +7,20 @@
+
+
+
+
+
+
+
+
申请人
+
+
+
+
+
+
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js index 4ccfa8b43..5d431a34c 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js @@ -7,6 +7,8 @@ var refreshGirdData; var bootstrap = function ($, learun) { "use strict"; + var startTime; + var endTime; var processId = ''; var page = { init: function () { @@ -14,6 +16,37 @@ var bootstrap = function ($, learun) { page.bind(); }, bind: function () { + // 时间搜索框 + $('#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: '3', + selectfn: function (begin, end) { + startTime = begin; + endTime = end; + page.search(); + } + }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#ApplyUser').lrDataSourceSelect({ code: 'teacheruserdata', value: 'f_userid', text: 'f_realname' }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); @@ -148,7 +181,7 @@ var bootstrap = function ($, learun) { }); } }, - { label: "填报时间", name: "ApplyTime", width: 100, align: "left" }, + { label: "填报时间", name: "ApplyTime", width: 150, align: "left" }, { label: "填报人", name: "ApplyUser", width: 100, align: "left", formatterAsync: function (callback, value, row, op, $cell) { @@ -162,7 +195,7 @@ var bootstrap = function ($, learun) { }, { label: "备注", name: "Remark", width: 100, align: "left" }, { label: "总金额", name: "SumAmount", width: 100, align: "left" }, - { label: "人民币（大写）", name: "UpperAmount", width: 100, align: "left" }, + { label: "人民币（大写）", name: "UpperAmount", width: 200, align: "left" }, { label: "审批状态", name: "Status", width: 100, align: "left", formatter: function (cellvalue, row) { @@ -180,10 +213,12 @@ var bootstrap = function ($, learun) { mainId: 'Id', isPage: true }); - page.search(); + //page.search(); }, search: function (param) { param = param || {}; + param.StartTime = startTime; + param.EndTime = endTime; $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) }); } }; diff --git a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs index f4cec3a59..06cf05a57 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/TimeTable.cs @@ -13,7 +13,7 @@ using Nancy; namespace Learun.Application.WebApi.Modules { - public class TimeTable : BaseNoLoginApi + public class TimeTable : BaseApi { public TimeTable() : base("/learun/adms/timetable") @@ -251,8 +251,8 @@ namespace Learun.Application.WebApi.Modules curriculum = e.LessonSortNo == "2" ? e.LessonName + "[选修]" : e.LessonName, teacher = e?.EmpName, classRoom = string.IsNullOrEmpty(e.ClassroomName) ? "" : e.ClassroomName.Trim(), - academicyear = semesterAndYear.AcademicYearShort, - semester = strSemester, + academicyear = e.AcademicYear, + semester = e.Semester, lessonNo = e?.LessonNo, teachClassNo = e?.TeachClassNo, empno = e?.EmpNo, diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApply/FundsApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApply/FundsApplyService.cs index 2c897ed60..12ec5cf91 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApply/FundsApplyService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/AssetManagementSystem/FundsApply/FundsApplyService.cs @@ -39,6 +39,17 @@ namespace Learun.Application.TwoDevelopment.AssetManagementSystem var queryParam = queryJson.ToJObject(); // 虚拟参数 var dp = new DynamicParameters(new { }); + if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty()) + { + dp.Add("startTime", queryParam["StartTime"].ToDate(), DbType.DateTime); + dp.Add("endTime", queryParam["EndTime"].ToDate(), DbType.DateTime); + strSql.Append(" AND ( t.ApplyTime >= @startTime AND t.ApplyTime <= @endTime ) "); + } + if (!queryParam["ApplyUser"].IsEmpty()) + { + dp.Add("ApplyUser", queryParam["ApplyUser"].ToString(), DbType.String); + strSql.Append(" AND t.ApplyUser = @ApplyUser "); + } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(), dp, pagination); } catch (Exception ex) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/Payslip/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/Payslip/single.vue index 02e7b80f1..74e8f59c1 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/Payslip/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/Payslip/single.vue @@ -201,10 +201,10 @@ :disabled="!edit" title="失业保险" /> - diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/recruitPayslip/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/recruitPayslip/single.vue index 684931955..da90f3d78 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/recruitPayslip/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/recruitPayslip/single.vue @@ -214,10 +214,10 @@ :disabled="!edit" title="失业保险" /> - diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/welfarePayslip/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/welfarePayslip/single.vue index 7b831a783..4d3b6596a 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/welfarePayslip/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/Payslip/welfarePayslip/single.vue @@ -217,7 +217,7 @@ diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/list.vue index c91be8a0a..be691ca81 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/list.vue @@ -11,34 +11,39 @@ {{todayWeek.Monday}} - {{todayWeek.Sunday}} - + - - {{ item.en }} - {{ item.cn }} + + + {{ item.en }} + {{ item.cn }} + - + - 该时间段没有课程 - - - 第 {{ k.sectionTime }} 节 + + 该时间段没有课程 + + + + 第 {{ k.jc }} 节 - {{ k.LessonName }} + {{ k.curriculum }} - {{ k.EmpName }} + {{ k.teacher }} - {{ k.ClassroomName }} + {{ k.className }} @@ -51,303 +56,420 @@ diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/single.vue index a0a2db9b2..eb20952fb 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/studentAttendance/single.vue @@ -2,19 +2,19 @@ - {{ pageInfo.LessonDate }} 第{{ pageInfo.LessonTime.substring(1) }}节 + {{ pageInfo.lessonDate }} 第{{ pageInfo.jc }}节 -
{{ pageInfo.LessonName }}
+
{{ pageInfo.curriculum }}
 - {{ pageInfo.EmpName }} - {{ pageInfo.ClassroomName }} + {{ pageInfo.teacher }} + {{ pageInfo.classRoomNo }} 应到 {{ weekData.records }} @@ -121,13 +121,13 @@ export default{ sord: 'DESC' }, queryJson: JSON.stringify({ - year: _this.pageInfo.AcademicYear, - semester: _this.pageInfo.Semester, - empno: _this.pageInfo.EmpNo, - lessonNo: _this.pageInfo.LessonNo, - teachClassNo: _this.pageInfo.TeachClassNo, - lessonTime: _this.pageInfo.LessonTime, - LessonSortNo: _this.pageInfo.LessonSortNo, + year: _this.pageInfo.academicyear, + semester: _this.pageInfo.semester, + empno: _this.pageInfo.empno, + lessonNo: _this.pageInfo.lessonNo, + teachClassNo: _this.pageInfo.teachClassNo, + lessonTime: _this.pageInfo.lessonTime, + LessonSortNo: _this.pageInfo.lessonSortNo, }) }; @@ -159,9 +159,9 @@ export default{ _this.LOADING('保存数据中…'); _this.HTTP_POST('/Learun/adms/EducationalAdministration/StuAttendanceLeave/apply', { - lessonTime: _this.pageInfo.LessonTime, - lessonDate: _this.pageInfo.LessonDate, - classRoomNo: _this.pageInfo.ClassRoomNo, + lessonTime: _this.pageInfo.lessonTime, + lessonDate: _this.pageInfo.lessonDate, + classRoomNo: _this.pageInfo.classRoomNo, dataJson: JSON.stringify(_this.weekData.rows) }, '加载数据时出错').then(res => { _this.HIDE_LOADING(); @@ -184,6 +184,7 @@ export default{ }, created() { this.pageInfo = this.GET_PARAM(); //获取页面传递参数 + console.log(this.pageInfo) this.init(); } }