diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/list.vue index 52bc3168a..d9c18c95e 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/list.vue @@ -226,8 +226,8 @@ export default { // 点击「清空查询条件」按钮 reset() { - this.$refs.datefilter.changeDateRange('all') this.queryData = this.COPY(this.defaultQueryData) + this.$refs.datefilter.changeDateRange('all') // this.searchChange() }, diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/single.vue index 947aaa8eb..476cbcdad 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/SYS_ReceiveMessage/single.vue @@ -40,7 +40,20 @@ title="邮件内容" /> - + + + 提交保存 + + + 编辑本页 + + + 取消编辑 + + + 删除 + + diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue index 5aac79c2f..ab1414bcd 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/list.vue @@ -42,7 +42,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -242,8 +242,8 @@ this.searchData.ReceiverId=this.GET_GLOBAL('loginUser').userId; // 点击「清空查询条件」按钮 reset() { + this.queryData = this.COPY(this.defaultQueryData) this.$refs.datefilter.changeDateRange('all') - this.queryData = this.COPY(this.defaultQueryData) // this.searchChange() }, diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue index 4689f37be..f47aebaf8 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/Sys_ReceiveFile/single.vue @@ -1,12 +1,19 @@ @@ -151,7 +175,7 @@ export default { } this.LOADING("正在提交..."); const postData = await this.getPostData(this.id); - adms( + this.HTTP_POST( "learun/adms/EducationalAdministration/Sys_ReceiveFile/save", postData, "表单提交保存失败" diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/list.vue index c74def0ca..ecf189881 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/DutySchedule/list.vue @@ -2,9 +2,8 @@ - - - {{ tips }} + + {{ tips }} @@ -44,8 +43,20 @@ - - + + + 重置查询条件 @@ -114,7 +125,9 @@ export default { // 列表与分页信息 page: 1, total: 2, - list: [] + list: [] , + + dateRange:null } }, @@ -186,6 +199,12 @@ export default { // 设置搜索条件 async searchChange() { const result = {} + + // 时间查询相关参数 + if (this.dateRange) { + result.StartTime = this.dateRange.start + result.EndTime = this.dateRange.end + } // 将其他查询项添加到查询 JSON 中 const queryObj = pickBy(this.queryData, t => (Array.isArray(t) ? t.length > 0 : t)) @@ -198,7 +217,8 @@ export default { // 点击「清空查询条件」按钮 reset() { this.queryData = this.COPY(this.defaultQueryData) - this.searchChange() + this.$refs.datefilter.changeDateRange('all') + // this.searchChange() }, // 点击「编辑」、「查看」、「添加」、「删除」按钮