From d353340f53817f939b21b5197a813b84e940b065 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Tue, 4 Apr 2023 17:46:06 +0800
Subject: [PATCH] =?UTF-8?q?app2.0=E8=80=83=E5=8A=A1=E7=AE=A1=E7=90=86=20?=
 =?UTF-8?q?=E6=95=99=E5=B8=88/=E5=AD=A6=E7=94=9F=20=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Exam_ArrangeExamTermNewService.cs         |  17 +
 .../LearunApp-2.2.0/pages.json                |  14 +
 .../ArrangeExamTerm/list.vue                  | 368 ++++++++++++++++++
 .../ArrangeExamTermNew/list.vue               | 344 ++++++++++++++++
 4 files changed, 743 insertions(+)
 create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeExamTerm/list.vue
 create mode 100644 Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeExamTermNew/list.vue

diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs
index 77633c8df..5f4ccbfcf 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ArrangeExamTermNew/Exam_ArrangeExamTermNewService.cs	
@@ -132,10 +132,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     strSql.Append(" and t.LessonNo like '%" + queryParam["LessonNo"].ToString() + "%' ");
                 }
+                if (!queryParam["LessonName"].IsEmpty())
+                {
+                    strSql.Append(" and t.LessonName like '%" + queryParam["LessonName"].ToString() + "%' ");
+                }
                 if (!queryParam["ClassNo"].IsEmpty())
                 {
                     strSql.Append(" and t.ClassNo='" + queryParam["ClassNo"].ToString() + "' ");
                 }
+                if (!queryParam["ClassName"].IsEmpty())
+                {
+                    strSql.Append(" and t.ClassName like'%" + queryParam["ClassName"].ToString() + "%' ");
+                }
                 if (!queryParam["StuNo"].IsEmpty())
                 {
                     strSql.Append(" and t.StuNo='" + queryParam["StuNo"].ToString() + "' ");
@@ -144,10 +152,18 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 {
                     strSql.Append(" and t.EmpNo like '%" + queryParam["EmpNo"].ToString() + "%' ");
                 }
+                if (!queryParam["EmpName"].IsEmpty())
+                {
+                    strSql.Append(" and t.EmpName like '%" + queryParam["EmpName"].ToString() + "%' ");
+                }
                 if (!queryParam["ClassRoomNo"].IsEmpty())
                 {
                     strSql.Append(" and t.ClassRoomNo='" + queryParam["ClassRoomNo"].ToString() + "' ");
                 }
+                if (!queryParam["ClassRoomName"].IsEmpty())
+                {
+                    strSql.Append(" and t.ClassRoomName like '%" + queryParam["ClassRoomName"].ToString() + "%' ");
+                }
                 if (!queryParam["StartTime"].IsEmpty() && !queryParam["EndTime"].IsEmpty())
                 {
                     strSql.Append(" AND ( ExamDate >= '" + queryParam["StartTime"].ToString() + "' AND ExamDate <= '" + queryParam["EndTime"].ToString() + "' ) ");
@@ -167,6 +183,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 }
             }
         }
+
         /// <summary>
         /// 获取页面显示列表数据
         /// </summary>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json
index c4be81c09..ff1ff458b 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json	
@@ -1155,6 +1155,20 @@
 			"style": {
 				"navigationBarTitleText": "资产详情"
 			}
