diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuMail/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuMail/list.vue index 4f123742e..23f23831e 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuMail/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuMail/list.vue @@ -160,7 +160,7 @@ export default { }, // 拉取列表 - async fetchList() { + async fetchList(isConcat=true) { if (this.page > this.total) { return } const result = await this.HTTP_GET( @@ -178,19 +178,19 @@ export default { this.total = result.total this.page = result.page + 1 - this.list = this.list.concat(result.rows) + this.list = isConcat?this.list.concat(result.rows):result.rows; this.tips = `已加载 ${Math.min(result.page, result.total)} / ${result.total} 页,共 ${result.records} 项` this.loadState = result.page >= result.total ? '已加载所有项目' : '向下翻以加载更多' }, // 刷新清空列表 - async refreshList() { + async refreshList(isConcat=true) { this.page = 1 this.total = 2 this.list = [] - await this.fetchList() + await this.fetchList(isConcat); }, // 列表下拉 @@ -215,14 +215,14 @@ export default { Object.assign(result, mapValues(queryObj, t => (Array.isArray(t) ? t.join(',') : t))) this.searchData = result - await this.refreshList() + await this.refreshList(false); }, // 点击「清空查询条件」按钮 reset() { - this.$refs.datefilter.changeDateRange('all') this.queryData = this.COPY(this.defaultQueryData) - this.searchChange() + this.$refs.datefilter.changeDateRange('all') + // this.searchChange() }, // 点击「编辑」、「查看」、「添加」、「删除」按钮 diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ActivitySchedule/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ActivitySchedule/list.vue index b8f29045f..b12ee8f77 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ActivitySchedule/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ActivitySchedule/list.vue @@ -175,7 +175,7 @@ export default { { // 这里 sidx 表示排序字段,sord 表示排序方式(DESC=降序,ASC=升序) // 代码生成器生成时默认按照主键排序,您可以修改成按创建时间的字段降序 - pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, + pagination: { rows: 10, page: this.page, sidx: 'Date', sord: 'DESC' }, queryJson: JSON.stringify(this.searchData) }, '加载数据时出错' @@ -227,9 +227,9 @@ export default { // 点击「清空查询条件」按钮 reset() { - this.$refs.datefilter.changeDateRange('all') this.queryData = this.COPY(this.defaultQueryData) - this.searchChange() + this.$refs.datefilter.changeDateRange('all') + // this.searchChange() }, // 点击「编辑」、「查看」、「添加」、「删除」按钮 diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/list.vue index 1efc36c72..7ca2c81f4 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/ClassWork/list.vue @@ -166,7 +166,7 @@ export default { }, // 拉取列表 - async fetchList() { + async fetchList(isConcat=true) { if (this.page > this.total) { return } const result = await this.HTTP_GET( @@ -174,7 +174,7 @@ export default { { // 这里 sidx 表示排序字段,sord 表示排序方式(DESC=降序,ASC=升序) // 代码生成器生成时默认按照主键排序,您可以修改成按创建时间的字段降序 - pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, + pagination: { rows: 10, page: this.page, sidx: 'Date', sord: 'DESC' }, queryJson: JSON.stringify(this.searchData) }, '加载数据时出错' @@ -184,19 +184,19 @@ export default { this.total = result.total this.page = result.page + 1 - this.list = this.list.concat(result.rows) + this.list = isConcat?this.list.concat(result.rows):result.rows; this.tips = `已加载 ${Math.min(result.page, result.total)} / ${result.total} 页,共 ${result.records} 项` this.loadState = result.page >= result.total ? '已加载所有项目' : '向下翻以加载更多' }, // 刷新清空列表 - async refreshList() { + async refreshList(isConcat=true) { this.page = 1 this.total = 2 this.list = [] - await this.fetchList() + await this.fetchList(isConcat); }, // 列表下拉 @@ -221,14 +221,14 @@ export default { Object.assign(result, mapValues(queryObj, t => (Array.isArray(t) ? t.join(',') : t))) this.searchData = result - await this.refreshList() + await this.refreshList(false); }, // 点击「清空查询条件」按钮 reset() { - this.$refs.datefilter.changeDateRange('all') this.queryData = this.COPY(this.defaultQueryData) - this.searchChange() + this.$refs.datefilter.changeDateRange('all') + // this.searchChange() }, // 点击「编辑」、「查看」、「添加」、「删除」按钮 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 6724ebd9d..a86dd57df 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 @@ -217,8 +217,8 @@ export default { // 点击「清空查询条件」按钮 reset() { this.queryData = this.COPY(this.defaultQueryData) - this.$refs.datefilter.changeDateRange('all') - // this.searchChange() + // this.$refs.datefilter.changeDateRange('all') + this.searchChange() }, // 点击「编辑」、「查看」、「添加」、「删除」按钮 diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EmpRepair/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EmpRepair/list.vue index 919127a4e..e443e60e7 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EmpRepair/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/EmpRepair/list.vue @@ -154,7 +154,7 @@ export default { }, // 拉取列表 - async fetchList() { + async fetchList(isConcat=true) { if (this.page > this.total) { return } const result = await this.HTTP_GET( @@ -162,7 +162,7 @@ export default { { // 这里 sidx 表示排序字段,sord 表示排序方式(DESC=降序,ASC=升序) // 代码生成器生成时默认按照主键排序,您可以修改成按创建时间的字段降序 - pagination: { rows: 10, page: this.page, sidx: 'Id', sord: 'DESC' }, + pagination: { rows: 10, page: this.page, sidx: 'ApplyTime', sord: 'DESC' }, queryJson: JSON.stringify(this.searchData) }, '加载数据时出错' @@ -172,19 +172,19 @@ export default { this.total = result.total this.page = result.page + 1 - this.list = this.list.concat(result.rows) + this.list = isConcat?this.list.concat(result.rows):result.rows; this.tips = `已加载 ${Math.min(result.page, result.total)} / ${result.total} 页,共 ${result.records} 项` this.loadState = result.page >= result.total ? '已加载所有项目' : '向下翻以加载更多' }, // 刷新清空列表 - async refreshList() { + async refreshList(isConcat=true) { this.page = 1 this.total = 2 this.list = [] - await this.fetchList() + await this.fetchList(isConcat); }, // 列表下拉 @@ -209,14 +209,14 @@ export default { Object.assign(result, mapValues(queryObj, t => (Array.isArray(t) ? t.join(',') : t))) this.searchData = result - await this.refreshList() + await this.refreshList(false); }, // 点击「清空查询条件」按钮 reset() { - this.$refs.datefilter.changeDateRange('all') - this.queryData = this.COPY(this.defaultQueryData) - this.searchChange() + 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/PersonnelManagement/Schedule/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/Schedule/list.vue index 3e0e76b9d..f912b10fa 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/Schedule/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/Schedule/list.vue @@ -154,7 +154,7 @@ export default { }, // 拉取列表 - async fetchList() { + async fetchList(isConcat=true) { if (this.page > this.total) { return } const result = await this.HTTP_GET( @@ -162,7 +162,7 @@ export default { { // 这里 sidx 表示排序字段,sord 表示排序方式(DESC=降序,ASC=升序) // 代码生成器生成时默认按照主键排序,您可以修改成按创建时间的字段降序 - pagination: { rows: 10, page: this.page, sidx: 'F_ScheduleId', sord: 'DESC' }, + pagination: { rows: 10, page: this.page, sidx: 'F_CreateDate', sord: 'DESC' }, queryJson: JSON.stringify(this.searchData) }, '加载数据时出错' @@ -172,19 +172,19 @@ export default { this.total = result.total this.page = result.page + 1 - this.list = this.list.concat(result.rows) + this.list = isConcat?this.list.concat(result.rows):result.rows; this.tips = `已加载 ${Math.min(result.page, result.total)} / ${result.total} 页,共 ${result.records} 项` this.loadState = result.page >= result.total ? '已加载所有项目' : '向下翻以加载更多' }, // 刷新清空列表 - async refreshList() { + async refreshList(isConcat=true) { this.page = 1 this.total = 2 this.list = [] - await this.fetchList() + await this.fetchList(isConcat); }, // 列表下拉 @@ -209,14 +209,14 @@ export default { Object.assign(result, mapValues(queryObj, t => (Array.isArray(t) ? t.join(',') : t))) this.searchData = result - await this.refreshList() + await this.refreshList(false); }, // 点击「清空查询条件」按钮 reset() { - this.$refs.datefilter.changeDateRange('all') this.queryData = this.COPY(this.defaultQueryData) - this.searchChange() + this.$refs.datefilter.changeDateRange('all') + // this.searchChange() }, // 点击「编辑」、「查看」、「添加」、「删除」按钮