+		},
+		//考试安排教师功能
+		{
+			"path": "pages/EducationalAdministration/ArrangeExamTermNew/list",
+			"style": {
+				"navigationBarTitleText": "考试安排"
+			}
+		},
+		//考试安排学生功能
+		{
+			"path": "pages/EducationalAdministration/ArrangeExamTerm/list",
+			"style": {
+				"navigationBarTitleText": "考试安排"
+			}
 		}
 		
 		
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeExamTerm/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeExamTerm/list.vue
new file mode 100644
index 000000000..b7f74ad90
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeExamTerm/list.vue	
@@ -0,0 +1,368 @@
+<template>
+	<view class="page">
+		<!-- 主列表页 -->
+		<view :class="sideOpen ? 'show' : ''" class="mainpage" style="padding-top: 80rpx;">
+			<!-- 顶部条目/分页信息栏 -->
+			<l-customlist-banner @buttonClick="sideOpen = true">{{ tips }}</l-customlist-banner>
+
+			<!-- 滚动列表，跨端支持上拉/下拉 -->
+			<l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="list">
+				<l-customlist :tips="loadState" showTips>
+					<!-- 单条记录 -->
+					<view class="customlist-item" v-for="item of list" :key="item.EPIId">
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">考试日期：</text>
+							{{ displayListItem(item, 'ExamDate') }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">考试时间：</text>
+							{{ displayListItem(item, 'ExamTime') }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">课程编号：</text>
+							{{ displayListItem(item, 'LessonNo') }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">课程名称：</text>
+							{{ displayListItem(item, 'LessonName') }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">教师名称：</text>
+							{{ displayListItem(item, 'EmpName') }}
+						</view>
+						
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">教室名称：</text>
+							{{ displayListItem(item, 'ClassroomName') }}
+						</view>
+						
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">座位编号：</text>
+							{{ displayListItem(item, 'SitNumber') }}
+						</view>
+
+						<!-- <l-customlist-action showEdit @edit="action('edit', item.EPIId)" showDelete @delete="action('delete', item.EPIId)" @view="action('view', item.EPIId)" /> -->
+					</view>
+				</l-customlist>
+			</l-scroll-list>
+		</view>
+
+		<!-- 关闭侧边抽屉按钮 -->
+		<view @click="sideOpen = false" :class="sideOpen ? 'show' : ''" class="sideclose">
+			<l-icon type="pullright" color="blue" />
+		</view>
+
+		<!-- 侧边栏，用于设置查询条件 -->
+		<scroll-view :class="sideOpen ? 'show' : ''" class="sidepage" scroll-y>
+			<view v-if="ready" class="padding">
+
+				<l-customlist-sidepage-datefilter v-model="dateRange" @change="searchChange" title="按时间日期查询: "
+					ref="datefilter" class="margin-bottom" />
+				<l-input v-model="queryData.LessonName" @change="searchChange" title="课程" placeholder="按课程查询" />
+				<l-input v-model="queryData.EmpName" @change="searchChange" title="教师" placeholder="按教师查询" />
+				<l-input v-model="queryData.ClassRoomName" @change="searchChange" title="教室" placeholder="按教室查询" />
+
+				<!-- 重置查询条件按钮 -->
+				<view class="padding-tb">
+					<l-button @click="reset" line="orange" class="block" block>重置查询条件</l-button>
+				</view>
+			</view>
+		</scroll-view>
+
+		<!--     <l-customlist-add v-if="!sideOpen" @click="action('add')" /> -->
+
+	</view>
+</template>
+
+
+<script>
+	/* 
+	 * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+	 * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+	 * 创建人：超级管理员 
+	 * 日  期：2020-10-14 11:43 
+	 * 描  述：1111 
+	 */
+
+	/** 
+	 * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+	 * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+	 * { "path": "pages/EducationalAdministration/ArrangeExamTerm/list", "style": { "navigationBarTitleText": "表单列表页" } } 
+	 *  
+	 * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+	 * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+	 */
+	import moment from 'moment'
+	import get from 'lodash/get'
+	import set from 'lodash/set'
+	import pickBy from 'lodash/pickBy'
+	import mapValues from 'lodash/mapValues'
+
+	export default {
+		data() {
+			return {
+				// 数据项的数据类型、结构 
+				scheme: {
+					ClassroomName: {
+						type: 'text'
+					},
+					ClassroomNo: {
+						type: 'text'
+					},
+					EPIId: {
+						type: 'text'
+					},
+					EPId: {
+						type: 'text'
+					},
+					EmpName: {
+						type: 'text'
+					},
+					EmpNo: {
+						type: 'text'
+					},
+					ExamDate: {
+						type: 'datetime',dateformat: '0'
+					},
+					ExamTime: {
+						type: 'text'
+					},
+					F_SchoolId: {
+						type: 'text'
+					},
+					LessonName: {
+						type: 'text'
+					},
+					LessonNo: {
+						type: 'text'
+					},
+					SitNumber: {
+						type: 'text'
+					},
+				},
+				// 查询条件 
+				searchData: {
+					StuNo: this.GET_GLOBAL('loginUser').account,
+				},
+				defaultQueryData: {},
+				queryData: {
+					//查询条件的文本框
+					StuNo: this.GET_GLOBAL('loginUser').account,
+					LessonName:'',
+					ClassRoomName:'',
+					EmpName:'',
+				},
+
+				// 数据源 
+				dataSource: {
+					// LessonNo:[],
+					// ClassRoomNo:[],
+					// EmpNo:[],
+				},
+
+				// 时间查询参数 
+				dateRange: null,
+
+				// 页面相关参数 
+				ready: false,
+				tips: '加载中...',
+				loadState: '向下翻以加载更多',
+				sideOpen: false,
+
+				// 列表与分页信息 
+				page: 1,
+				total: 2,
+				list: []
+			}
+		},
+
+		async onLoad() {
+			await this.init()
+		},
+		onUnload() {
+			this.OFF('EducationalAdministrationArrangeExamTerm-list-change')
+		},
+
+		methods: {
+			// 页面初始化 
+			async init() {
+				let _this = this;
+				_this.searchData.StuNo = this.GET_GLOBAL('loginUser').account;
+				this.ON('EducationalAdministrationArrangeExamTerm-list-change', this.refreshList)
+
+				// 拉取加载列表和数据源 
+				await Promise.all([
+					// this.FETCH_DATASOURCE('LessonInfo').then(result => {
+					//   this.dataSource.LessonNo = result.data.sort((a,b)=>{return b.lessonno.lessonno}).map(t => ({ text: t.lessonname, value: t.lessonno })) 
+					// }),
+					// this.FETCH_DATASOURCE('ClassRoomInfo').then(result => {
+					//   this.dataSource.ClassRoomNo = result.data.sort((a,b)=>{return b.classroomno.classroomno}).map(t => ({ text: t.classroomname, value: t.classroomno })) 
+					// }),
+					// this.FETCH_DATASOURCE('EmpInfo').then(result => {
+					//   this.dataSource.EmpNo = result.data.sort((a,b)=>{return b.empno.empno}).map(t => ({ text: t.empname, value: t.empno })) 
+					// }),
+					() => {}
+					])
+				await this.fetchList()
+				// 初始化查询条件 
+				this.defaultQueryData = this.COPY(this.queryData)
+				this.ready = true
+			},
+
+			// 拉取列表 
+			async fetchList(isConcat = true) {
+				// if (this.page > this.total) { return } 
+
+				const result = await this.HTTP_GET(
+					'learun/ask/teststulist', {
+						// 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
+						// 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
+						pagination: {
+							rows: 10,
+							page: this.page,
+							sidx: 'ExamDate desc,ExamTime asc,LessonNo asc,ClassroomNo asc',
+							sord: 'DESC'
+						},
+						queryJson: JSON.stringify(this.searchData)
+					},
+					'加载数据时出错'
+				)
+
+				if (!result) {
+					return
+				}
+
+				this.total = result.total
+				this.page = result.page + 1
+				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() {
+				this.page = 1
+				this.total = 2
+				this.list = []
+
+				await this.fetchList(false)
+			},
+
+			// 列表下拉 
+			pullDown() {
+				this.refreshList().then(() => {
+					this.$refs.list.stopPullDown()
+				})
+			},
+
+			// 设置搜索条件 
+			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))
+				Object.assign(result, mapValues(queryObj, t => (Array.isArray(t) ? t.join(',') : t)))
+
+				this.searchData = result
+				await this.refreshList()
+			},
+
+			// 点击「清空查询条件」按钮 
+			reset() {
+				this.$refs.datefilter.changeDateRange('all') 
+				this.queryData = this.COPY(this.defaultQueryData)
+				this.searchChange()
+			},
+
+			// 点击「编辑」、「查看」、「添加」、「删除」按钮 
+			async action(type, id = '') {
+				switch (type) {
+					case 'view':
+						this.NAV_TO(`./single?type=view&id=${id}`)
+						return
+
+					case 'add':
+						this.NAV_TO('./single?type=create')
+						return
+
+					case 'edit':
+						this.NAV_TO(`./single?type=edit&id=${id}`)
+						return
+
+					case 'delete':
+						if (!(await this.CONFIRM('删除项目', '确定要删除该项吗？', true))) {
+							return
+						}
+
+						this.HTTP_POST('learun/adms/EducationalAdministration/ArrangeExamTerm/delete', id, '删除失败')
+							.then(success => {
+								if (!success) {
+									return
+								}
+								this.TOAST('删除成功', 'success')
+								this.refreshList()
+							})
+						return
+
+					default:
+						return
+				}
+			},
+
+			// 显示列表中的标题项 
+			displayListItem(item, field) {
+				const fieldItem = this.scheme[field]
+				const value = item[field]
+
+				switch (fieldItem.type) {
+					case 'currentInfo':
+					case 'organize':
+						return fieldItem.dataType === 'time' ? value : get(this.GET_GLOBAL(fieldItem.dataType),
+							`${value}.name`, '')
+
+					case 'radio':
+					case 'select':
+						const selectItem = this.dataSource[field].find(t => t.value === String(value))
+						return get(selectItem, 'text', '')
+
+					case 'checkbox':
+						if (!value || value.split(',').length <= 0) {
+							return ''
+						}
+						const checkboxItems = value.split(',')
+						return this.dataSource[field].filter(t => checkboxItems.includes(t.value)).map(t => t.text).join(
+							'，')
+
+					case 'datetime':
+						if (!value) {
+							return ''
+						}
+						return moment(value).format(Number(fieldItem.dateformat) === 0 ? 'YYYY年 M月 D日' :
+							'YYYY-MM-DD HH:mm')
+
+					default:
+						return value === null || value === undefined ? '' : value
+				}
+			}
+
+		}
+	}
+</script>
+
+
+<style lang="less" scoped>
+	@import '~@/common/css/sidepage.less';
+	@import '~@/common/css/customlist.less';
+</style>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeExamTermNew/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeExamTermNew/list.vue
new file mode 100644
index 000000000..86708e937
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/ArrangeExamTermNew/list.vue	
@@ -0,0 +1,344 @@
+<template>
+	<view class="page">
+		<!-- 主列表页 -->
+		<view :class="sideOpen ? 'show' : ''" class="mainpage" style="padding-top: 80rpx;">
+			<!-- 顶部条目/分页信息栏 -->
+			<l-customlist-banner @buttonClick="sideOpen = true">{{ tips }}</l-customlist-banner>
+
+			<!-- 滚动列表，跨端支持上拉/下拉 -->
+			<l-scroll-list v-if="ready" @pullDown="pullDown" @toBottom="fetchList()" ref="list">
+				<l-customlist :tips="loadState" showTips>
+					<!-- 单条记录 -->
+					<view class="customlist-item" v-for="item of list" :key="item.EPIId">
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">考试日期：</text>
+							{{ displayListItem(item, 'ExamDate') }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">考试时间：</text>
+							{{ displayListItem(item, 'ExamTime') }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">课程编号：</text>
+							{{ displayListItem(item, 'LessonNo') }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">课程名称：</text>
+							{{ displayListItem(item, 'LessonName') }}
+						</view>
+
+						<view class="customlist-item-field">
+							<text class="customlist-item-field-title">教室名称：</text>
+							{{ displayListItem(item, 'ClassroomName') }}
+						</view>
+
+
+						<!-- <l-customlist-action showEdit @edit="action('edit', item.EPIId)" showDelete @delete="action('delete', item.EPIId)" @view="action('view', item.EPIId)" /> -->
+					</view>
+				</l-customlist>
+			</l-scroll-list>
+		</view>
+
+		<!-- 关闭侧边抽屉按钮 -->
+		<view @click="sideOpen = false" :class="sideOpen ? 'show' : ''" class="sideclose">
+			<l-icon type="pullright" color="blue" />
+		</view>
+
+		<!-- 侧边栏，用于设置查询条件 -->
+		<scroll-view :class="sideOpen ? 'show' : ''" class="sidepage" scroll-y>
+			<view v-if="ready" class="padding">
+
+				<l-customlist-sidepage-datefilter v-model="dateRange" @change="searchChange" title="按时间日期查询: "
+					ref="datefilter" class="margin-bottom" />
+				<l-input v-model="queryData.LessonName" @change="searchChange" title="课程" placeholder="按课程查询" />
+			
+				<!-- 重置查询条件按钮 -->
+				<view class="padding-tb">
+					<l-button @click="reset" line="orange" class="block" block>重置查询条件</l-button>
+				</view>
+			</view>
+		</scroll-view>
+
+		<!--     <l-customlist-add v-if="!sideOpen" @click="action('add')" /> -->
+
+	</view>
+</template>
+
+
+<script>
+	/* 
+	 * 版 本 Learun-ADMS V7.0.3 力软敏捷开发框架(http://www.learun.cn) 
+	 * Copyright (c) 2013-2020 上海力软信息技术有限公司 
+	 * 创建人：超级管理员 
+	 * 日  期：2020-10-14 11:43 
+	 * 描  述：1111 
+	 */
+
+	/** 
+	 * 本段代码由移动端代码生成器输出，移动端须 2.2.0 版本及以上可以使用 
+	 * 请在移动端 /pages.json 中的 pages 字段中添加一条记录： 
+	 * { "path": "pages/EducationalAdministration/ArrangeExamTermNew/list", "style": { "navigationBarTitleText": "表单列表页" } } 
+	 *  
+	 * （navigationBarTitleText 字段为本页面的标题文本，可以修改） 
+	 * （必须自行操作该步骤，力软代码生成器不会自动帮您修改 /pages.json 文件） 
+	 */
+	import moment from 'moment'
+	import get from 'lodash/get'
+	import set from 'lodash/set'
+	import pickBy from 'lodash/pickBy'
+	import mapValues from 'lodash/mapValues'
+
+	export default {
+		data() {
+			return {
+				// 数据项的数据类型、结构 
+				scheme: {
+					ClassroomName: {
+						type: 'text'
+					},
+					ClassroomNo: {
+						type: 'text'
+					},
+					EPIId: {
+						type: 'text'
+					},
+					EPId: {
+						type: 'text'
+					},
+					EmpName: {
+						type: 'text'
+					},
+					EmpNo: {
+						type: 'text'
+					},
+					ExamDate: {
+						type: 'datetime',dateformat: '0'
+					},
+					ExamTime: {
+						type: 'text'
+					},
+					F_SchoolId: {
+						type: 'text'
+					},
+					LessonName: {
+						type: 'text'
+					},
+					LessonNo: {
+						type: 'text'
+					},
+				},
+				// 查询条件 
+				searchData: {
+					EmpNo: this.GET_GLOBAL('loginUser').account
+				},
+				defaultQueryData: {},
+				queryData: {
+					//查询条件的文本框
+					EmpNo: this.GET_GLOBAL('loginUser').account,
+					LessonName:'',
+				},
+
+				// 数据源 
+				dataSource: {
+					// LessonNo: [],
+				},
+
+				// 时间查询参数 
+				dateRange: null,
+
+				// 页面相关参数 
+				ready: false,
+				tips: '加载中...',
+				loadState: '向下翻以加载更多',
+				sideOpen: false,
+
+				// 列表与分页信息 
+				page: 1,
+				total: 2,
+				list: []
+			}
+		},
+
+		async onLoad() {
+			await this.init()
+		},
+		onUnload() {
+			this.OFF('EducationalAdministrationArrangeExamTermNew-list-change')
+		},
+
+		methods: {
+			// 页面初始化 
+			async init() {
+				let _this = this;
+				_this.searchData.EmpNo = this.GET_GLOBAL('loginUser').account;
+				this.ON('EducationalAdministrationArrangeExamTermNew-list-change', this.refreshList)
+
+				// 拉取加载列表和数据源 
+				await Promise.all([
+					// this.FETCH_DATASOURCE('LessonInfo').then(result => {
+					//   this.dataSource.LessonNo = result.data.sort((a,b)=>{return b.lessonno.lessonno}).map(t => ({ text: t.lessonname, value: t.lessonno })) 
+					// }),  
+					() => {}
+					])
+				await this.fetchList()
+				// 初始化查询条件 
+				this.defaultQueryData = this.COPY(this.queryData)
+				this.ready = true
+			},
+
+			// 拉取列表 
+			async fetchList(isConcat = true) {
+				// if (this.page > this.total) { return } 
+
+				const result = await this.HTTP_GET(
+					'learun/ask/testlist', {
+						// 这里 sidx 表示排序字段，sord 表示排序方式(DESC=降序，ASC=升序) 
+						// 代码生成器生成时默认按照主键排序，您可以修改成按创建时间的字段降序 
+						pagination: {
+							rows: 10,
+							page: this.page,
+							sidx: 'ExamDate desc,ExamTime asc,LessonNo asc,ClassroomNo asc',
+							sord: 'DESC'
+						},
+						queryJson: JSON.stringify(this.searchData)
+					},
+					'加载数据时出错'
+				)
+
+				if (!result) {
+					return
+				}
+
+				this.total = result.total
+				this.page = result.page + 1
+				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() {
+				this.page = 1
+				this.total = 2
+				this.list = []
+
+				await this.fetchList(false)
+			},
+
+			// 列表下拉 
+			pullDown() {
+				this.refreshList().then(() => {
+					this.$refs.list.stopPullDown()
+				})
+			},
+
+			// 设置搜索条件 
+			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))
+				Object.assign(result, mapValues(queryObj, t => (Array.isArray(t) ? t.join(',') : t)))
+
+				this.searchData = result
+				await this.refreshList()
+			},
+
+			// 点击「清空查询条件」按钮 
+			reset() {
+				this.$refs.datefilter.changeDateRange('all') 
+				this.queryData = this.COPY(this.defaultQueryData)
+				this.searchChange()
+			},
+
+			// 点击「编辑」、「查看」、「添加」、「删除」按钮 
+			async action(type, id = '') {
+				switch (type) {
+					case 'view':
+						this.NAV_TO(`./single?type=view&id=${id}`)
+						return
+
+					case 'add':
+						this.NAV_TO('./single?type=create')
+						return
+
+					case 'edit':
+						this.NAV_TO(`./single?type=edit&id=${id}`)
+						return
+
+					case 'delete':
+						if (!(await this.CONFIRM('删除项目', '确定要删除该项吗？', true))) {
+							return
+						}
+
+						this.HTTP_POST('learun/adms/EducationalAdministration/ArrangeExamTermNew/delete', id, '删除失败')
+							.then(success => {
+								if (!success) {
+									return
+								}
+								this.TOAST('删除成功', 'success')
+								this.refreshList()
+							})
+						return
+
+					default:
+						return
+				}
+			},
+
+			// 显示列表中的标题项 
+			displayListItem(item, field) {
+				const fieldItem = this.scheme[field]
+				const value = item[field]
+
+				switch (fieldItem.type) {
+					case 'currentInfo':
+					case 'organize':
+						return fieldItem.dataType === 'time' ? value : get(this.GET_GLOBAL(fieldItem.dataType),
+							`${value}.name`, '')
+
+					case 'radio':
+					case 'select':
+						const selectItem = this.dataSource[field].find(t => t.value === String(value))
+						return get(selectItem, 'text', '')
+
+					case 'checkbox':
+						if (!value || value.split(',').length <= 0) {
+							return ''
+						}
+						const checkboxItems = value.split(',')
+						return this.dataSource[field].filter(t => checkboxItems.includes(t.value)).map(t => t.text).join(
+							'，')
+
+					case 'datetime':
+						if (!value) {
+							return ''
+						}
+						return moment(value).format(Number(fieldItem.dateformat) === 0 ? 'YYYY年 M月 D日' :
+							'YYYY-MM-DD HH:mm')
+
+					default:
+						return value === null || value === undefined ? '' : value
+				}
+			}
+
+		}
+	}
+</script>
+
+
+<style lang="less" scoped>
+	@import '~@/common/css/sidepage.less';
+	@import '~@/common/css/customlist.less';
+</style>